From 4effe8d8c75f017ba93737642a77d44bd69ad144 Mon Sep 17 00:00:00 2001 From: Sophie Brun Date: Mon, 14 Jun 2021 14:24:53 +0200 Subject: [PATCH] Avoid overlap between Qt macros and other libs --- cli/routerkeygen-cli.cpp | 2 +- src/CMakeLists.txt | 1 + src/KeygenThread.cpp | 2 +- src/RouterKeygen.cpp | 2 +- src/RouterKeygen.h | 2 +- src/dialog/UpdateDialog.h | 2 +- src/dialog/WelcomeDialog.h | 2 +- src/qcmdlineparser/qcmdlineparser.cpp | 8 +++--- src/wifi/QWifiManager.cpp | 2 +- src/wifi/QWifiManager.h | 4 +-- src/wifi/QWifiManagerPrivate.cpp | 2 +- src/wifi/QWifiManagerPrivate.h | 2 +- src/wifi/QWifiManagerPrivateMac.cpp | 6 ++-- src/wifi/QWifiManagerPrivateMac.h | 2 +- src/wifi/QWifiManagerPrivateUnix.cpp | 40 +++++++++++++-------------- src/wifi/QWifiManagerPrivateUnix.h | 2 +- src/wifi/QWifiManagerPrivateWin.cpp | 2 +- src/wifi/QWifiManagerPrivateWin.h | 2 +- 18 files changed, 43 insertions(+), 42 deletions(-) diff --git a/cli/routerkeygen-cli.cpp b/cli/routerkeygen-cli.cpp index c912d8b..9bcb47e 100644 --- a/cli/routerkeygen-cli.cpp +++ b/cli/routerkeygen-cli.cpp @@ -52,7 +52,7 @@ int main(int argc, char * argv[]) { try { QVector r = keygens->at(i)->getResults(); if (kg) { - foreach (QString s, r) { + Q_FOREACH (QString s, r) { results.append(keygens->at(i)->kgname + ":" + s); } } else { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 08068d3..3ee3a45 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -108,6 +108,7 @@ if (Qt5Core_FOUND) qt5_wrap_ui(ROUTERKEYGEN_UIS_H ${ROUTERKEYGEN_UIS}) qt5_add_resources(ROUTERKEYGEN_RCC_SRCS ${ROUTERKEYGEN_RCC}) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x000000) #handle deprecated methods + add_definitions(-DQT_NO_KEYWORDS) else(Qt5Core_FOUND) qt4_wrap_ui(ROUTERKEYGEN_UIS_H ${ROUTERKEYGEN_UIS}) qt4_add_resources(ROUTERKEYGEN_RCC_SRCS ${ROUTERKEYGEN_RCC}) diff --git a/src/KeygenThread.cpp b/src/KeygenThread.cpp index fa2c7bc..ac4c0d6 100644 --- a/src/KeygenThread.cpp +++ b/src/KeygenThread.cpp @@ -28,7 +28,7 @@ void KeygenThread::run(){ for ( int i = 0; i < routers->size(); ++i ){ try{ QVector r = routers->at(i)->getResults(); - foreach (QString s, r) { + Q_FOREACH (QString s, r) { results.append(s); } } catch (int e){ diff --git a/src/RouterKeygen.cpp b/src/RouterKeygen.cpp index 2e3e898..403e8c0 100644 --- a/src/RouterKeygen.cpp +++ b/src/RouterKeygen.cpp @@ -389,7 +389,7 @@ void RouterKeygen::scanFinished(int code) { enableUI(true); switch (code) { case QWifiManager::SCAN_OK: { - foreach ( QSharedPointer scanResult, wifiNetworks ) + Q_FOREACH ( QSharedPointer scanResult, wifiNetworks ) scanResult.clear(); bool setTabPosition = false; if ( wifiNetworks.size() == 0 ) diff --git a/src/RouterKeygen.h b/src/RouterKeygen.h index 6d2d718..a3ae1d4 100644 --- a/src/RouterKeygen.h +++ b/src/RouterKeygen.h @@ -36,7 +36,7 @@ class RouterKeygen : public QMainWindow protected: bool eventFilter(QObject *obj, QEvent *event); -private slots: +private Q_SLOTS: void rightButtonClicked(QObject *obj,const QPoint &p); void copyKey(); void forceRefreshToggle(int); diff --git a/src/dialog/UpdateDialog.h b/src/dialog/UpdateDialog.h index 73120d3..4814219 100644 --- a/src/dialog/UpdateDialog.h +++ b/src/dialog/UpdateDialog.h @@ -20,7 +20,7 @@ class UpdateDialog : public QDialog { Ui::UpdateDialog *ui; QString url; -private slots: +private Q_SLOTS: void openWebsite(); void closeWindow(); }; diff --git a/src/dialog/WelcomeDialog.h b/src/dialog/WelcomeDialog.h index ad6dc2d..50742a6 100644 --- a/src/dialog/WelcomeDialog.h +++ b/src/dialog/WelcomeDialog.h @@ -17,7 +17,7 @@ class WelcomeDialog : public QDialog private: Ui::WelcomeDialog *ui; -private slots: +private Q_SLOTS: void donatePaypal(); void donateGooglePlay(); diff --git a/src/qcmdlineparser/qcmdlineparser.cpp b/src/qcmdlineparser/qcmdlineparser.cpp index b98deae..9d1b6ef 100644 --- a/src/qcmdlineparser/qcmdlineparser.cpp +++ b/src/qcmdlineparser/qcmdlineparser.cpp @@ -42,7 +42,7 @@ void QCmdLineParser::QCmdLineParserPrivate::addOptionalArg(const QCmdLineArgumen int idx = m_optionalArgs.count(); m_optionalArgs.push_back(option); m_optionalArgIndex[option.name()] = idx; - foreach (const QString& alias, option.aliases()) + Q_FOREACH (const QString& alias, option.aliases()) m_optionalArgIndex[alias] = idx; } @@ -200,7 +200,7 @@ void QCmdLineParser::disableHelpOption() m_d->m_optionalArgIndex.remove("-h"); m_d->m_optionalArgIndex.remove("--help"); // re-index everybody - foreach (QString str, m_d->m_optionalArgIndex.keys()) + Q_FOREACH (QString str, m_d->m_optionalArgIndex.keys()) m_d->m_optionalArgIndex[str]--; } @@ -251,7 +251,7 @@ QString QCmdLineParser::QCmdLineParserPrivate::usage(const QString& applicationN QTextStream s(&usage); s << tr("Usage: %1").arg(applicationName); - foreach (const QCmdLineArgument arg, m_optionalArgs) { + Q_FOREACH (const QCmdLineArgument arg, m_optionalArgs) { s << " [" << arg.name(); if (arg.action() == QCmdLineArgument::StoreValue) s << ' ' << arg.valueName(); @@ -299,7 +299,7 @@ QString QCmdLineParser::help() const keyName = it->valueName(); QStringList args; - foreach(QString name, it->aliases()) { + Q_FOREACH(QString name, it->aliases()) { args << name; if (isStorable) { args.last().append(' '); diff --git a/src/wifi/QWifiManager.cpp b/src/wifi/QWifiManager.cpp index d3483d7..ed35ee8 100644 --- a/src/wifi/QWifiManager.cpp +++ b/src/wifi/QWifiManager.cpp @@ -84,7 +84,7 @@ QVector > & QWifiManager::getScanResults() { void QWifiManager::implScanFinished(int s){ - emit scanFinished(s); + Q_EMIT scanFinished(s); } diff --git a/src/wifi/QWifiManager.h b/src/wifi/QWifiManager.h index f3cc9e8..e647993 100644 --- a/src/wifi/QWifiManager.h +++ b/src/wifi/QWifiManager.h @@ -36,9 +36,9 @@ Q_OBJECT const static QString EAP; const static QString OPEN; void setForceScan(bool); -signals: +Q_SIGNALS: void scanFinished(int); -private slots: +private Q_SLOTS: void implScanFinished(int); private: bool forceRefresh; diff --git a/src/wifi/QWifiManagerPrivate.cpp b/src/wifi/QWifiManagerPrivate.cpp index f4b2126..2261b35 100644 --- a/src/wifi/QWifiManagerPrivate.cpp +++ b/src/wifi/QWifiManagerPrivate.cpp @@ -31,7 +31,7 @@ QVector > & QWifiManagerPrivate::getScanResults() { } void QWifiManagerPrivate::clearPreviousScanResults() { - foreach ( QSharedPointer scanResult, scanResults ) + Q_FOREACH ( QSharedPointer scanResult, scanResults ) scanResult.clear(); scanResults.clear(); } diff --git a/src/wifi/QWifiManagerPrivate.h b/src/wifi/QWifiManagerPrivate.h index 916bb34..b9e2a0c 100644 --- a/src/wifi/QWifiManagerPrivate.h +++ b/src/wifi/QWifiManagerPrivate.h @@ -20,7 +20,7 @@ Q_OBJECT virtual void startScan() = 0; QVector > & getScanResults(); -signals: +Q_SIGNALS: void scanFinished(int); protected: diff --git a/src/wifi/QWifiManagerPrivateMac.cpp b/src/wifi/QWifiManagerPrivateMac.cpp index d882e98..a6ff013 100644 --- a/src/wifi/QWifiManagerPrivateMac.cpp +++ b/src/wifi/QWifiManagerPrivateMac.cpp @@ -56,12 +56,12 @@ void QWifiManagerPrivateMac::parseResults() { int level; clearPreviousScanResults(); if ( lines.size() <= 1 ){ - emit scanFinished(QWifiManager::SCAN_OK); + Q_EMIT scanFinished(QWifiManager::SCAN_OK); return; } int ssidLimit = lines.at(0).indexOf("BSSID"); if (ssidLimit == -1 ){ - emit scanFinished(QWifiManager::SCAN_OK); + Q_EMIT scanFinished(QWifiManager::SCAN_OK); return; } for (int i = 1; i < lines.size(); ++i) { @@ -80,7 +80,7 @@ void QWifiManagerPrivateMac::parseResults() { enc = "Open"; scanResults.append(QSharedPointer(new QScanResult(ssid, bssid, enc, 0, level))); } - emit scanFinished(QWifiManager::SCAN_OK); + Q_EMIT scanFinished(QWifiManager::SCAN_OK); } diff --git a/src/wifi/QWifiManagerPrivateMac.h b/src/wifi/QWifiManagerPrivateMac.h index 220ecc5..b3a93d6 100644 --- a/src/wifi/QWifiManagerPrivateMac.h +++ b/src/wifi/QWifiManagerPrivateMac.h @@ -23,7 +23,7 @@ Q_OBJECT void timerEvent(QTimerEvent *event); -private slots: +private Q_SLOTS: void parseResults(); private: diff --git a/src/wifi/QWifiManagerPrivateUnix.cpp b/src/wifi/QWifiManagerPrivateUnix.cpp index 555a017..a3968dd 100644 --- a/src/wifi/QWifiManagerPrivateUnix.cpp +++ b/src/wifi/QWifiManagerPrivateUnix.cpp @@ -36,29 +36,29 @@ void QWifiManagerPrivateUnix::startScan() { QDBusInterface networkManager(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, QDBusConnection::systemBus()); if (!networkManager.isValid()) { - emit scanFinished(QWifiManager::ERROR_NO_NM); + Q_EMIT scanFinished(QWifiManager::ERROR_NO_NM); return; } QDBusReply > devices = networkManager.call( "GetDevices"); if (!devices.isValid()) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } bool foundWifi = false; - foreach (const QDBusObjectPath& connection, devices.value()) { + Q_FOREACH (const QDBusObjectPath& connection, devices.value()) { //qDebug() << connection.path(); QDBusInterface device(NM_DBUS_SERVICE, connection.path(), NM_DBUS_INTERFACE_DEVICE, QDBusConnection::systemBus()); if (!device.isValid()) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } QVariant deviceType = device.property("DeviceType"); if (!deviceType.isValid()) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } //qDebug() << deviceType.toUInt(); @@ -66,7 +66,7 @@ void QWifiManagerPrivateUnix::startScan() { foundWifi = true; QVariant deviceState = device.property("State"); if (!deviceState.isValid()) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } if (deviceState.toUInt() <= NM_DEVICE_STATE_UNAVAILABLE) @@ -75,7 +75,7 @@ void QWifiManagerPrivateUnix::startScan() { connection.path(), NM_DBUS_INTERFACE_DEVICE_WIRELESS, QDBusConnection::systemBus()); if (!wirelessDevice->isValid()) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } QDBusConnection::systemBus().connect(NM_DBUS_SERVICE, @@ -93,11 +93,11 @@ void QWifiManagerPrivateUnix::startScan() { QDBusReply > accessPoints = wirelessDevice->call("GetAccessPoints"); if (!accessPoints.isValid()) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } clearPreviousScanResults(); - foreach (const QDBusObjectPath& connection, accessPoints.value()) { + Q_FOREACH (const QDBusObjectPath& connection, accessPoints.value()) { //qDebug() << connection.path(); QDBusInterface accessPoint(NM_DBUS_SERVICE, connection.path(), NM_DBUS_INTERFACE_ACCESS_POINT, @@ -113,7 +113,7 @@ void QWifiManagerPrivateUnix::startScan() { if (!ssid.isValid() || !mac.isValid() || !frequency.isValid() || !strengh.isValid() || !capabilitiesRSN.isValid() || !capabilitiesWPA.isValid() || !flags.isValid() ) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } unsigned int capabilities = capabilitiesWPA.toUInt() @@ -142,14 +142,14 @@ void QWifiManagerPrivateUnix::startScan() { QSharedPointer ( new QScanResult(ssid.toString(), mac.toString(), enc, frequency.toInt(), strengh.toInt()))); } - emit scanFinished(QWifiManager::SCAN_OK); + Q_EMIT scanFinished(QWifiManager::SCAN_OK); return; } } if (foundWifi) - emit scanFinished(QWifiManager::ERROR_NO_WIFI_ENABLED); + Q_EMIT scanFinished(QWifiManager::ERROR_NO_WIFI_ENABLED); else - emit scanFinished(QWifiManager::ERROR_NO_WIFI); + Q_EMIT scanFinished(QWifiManager::ERROR_NO_WIFI); } void QWifiManagerPrivateUnix::updateAccessPoints() { @@ -163,26 +163,26 @@ void QWifiManagerPrivateUnix::updateAccessPoints() { QDBusInterface device(NM_DBUS_SERVICE, wirelessDevice->path(), NM_DBUS_INTERFACE_DEVICE, QDBusConnection::systemBus()); if (!device.isValid()) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } QVariant deviceState = device.property("State"); if (!deviceState.isValid()) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } if (deviceState.toUInt() <= NM_DEVICE_STATE_UNAVAILABLE) { - emit scanFinished(QWifiManager::ERROR_NO_WIFI_ENABLED); + Q_EMIT scanFinished(QWifiManager::ERROR_NO_WIFI_ENABLED); return; // we are only interested in enabled wifi devices } QDBusReply > accessPoints = wirelessDevice->call( "GetAccessPoints"); if (!accessPoints.isValid()) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } clearPreviousScanResults(); - foreach (const QDBusObjectPath& connection, accessPoints.value()) { + Q_FOREACH (const QDBusObjectPath& connection, accessPoints.value()) { //qDebug() << connection.path(); QDBusInterface accessPoint(NM_DBUS_SERVICE, connection.path(), NM_DBUS_INTERFACE_ACCESS_POINT, QDBusConnection::systemBus()); @@ -197,7 +197,7 @@ void QWifiManagerPrivateUnix::updateAccessPoints() { if (!ssid.isValid() || !mac.isValid() || !frequency.isValid() || !strengh.isValid() || !capabilitiesRSN.isValid() || !capabilitiesWPA.isValid() || !flags.isValid()) { - emit scanFinished(QWifiManager::ERROR); + Q_EMIT scanFinished(QWifiManager::ERROR); return; } unsigned int capabilities = capabilitiesWPA.toUInt() @@ -223,6 +223,6 @@ void QWifiManagerPrivateUnix::updateAccessPoints() { QSharedPointer (new QScanResult(ssid.toString(), mac.toString(), enc, frequency.toInt(), strengh.toInt()))); } - emit scanFinished(QWifiManager::SCAN_OK); + Q_EMIT scanFinished(QWifiManager::SCAN_OK); } diff --git a/src/wifi/QWifiManagerPrivateUnix.h b/src/wifi/QWifiManagerPrivateUnix.h index d8507dd..6e2dfad 100644 --- a/src/wifi/QWifiManagerPrivateUnix.h +++ b/src/wifi/QWifiManagerPrivateUnix.h @@ -21,7 +21,7 @@ Q_OBJECT QWifiManagerPrivateUnix(); virtual ~QWifiManagerPrivateUnix(); void startScan(); -private slots: +private Q_SLOTS: void updateAccessPoints(); private: diff --git a/src/wifi/QWifiManagerPrivateWin.cpp b/src/wifi/QWifiManagerPrivateWin.cpp index bd64b9a..eae2cec 100644 --- a/src/wifi/QWifiManagerPrivateWin.cpp +++ b/src/wifi/QWifiManagerPrivateWin.cpp @@ -69,7 +69,7 @@ void QWifiManagerPrivateWin::parseResults() { } } - emit scanFinished(QWifiManager::SCAN_OK); + Q_EMIT scanFinished(QWifiManager::SCAN_OK); } void QWifiManagerPrivateWin::timerEvent(QTimerEvent *) diff --git a/src/wifi/QWifiManagerPrivateWin.h b/src/wifi/QWifiManagerPrivateWin.h index 5b098a4..a8c3bae 100644 --- a/src/wifi/QWifiManagerPrivateWin.h +++ b/src/wifi/QWifiManagerPrivateWin.h @@ -23,7 +23,7 @@ Q_OBJECT void timerEvent(QTimerEvent *event); -private slots: +private Q_SLOTS: void parseResults(); private: