Skip to content

Avoid overlap between Qt macros and other libs #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbrun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid overlap between Qt macros and other libs #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/routerkeygen-cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ int main(int argc, char * argv[]) {
try {
QVector<QString> r = keygens->at(i)->getResults();
if (kg) {
foreach (QString s, r) {
Q_FOREACH (QString s, r) {
results.append(keygens->at(i)->kgname + ":" + s);
}
} else {
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion src/KeygenThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void KeygenThread::run(){
for ( int i = 0; i < routers->size(); ++i ){
try{
QVector<QString> r = routers->at(i)->getResults();
foreach (QString s, r) {
Q_FOREACH (QString s, r) {
results.append(s);
}
} catch (int e){
Expand Down
2 changes: 1 addition & 1 deletion src/RouterKeygen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ void RouterKeygen::scanFinished(int code) {
enableUI(true);
switch (code) {
case QWifiManager::SCAN_OK: {
foreach ( QSharedPointer<QScanResult> scanResult, wifiNetworks )
Q_FOREACH ( QSharedPointer<QScanResult> scanResult, wifiNetworks )
scanResult.clear();
bool setTabPosition = false;
if ( wifiNetworks.size() == 0 )
Expand Down
2 changes: 1 addition & 1 deletion src/RouterKeygen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/dialog/UpdateDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class UpdateDialog : public QDialog {
Ui::UpdateDialog *ui;
QString url;

private slots:
private Q_SLOTS:
void openWebsite();
void closeWindow();
};
Expand Down
2 changes: 1 addition & 1 deletion src/dialog/WelcomeDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class WelcomeDialog : public QDialog
private:
Ui::WelcomeDialog *ui;

private slots:
private Q_SLOTS:
void donatePaypal();
void donateGooglePlay();

Expand Down
8 changes: 4 additions & 4 deletions src/qcmdlineparser/qcmdlineparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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]--;
}

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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(' ');
Expand Down
2 changes: 1 addition & 1 deletion src/wifi/QWifiManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ QVector<QSharedPointer<QScanResult> > & QWifiManager::getScanResults() {


void QWifiManager::implScanFinished(int s){
emit scanFinished(s);
Q_EMIT scanFinished(s);
}


Expand Down
4 changes: 2 additions & 2 deletions src/wifi/QWifiManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/wifi/QWifiManagerPrivate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ QVector<QSharedPointer<QScanResult> > & QWifiManagerPrivate::getScanResults() {
}

void QWifiManagerPrivate::clearPreviousScanResults() {
foreach ( QSharedPointer<QScanResult> scanResult, scanResults )
Q_FOREACH ( QSharedPointer<QScanResult> scanResult, scanResults )
scanResult.clear();
scanResults.clear();
}
2 changes: 1 addition & 1 deletion src/wifi/QWifiManagerPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Q_OBJECT
virtual void startScan() = 0;
QVector<QSharedPointer<QScanResult> > & getScanResults();

signals:
Q_SIGNALS:
void scanFinished(int);

protected:
Expand Down
6 changes: 3 additions & 3 deletions src/wifi/QWifiManagerPrivateMac.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -80,7 +80,7 @@ void QWifiManagerPrivateMac::parseResults() {
enc = "Open";
scanResults.append(QSharedPointer<QScanResult>(new QScanResult(ssid, bssid, enc, 0, level)));
}
emit scanFinished(QWifiManager::SCAN_OK);
Q_EMIT scanFinished(QWifiManager::SCAN_OK);

}

Expand Down
2 changes: 1 addition & 1 deletion src/wifi/QWifiManagerPrivateMac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Q_OBJECT
void timerEvent(QTimerEvent *event);


private slots:
private Q_SLOTS:
void parseResults();

private:
Expand Down
40 changes: 20 additions & 20 deletions src/wifi/QWifiManagerPrivateUnix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,37 +36,37 @@ 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<QList<QDBusObjectPath> > 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();
if (deviceType.toUInt() == NM_DEVICE_TYPE_WIFI) {
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)
Expand All @@ -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,
Expand All @@ -93,11 +93,11 @@ void QWifiManagerPrivateUnix::startScan() {
QDBusReply<QList<QDBusObjectPath> > 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,
Expand All @@ -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()
Expand Down Expand Up @@ -142,14 +142,14 @@ void QWifiManagerPrivateUnix::startScan() {
QSharedPointer<QScanResult> ( 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() {
Expand All @@ -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<QList<QDBusObjectPath> > 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());
Expand All @@ -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()
Expand All @@ -223,6 +223,6 @@ void QWifiManagerPrivateUnix::updateAccessPoints() {
QSharedPointer<QScanResult> (new QScanResult(ssid.toString(), mac.toString(), enc,
frequency.toInt(), strengh.toInt())));
}
emit scanFinished(QWifiManager::SCAN_OK);
Q_EMIT scanFinished(QWifiManager::SCAN_OK);
}

2 changes: 1 addition & 1 deletion src/wifi/QWifiManagerPrivateUnix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Q_OBJECT
QWifiManagerPrivateUnix();
virtual ~QWifiManagerPrivateUnix();
void startScan();
private slots:
private Q_SLOTS:
void updateAccessPoints();

private:
Expand Down
2 changes: 1 addition & 1 deletion src/wifi/QWifiManagerPrivateWin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void QWifiManagerPrivateWin::parseResults() {
}

}
emit scanFinished(QWifiManager::SCAN_OK);
Q_EMIT scanFinished(QWifiManager::SCAN_OK);
}

void QWifiManagerPrivateWin::timerEvent(QTimerEvent *)
Expand Down
2 changes: 1 addition & 1 deletion src/wifi/QWifiManagerPrivateWin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Q_OBJECT
void timerEvent(QTimerEvent *event);


private slots:
private Q_SLOTS:
void parseResults();

private:
Expand Down