chore: enable use of QT_NO_KEYWORDS when compiling newtcloudCore target

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Assisted-by: ClaudeCode:claude-sonnet-5

Author: mgallien

src/3rdparty/kmessagewidget/kmessagewidget.cpp

@@ -241,11 +241,11 @@ void KMessageWidgetPrivate::slotTimeLineFinished()
         content->setGeometry(0, 0, q->width(), bestContentHeight());
 
         // notify about finished animation
-        emit q->showAnimationFinished();
+        Q_EMIT q->showAnimationFinished();
     } else {
         // hide and notify about finished animation
         q->hide();
-        emit q->hideAnimationFinished();
+        Q_EMIT q->hideAnimationFinished();
     }
 }
 
@@ -404,18 +404,18 @@ void KMessageWidget::animatedShow()
     // Test before styleHint, as there might have been a style change while animation was running
     if (isHideAnimationRunning()) {
         d->timeLine->stop();
-        emit hideAnimationFinished();
+        Q_EMIT hideAnimationFinished();
     }
 
     if (!style()->styleHint(QStyle::SH_Widget_Animate, nullptr, this)
      || (parentWidget() && !parentWidget()->isVisible())) {
         show();
-        emit showAnimationFinished();
+        Q_EMIT showAnimationFinished();
         return;
     }
 
     if (isVisible() && (d->timeLine->state() == QTimeLine::NotRunning) && (height() == d->bestContentHeight()) && (d->content->pos().y() == 0)) {
-        emit showAnimationFinished();
+        Q_EMIT showAnimationFinished();
         return;
     }
 
@@ -441,19 +441,19 @@ void KMessageWidget::animatedHide()
     // And before styleHint, as there might have been a style change while animation was running
     if (isShowAnimationRunning()) {
         d->timeLine->stop();
-        emit showAnimationFinished();
+        Q_EMIT showAnimationFinished();
     }
 
     if (!style()->styleHint(QStyle::SH_Widget_Animate, nullptr, this)) {
         hide();
-        emit hideAnimationFinished();
+        Q_EMIT hideAnimationFinished();
         return;
     }
 
     if (!isVisible()) {
         // explicitly hide it, so it stays hidden in case it is only not visible due to the parents
         hide();
-        emit hideAnimationFinished();
+        Q_EMIT hideAnimationFinished();
         return;
     }
 

src/cmd/CMakeLists.txt

@@ -17,6 +17,8 @@ target_link_libraries(cmdCore
   Qt::Network
   )
 
+target_compile_definitions(cmdCore PRIVATE QT_NO_KEYWORDS)
+
 if(UNIX AND NOT APPLE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")
@@ -36,6 +38,8 @@ if(NOT BUILD_LIBRARIES_ONLY)
 
   target_link_libraries(nextcloudcmd cmdCore nextcloudCore)
 
+  target_compile_definitions(nextcloudcmd PRIVATE QT_NO_KEYWORDS)
+
   if(BUILD_OWNCLOUD_OSX_BUNDLE)
     set_target_properties(nextcloudcmd PROPERTIES
       RUNTIME_OUTPUT_DIRECTORY "${BIN_OUTPUT_DIRECTORY}/${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS")

src/cmd/cmd.cpp

@@ -146,7 +146,7 @@ class HttpCredentialsText : public HttpCredentials
         _password = ::queryPassword(user());
         _ready = true;
         persist();
-        emit asked();
+        Q_EMIT asked();
     }
 
     void setSSLTrusted(bool isTrusted)

src/cmd/cmd.h

@@ -21,7 +21,7 @@ class Cmd : public QObject
         : QObject()
     {
     }
-public slots:
+public Q_SLOTS:
     void transmissionProgressSlot()
     {
     }

src/common/checksums.cpp

@@ -234,9 +234,9 @@ void ComputeChecksum::slotCalculationDone()
 {
     QByteArray checksum = _watcher.future().result();
     if (!checksum.isNull()) {
-        emit done(_checksumType, checksum);
+        Q_EMIT done(_checksumType, checksum);
     } else {
-        emit done(QByteArray(), QByteArray());
+        Q_EMIT done(QByteArray(), QByteArray());
     }
 }
 
@@ -250,13 +250,13 @@ ComputeChecksum *ValidateChecksumHeader::prepareStart(const QByteArray &checksum
 {
     // If the incoming header is empty no validation can happen. Just continue.
     if (checksumHeader.isEmpty()) {
-        emit validated(QByteArray(), QByteArray());
+        Q_EMIT validated(QByteArray(), QByteArray());
         return nullptr;
     }
 
     if (!parseChecksumHeader(checksumHeader, &_expectedChecksumType, &_expectedChecksum)) {
         qCWarning(lcChecksums) << "Checksum header malformed:" << checksumHeader;
-        emit validationFailed(tr("The checksum header is malformed."), _calculatedChecksumType, _calculatedChecksum, ChecksumHeaderMalformed);
+        Q_EMIT validationFailed(tr("The checksum header is malformed."), _calculatedChecksumType, _calculatedChecksum, ChecksumHeaderMalformed);
         return nullptr;
     }
 
@@ -290,16 +290,16 @@ void ValidateChecksumHeader::slotChecksumCalculated(const QByteArray &checksumTy
     _calculatedChecksum = checksum;
 
     if (checksumType != _expectedChecksumType) {
-        emit validationFailed(tr("The checksum header contained an unknown checksum type \"%1\"").arg(QString::fromLatin1(_expectedChecksumType)),
+        Q_EMIT validationFailed(tr("The checksum header contained an unknown checksum type \"%1\"").arg(QString::fromLatin1(_expectedChecksumType)),
             _calculatedChecksumType, _calculatedChecksum, ChecksumTypeUnknown);
         return;
     }
     if (checksum != _expectedChecksum) {
-        emit validationFailed(tr(R"(The downloaded file does not match the checksum, it will be resumed. "%1" != "%2")").arg(QString::fromUtf8(_expectedChecksum), QString::fromUtf8(checksum)),
+        Q_EMIT validationFailed(tr(R"(The downloaded file does not match the checksum, it will be resumed. "%1" != "%2")").arg(QString::fromUtf8(_expectedChecksum), QString::fromUtf8(checksum)),
             _calculatedChecksumType, _calculatedChecksum, ChecksumMismatch);
         return;
     }
-    emit validated(checksumType, checksum);
+    Q_EMIT validated(checksumType, checksum);
 }
 
 CSyncChecksumHook::CSyncChecksumHook() = default;

src/common/checksums.h

@@ -81,10 +81,10 @@ class OCSYNC_EXPORT ComputeChecksum : public QObject
      */
     static QByteArray computeNowOnFile(const QString &filePath, const QByteArray &checksumType);
 
-signals:
+Q_SIGNALS:
     void done(const QByteArray &checksumType, const QByteArray &checksum);
 
-private slots:
+private Q_SLOTS:
     void slotCalculationDone();
 
 private:
@@ -128,12 +128,12 @@ class OCSYNC_EXPORT ValidateChecksumHeader : public QObject
     [[nodiscard]] QByteArray calculatedChecksumType() const;
     [[nodiscard]] QByteArray calculatedChecksum() const;
 
-signals:
+Q_SIGNALS:
     void validated(const QByteArray &checksumType, const QByteArray &checksum);
     void validationFailed(const QString &errMsg, const QByteArray &calculatedChecksumType,
         const QByteArray &calculatedChecksum, const OCC::ValidateChecksumHeader::FailureReason reason);
 
-private slots:
+private Q_SLOTS:
     void slotChecksumCalculated(const QByteArray &checksumType, const QByteArray &checksum);
 
 private:

src/common/ownsql.cpp

@@ -323,7 +323,7 @@ auto SqlQuery::next() -> NextResult
     const bool firstStep = !sqlite3_stmt_busy(_stmt);
 
     int n = 0;
-    forever {
+    Q_FOREVER {
         _errId = sqlite3_step(_stmt);
         if (n < SQLITE_REPEAT_COUNT && firstStep && (_errId == SQLITE_LOCKED || _errId == SQLITE_BUSY)) {
             sqlite3_reset(_stmt); // not necessary after sqlite version 3.6.23.1

src/common/syncjournaldb.cpp

@@ -1193,7 +1193,7 @@ bool SyncJournalDb::listAllE2eeFoldersWithEncryptionStatusLessThan(const int sta
         return false;
     }
 
-    forever {
+    Q_FOREVER {
         auto next = query->next();
         if (!next.ok) {
             qCWarning(lcDb) << "database error:" << query->error();
@@ -1513,7 +1513,7 @@ bool SyncJournalDb::getFileRecordsByFileId(const QByteArray &fileId, const std::
         return false;
     }
 
-    forever {
+    Q_FOREVER {
         auto next = query->next();
         if (!next.ok) {
             qCWarning(lcDb) << "database error:" << query->error();
@@ -1548,7 +1548,7 @@ bool SyncJournalDb::getFilesBelowPath(const QByteArray &path, const std::functio
             return false;
         }
 
-        forever {
+        Q_FOREVER {
             auto next = query.next();
             if (!next.ok) {
                 qCWarning(lcDb) << "database error:" << query.error();
@@ -1623,7 +1623,7 @@ bool SyncJournalDb::listFilesInPath(const QByteArray& path,
         return false;
     }
 
-    forever {
+    Q_FOREVER {
         auto next = query->next();
         if (!next.ok) {
             qCWarning(lcDb) << "database error:" << query->error();
@@ -1850,7 +1850,7 @@ Optional<SyncJournalDb::HasHydratedDehydrated> SyncJournalDb::hasHydratedOrDehyd
     }
 
     HasHydratedDehydrated result;
-    forever {
+    Q_FOREVER {
         auto next = query->next();
         if (!next.ok) {
             qCWarning(lcDb) << "database error:" << query->error();
@@ -2396,7 +2396,7 @@ QStringList SyncJournalDb::getSelectiveSyncList(SyncJournalDb::SelectiveSyncList
         *ok = false;
         return result;
     }
-    forever {
+    Q_FOREVER {
         auto next = query->next();
         if (!next.ok) {
             qCWarning(lcDb) << "database error:" << query->error();
@@ -3144,7 +3144,7 @@ Optional<PinState> SyncJournalDb::PinStateInterface::effectiveForPathRecursive(c
     }
 
     // Check if they are all identical
-    forever {
+    Q_FOREVER {
         auto next = query->next();
         if (!next.ok) {
             qCWarning(lcDb) << "database error:" << query->error();
@@ -3226,7 +3226,7 @@ SyncJournalDb::PinStateInterface::rawList()
     }
 
     QVector<QPair<QByteArray, PinState>> result;
-    forever {
+    Q_FOREVER {
         auto next = query.next();
         if (!next.ok) {
             qCWarning(lcDb) << "database error:" << query.error();

src/common/syncjournaldb.h

@@ -394,7 +394,7 @@ class OCSYNC_EXPORT SyncJournalDb : public QObject
      */
     int autotestFailCounter = -1;
 
-public slots:
+public Q_SLOTS:
     /// Store a new or updated record in the database
     void setCaseConflictRecord(const OCC::ConflictRecord &record);
 

src/common/vfs.h

@@ -286,7 +286,7 @@ class OCSYNC_EXPORT Vfs : public QObject
      */
     [[nodiscard]] virtual AvailabilityResult availability(const QString &folderPath, const AvailabilityRecursivity recursiveCheck) = 0;
 
-public slots:
+public Q_SLOTS:
     /** Update in-sync state based on SyncFileStatusTracker signal.
      *
      * For some vfs plugins the icons aren't based on SocketAPI but rather on data shared
@@ -295,7 +295,7 @@ public slots:
      */
     virtual void fileStatusChanged(const QString &systemFileName, OCC::SyncFileStatus fileStatus) = 0;
 
-signals:
+Q_SIGNALS:
     /// Emitted when a user-initiated hydration starts
     void beginHydrating();
     /// Emitted when the hydration ends
@@ -361,7 +361,7 @@ class OCSYNC_EXPORT VfsOff : public Vfs
     Optional<PinState> pinState(const QString &) override { return PinState::AlwaysLocal; }
     AvailabilityResult availability(const QString &, const AvailabilityRecursivity) override { return VfsItemAvailability::AlwaysLocal; }
 
-public slots:
+public Q_SLOTS:
     void fileStatusChanged(const QString &, OCC::SyncFileStatus) override {}
 
 protected: