Replace Qt keywords with Q_* macros

tmartsum · Aug 16, 2023 · 04a084c · 04a084c
1 parent d47cedd
commit 04a084c
Show file tree

Hide file tree

Showing 20 changed files with 49 additions and 47 deletions.
diff --git a/QGoodWindow/Examples/GoodPlayground/mainwindow.h b/QGoodWindow/Examples/GoodPlayground/mainwindow.h
@@ -35,10 +35,10 @@ class MainWindow : public QGoodWindow
     MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
-public slots:
+public Q_SLOTS:
     void show();
 
-private slots:
+private Q_SLOTS:
     void adjustSizeLabel();
 
 private:

diff --git a/QGoodWindow/Examples/GoodShowCase/mainwindow.h b/QGoodWindow/Examples/GoodShowCase/mainwindow.h
@@ -57,7 +57,7 @@ class MainWindow : public QGoodWindow
     explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
-private slots:
+private Q_SLOTS:
     void themeChange();
 
 private:

diff --git a/QGoodWindow/Examples/GoodShowCaseGL/glwidget.h b/QGoodWindow/Examples/GoodShowCaseGL/glwidget.h
@@ -58,7 +58,7 @@ class GLWidget : public QOpenGLWidget
     explicit GLWidget(QWidget *parent = nullptr);
     ~GLWidget();
 
-public slots:
+public Q_SLOTS:
     void rotate();
 
 private:

diff --git a/QGoodWindow/Examples/GoodShowCaseQML/mainwindow.h b/QGoodWindow/Examples/GoodShowCaseQML/mainwindow.h
@@ -47,10 +47,10 @@ class MainWindow : public QGoodWindow
     explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
-public slots:
+public Q_SLOTS:
     QString loadPixmapToString(const QString &path);
 
-private slots:
+private Q_SLOTS:
     QPixmap loadGrayedPixmap(const QPixmap &pix);
     QString loadPixmapAsBase64(const QPixmap &pix);
     void captionButtonStateChangedPrivate(const QGoodWindow::CaptionButtonState &state);

diff --git a/QGoodWindow/QGoodCentralWidget/src/captionbutton.h b/QGoodWindow/QGoodCentralWidget/src/captionbutton.h
@@ -46,10 +46,10 @@ class CaptionButton : public QWidget
     explicit CaptionButton(IconType type, QWidget *parent = nullptr);
     ~CaptionButton();
 
-signals:
+Q_SIGNALS:
     void clicked();
 
-public slots:
+public Q_SLOTS:
     void setIconMode(bool icon_dark);
     void setActive(bool is_active);
     void setState(int state);

diff --git a/QGoodWindow/QGoodCentralWidget/src/iconwidget.h b/QGoodWindow/QGoodCentralWidget/src/iconwidget.h
@@ -36,7 +36,7 @@ class IconWidget : public QWidget
 public:
     explicit IconWidget(QWidget *parent = nullptr);
 
-public slots:
+public Q_SLOTS:
     void setPixmap(const QPixmap &pixmap);
     void setActive(bool active);
 

diff --git a/QGoodWindow/QGoodCentralWidget/src/qgoodcentralwidget.h b/QGoodWindow/QGoodCentralWidget/src/qgoodcentralwidget.h
@@ -54,7 +54,7 @@ class QGOODWINDOW_SHARED_EXPORT QGoodCentralWidget : public QWidget
                                     QWidget *right_title_bar_widget = nullptr,
                                     bool title_visible = true, bool icon_visible = true);
 
-public slots:
+public Q_SLOTS:
     /** Set the title bar and the central widget unified. */
     void setUnifiedTitleBarAndCentralWidget(bool unified);
 

diff --git a/QGoodWindow/QGoodCentralWidget/src/titlebar.cpp b/QGoodWindow/QGoodCentralWidget/src/titlebar.cpp
@@ -552,22 +552,22 @@ void TitleBar::captionButtonStateChanged(const QGoodWindow::CaptionButtonState &
         // Mouse button clicked
     case QGoodWindow::CaptionButtonState::MinimizeClicked:
     {
-        emit m_min_btn->clicked();
+        Q_EMIT m_min_btn->clicked();
 
         break;
     }
     case QGoodWindow::CaptionButtonState::MaximizeClicked:
     {
         if (!m_is_maximized)
-            emit m_max_btn->clicked();
+            Q_EMIT m_max_btn->clicked();
         else
-            emit m_restore_btn->clicked();
+            Q_EMIT m_restore_btn->clicked();
 
         break;
     }
     case QGoodWindow::CaptionButtonState::CloseClicked:
     {
-        emit m_cls_btn->clicked();
+        Q_EMIT m_cls_btn->clicked();
 
         break;
     }

diff --git a/QGoodWindow/QGoodCentralWidget/src/titlebar.h b/QGoodWindow/QGoodCentralWidget/src/titlebar.h
@@ -40,13 +40,13 @@ class TitleBar : public QFrame
 public:
     explicit TitleBar(QGoodWindow *gw, QWidget *parent = nullptr);
 
-signals:
+Q_SIGNALS:
     void showMinimized();
     void showNormal();
     void showMaximized();
     void closeWindow();
 
-public slots:
+public Q_SLOTS:
     void setTitle(const QString &title);
     void setIcon(const QPixmap &icon);
     void setActive(bool active);

diff --git a/QGoodWindow/QGoodCentralWidget/src/titlewidget.h b/QGoodWindow/QGoodCentralWidget/src/titlewidget.h
@@ -38,7 +38,7 @@ class TitleWidget : public QWidget
 public:
     explicit TitleWidget(TitleBar *title_bar, QWidget *parent = nullptr);
 
-public slots:
+public Q_SLOTS:
     void setText(const QString &text);
     void setActive(bool active);
     void setTitleAlignment(const Qt::Alignment &alignment);

diff --git a/QGoodWindow/QGoodWindow/src/qgoodstateholder.cpp b/QGoodWindow/QGoodWindow/src/qgoodstateholder.cpp
@@ -49,5 +49,5 @@ void QGoodStateHolder::setCurrentThemeDark(bool dark)
 {
 	m_dark = dark;
 
-	emit currentThemeChanged();
+	Q_EMIT currentThemeChanged();
 }
diff --git a/QGoodWindow/QGoodWindow/src/qgoodstateholder.h b/QGoodWindow/QGoodWindow/src/qgoodstateholder.h
@@ -42,10 +42,10 @@ class QGOODWINDOW_SHARED_EXPORT QGoodStateHolder : public QObject
     explicit QGoodStateHolder();
     ~QGoodStateHolder();
 
-signals:
+Q_SIGNALS:
     void currentThemeChanged();
 
-public slots:
+public Q_SLOTS:
     bool isCurrentThemeDark() const;
     void setCurrentThemeDark(bool dark);
 

diff --git a/QGoodWindow/QGoodWindow/src/qgoodwindow.cpp b/QGoodWindow/QGoodWindow/src/qgoodwindow.cpp
@@ -492,13 +492,13 @@ QGoodWindow::QGoodWindow(QWidget *parent, const QColor &clear_color) : QMainWind
         if (windowTitle().isEmpty())
         {
             setWindowTitle(qApp->applicationName());
-            QTimer::singleShot(0, this, [=]{emit windowTitleChanged(windowTitle());});
+            QTimer::singleShot(0, this, [=]{Q_EMIT windowTitleChanged(windowTitle());});
         }
 
         if (windowIcon().isNull())
         {
             setWindowIcon(qApp->style()->standardIcon(QStyle::SP_DesktopIcon));
-            QTimer::singleShot(0, this, [=]{emit windowIconChanged(windowIcon());});
+            QTimer::singleShot(0, this, [=]{Q_EMIT windowIconChanged(windowIcon());});
         }
     };
 #ifdef Q_OS_WIN
@@ -544,7 +544,7 @@ void QGoodWindow::themeChanged()
     if (m_dark != dark)
     {
         m_dark = dark;
-        emit systemThemeChanged();
+        Q_EMIT systemThemeChanged();
     }
 #endif
 }
@@ -3022,12 +3022,12 @@ LRESULT QGoodWindow::WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar
 #endif
     case WM_SETTEXT:
     {
-        emit gw->windowTitleChanged(gw->windowTitle());
+        Q_EMIT gw->windowTitleChanged(gw->windowTitle());
         break;
     }
     case WM_SETICON:
     {
-        emit gw->windowIconChanged(gw->windowIcon());
+        Q_EMIT gw->windowIconChanged(gw->windowIcon());
         break;
     }
     case WM_ENTERSIZEMOVE:
@@ -4126,19 +4126,19 @@ void QGoodWindow::buttonEnter(qintptr button)
     {
     case HTMINBUTTON:
     {
-        emit captionButtonStateChanged(CaptionButtonState::MinimizeHoverEnter);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::MinimizeHoverEnter);
 
         break;
     }
     case HTMAXBUTTON:
     {
-        emit captionButtonStateChanged(CaptionButtonState::MaximizeHoverEnter);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::MaximizeHoverEnter);
 
         break;
     }
     case HTCLOSE:
     {
-        emit captionButtonStateChanged(CaptionButtonState::CloseHoverEnter);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::CloseHoverEnter);
 
         break;
     }
@@ -4161,19 +4161,19 @@ void QGoodWindow::buttonLeave(qintptr button)
     {
     case HTMINBUTTON:
     {
-        emit captionButtonStateChanged(CaptionButtonState::MinimizeHoverLeave);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::MinimizeHoverLeave);
 
         break;
     }
     case HTMAXBUTTON:
     {
-        emit captionButtonStateChanged(CaptionButtonState::MaximizeHoverLeave);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::MaximizeHoverLeave);
 
         break;
     }
     case HTCLOSE:
     {
-        emit captionButtonStateChanged(CaptionButtonState::CloseHoverLeave);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::CloseHoverLeave);
 
         break;
     }
@@ -4194,7 +4194,7 @@ bool QGoodWindow::buttonPress(qintptr button)
         m_is_caption_button_pressed = true;
         m_caption_button_pressed = HTMINBUTTON;
 
-        emit captionButtonStateChanged(CaptionButtonState::MinimizePress);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::MinimizePress);
 
         activateWindow();
 
@@ -4205,7 +4205,7 @@ bool QGoodWindow::buttonPress(qintptr button)
         m_is_caption_button_pressed = true;
         m_caption_button_pressed = HTMAXBUTTON;
 
-        emit captionButtonStateChanged(CaptionButtonState::MaximizePress);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::MaximizePress);
 
         activateWindow();
 
@@ -4216,7 +4216,7 @@ bool QGoodWindow::buttonPress(qintptr button)
         m_is_caption_button_pressed = true;
         m_caption_button_pressed = HTCLOSE;
 
-        emit captionButtonStateChanged(CaptionButtonState::ClosePress);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::ClosePress);
 
         activateWindow();
 
@@ -4247,35 +4247,35 @@ bool QGoodWindow::buttonRelease(qintptr button, bool valid_click)
     {
     case HTMINBUTTON:
     {
-        emit captionButtonStateChanged(CaptionButtonState::MinimizeRelease);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::MinimizeRelease);
 
         if (valid_click)
         {
-            emit captionButtonStateChanged(CaptionButtonState::MinimizeClicked);
+            Q_EMIT captionButtonStateChanged(CaptionButtonState::MinimizeClicked);
             m_hover_timer->start();
         }
 
         return true;
     }
     case HTMAXBUTTON:
     {
-        emit captionButtonStateChanged(CaptionButtonState::MaximizeRelease);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::MaximizeRelease);
 
         if (valid_click)
         {
-            emit captionButtonStateChanged(CaptionButtonState::MaximizeClicked);
+            Q_EMIT captionButtonStateChanged(CaptionButtonState::MaximizeClicked);
             m_hover_timer->start();
         }
 
         return true;
     }
     case HTCLOSE:
     {
-        emit captionButtonStateChanged(CaptionButtonState::CloseRelease);
+        Q_EMIT captionButtonStateChanged(CaptionButtonState::CloseRelease);
 
         if (valid_click)
         {
-            emit captionButtonStateChanged(CaptionButtonState::CloseClicked);
+            Q_EMIT captionButtonStateChanged(CaptionButtonState::CloseClicked);
             m_hover_timer->start();
         }
 

diff --git a/QGoodWindow/QGoodWindow/src/qgoodwindow.h b/QGoodWindow/QGoodWindow/src/qgoodwindow.h
@@ -164,7 +164,7 @@ class QGOODWINDOW_SHARED_EXPORT QGoodWindow : public QMainWindow
     static QGoodStateHolder *qGoodStateHolderInstance();
 
     /*** QGOODWINDOW FUNCTIONS END ***/
-signals:
+Q_SIGNALS:
     /** On handled caption buttons, this SIGNAL report the state of these buttons. */
     void captionButtonStateChanged(const QGoodWindow::CaptionButtonState &state);
 
@@ -238,7 +238,7 @@ class QGOODWINDOW_SHARED_EXPORT QGoodWindow : public QMainWindow
     Q_DECL_DEPRECATED QRect rightCaptionButtonsRect() const
     {Q_ASSERT(false); return QRect();}
 
-public slots:
+public Q_SLOTS:
     /** Set title bar height for *QGoodWindow*. */
     void setTitleBarHeight(int height);
 

diff --git a/QGoodWindow/QGoodWindow/src/shadow.h b/QGoodWindow/QGoodWindow/src/shadow.h
@@ -43,7 +43,7 @@ class Shadow : public QWidget
     explicit Shadow(qintptr hwnd, QGoodWindow *gw, QWidget *parent);
 #endif
 
-public slots:
+public Q_SLOTS:
     void showLater();
     void show();
     void hide();

diff --git a/QGoodWindow/build-library/CMakeLists.txt b/QGoodWindow/build-library/CMakeLists.txt
@@ -59,6 +59,8 @@ else()
     add_library(${PROJECT_NAME} STATIC)
 endif()
 
+target_compile_definitions(${PROJECT_NAME} PRIVATE QT_NO_KEYWORDS)
+
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set build mode")
 set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Release MinSizeRel RelWithDebInfo Debug)
 

diff --git a/QGoodWindow/build-library/build-qgoodwindow-and-central-widget-shared-lib.pro b/QGoodWindow/build-library/build-qgoodwindow-and-central-widget-shared-lib.pro
@@ -22,7 +22,7 @@
 
 TEMPLATE = lib
 
-CONFIG += plugin
+CONFIG += plugin no_keywords
 
 TARGET = QGoodWindow
 

diff --git a/QGoodWindow/build-library/build-qgoodwindow-and-central-widget-static-lib.pro b/QGoodWindow/build-library/build-qgoodwindow-and-central-widget-static-lib.pro
@@ -22,7 +22,7 @@
 
 TEMPLATE = lib
 
-CONFIG += staticlib
+CONFIG += staticlib no_keywords
 
 TARGET = QGoodWindow
 

diff --git a/QGoodWindow/build-library/build-qgoodwindow-static-lib.pro b/QGoodWindow/build-library/build-qgoodwindow-static-lib.pro
@@ -22,7 +22,7 @@
 
 TEMPLATE = lib
 
-CONFIG += staticlib
+CONFIG += staticlib no_keywords
 
 TARGET = QGoodWindow
 

diff --git a/QGoodWindow/build-library/builld-qgoodwindow-shared-lib.pro b/QGoodWindow/build-library/builld-qgoodwindow-shared-lib.pro
@@ -22,7 +22,7 @@
 
 TEMPLATE = lib
 
-CONFIG += plugin
+CONFIG += plugin no_keywords
 
 TARGET = QGoodWindow