Commit 26957082 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: Use QT_NO_KEYWORDS. It will be the default in qt6

parent 052a0e8a
......@@ -52,6 +52,7 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
endif()
add_definitions(-DQT_NO_FOREACH)
add_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_CXX_STANDARD 14)
if(BUILD_TESTING)
add_definitions(-DBUILD_TESTING)
......
......@@ -83,7 +83,7 @@ void PrecommandJob::start()
void PreCommandJobPrivate::slotStarted()
{
emit q->infoMessage(q, i18n("Executing precommand"),
Q_EMIT q->infoMessage(q, i18n("Executing precommand"),
i18n("Executing precommand '%1'.", precommand));
}
......
......@@ -133,7 +133,7 @@ void ServerTestPrivate::finalResult()
resultsAsVector.append(res);
}
emit q->finished(resultsAsVector);
Q_EMIT q->finished(resultsAsVector);
}
QVector<int> ServerTestPrivate::parseAuthenticationList(const QStringList &authentications)
......
......@@ -70,7 +70,7 @@ void SocketPrivate::slotConnected()
if (!secure) {
qCDebug(MAILTRANSPORT_LOG) << "normal connect";
emit q->connected();
Q_EMIT q->connected();
} else {
qCDebug(MAILTRANSPORT_LOG) << "encrypted connect";
socket->startClientEncryption();
......@@ -83,7 +83,7 @@ void SocketPrivate::slotStateChanged(QAbstractSocket::SocketState state)
qCDebug(MAILTRANSPORT_LOG) << "State is now:" << (int)state;
#endif
if (state == QAbstractSocket::UnconnectedState) {
emit q->failed();
Q_EMIT q->failed();
}
}
......@@ -93,7 +93,7 @@ void SocketPrivate::slotModeChanged(QSslSocket::SslMode state)
qCDebug(MAILTRANSPORT_LOG) << "Mode is now:" << state;
#endif
if (state == QSslSocket::SslClientMode) {
emit q->tlsDone();
Q_EMIT q->tlsDone();
}
}
......@@ -115,7 +115,7 @@ void SocketPrivate::slotSocketRead()
qCDebug(MAILTRANSPORT_LOG) << socket->isEncrypted() << m_msg.trimmed();
#endif
emit q->data(m_msg);
Q_EMIT q->data(m_msg);
m_msg.clear();
}
......@@ -125,7 +125,7 @@ void SocketPrivate::slotSslErrors(const QList<QSslError> &)
/* We can safely ignore the errors, we are only interested in the
capabilities. We're not sending auth info. */
socket->ignoreSslErrors();
emit q->connected();
Q_EMIT q->connected();
}
// ------------------ end private ---------------------------//
......
......@@ -251,7 +251,7 @@ bool Transport::usrSave()
}
TransportManager::self()->emitChangesCommitted();
if (name() != d->oldName) {
emit TransportManager::self()->transportRenamed(id(), d->oldName, name());
Q_EMIT TransportManager::self()->transportRenamed(id(), d->oldName, name());
d->oldName = name();
}
......
......@@ -401,7 +401,7 @@ void TransportManager::removeTransport(int id)
if (plugin) {
plugin->cleanUp(t);
}
emit transportRemoved(t->id(), t->name());
Q_EMIT transportRemoved(t->id(), t->name());
d->transports.removeAll(t);
d->validateDefault();
......@@ -519,8 +519,8 @@ void TransportManager::emitChangesCommitted()
{
d->myOwnChange = true; // prevent us from reading our changes again
d->appliedChange = false; // but we have to read them at least once
emit transportsChanged();
emit changesCommitted();
Q_EMIT transportsChanged();
Q_EMIT changesCommitted();
}
void TransportManagerPrivate::slotTransportsChanged()
......@@ -536,7 +536,7 @@ void TransportManagerPrivate::slotTransportsChanged()
// FIXME: this deletes existing transport objects!
readConfig();
appliedChange = true; // to prevent recursion
emit q->transportsChanged();
Q_EMIT q->transportsChanged();
}
int TransportManagerPrivate::createId() const
......@@ -607,7 +607,7 @@ void TransportManager::loadPasswords()
job->start();
}
emit passwordsChanged();
Q_EMIT passwordsChanged();
}
void TransportManager::loadPasswordsAsync()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment