mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-11 14:38:29 +01:00
qt: define QT_NO_KEYWORDS
QT_NO_KEYWORDS prevents Qt from defining the `foreach`, `signals`, `slots` and `emit` macros. Avoid overlap between Qt macros and boost - for example #undef hackiness in #6421.
This commit is contained in:
@@ -42,10 +42,10 @@ public:
|
||||
ST_ERROR
|
||||
};
|
||||
|
||||
public slots:
|
||||
public Q_SLOTS:
|
||||
void check();
|
||||
|
||||
signals:
|
||||
Q_SIGNALS:
|
||||
void reply(int status, const QString &message, quint64 available);
|
||||
|
||||
private:
|
||||
@@ -102,7 +102,7 @@ void FreespaceChecker::check()
|
||||
replyStatus = ST_ERROR;
|
||||
replyMessage = tr("Cannot create data directory here.");
|
||||
}
|
||||
emit reply(replyStatus, replyMessage, freeBytesAvailable);
|
||||
Q_EMIT reply(replyStatus, replyMessage, freeBytesAvailable);
|
||||
}
|
||||
|
||||
|
||||
@@ -121,7 +121,7 @@ Intro::~Intro()
|
||||
{
|
||||
delete ui;
|
||||
/* Ensure thread is finished before it is deleted */
|
||||
emit stopThread();
|
||||
Q_EMIT stopThread();
|
||||
thread->wait();
|
||||
}
|
||||
|
||||
@@ -277,7 +277,7 @@ void Intro::checkPath(const QString &dataDir)
|
||||
if(!signalled)
|
||||
{
|
||||
signalled = true;
|
||||
emit requestCheck();
|
||||
Q_EMIT requestCheck();
|
||||
}
|
||||
mutex.unlock();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user