cmake: fixed moc slots issue where MACROS are not being expanded

makespec/BUILDVERSION

@@ -1 +1 @@
-4561
+4562

src/ui/editors/w_InboundEditor.hpp

@@ -18,7 +18,8 @@ class InboundEditor
     explicit InboundEditor(INBOUND root, QWidget *parent = nullptr);
     ~InboundEditor();
     INBOUND OpenEditor();
-  public slots:
+
+  private:
     QvMessageBusSlotDecl;
 
   private slots:

src/ui/editors/w_JsonEditor.hpp

@@ -18,7 +18,8 @@ class JsonEditor
     explicit JsonEditor(QJsonObject rootObject, QWidget *parent = nullptr);
     ~JsonEditor();
     QJsonObject OpenEditor();
-  public slots:
+
+  private:
     QvMessageBusSlotDecl;
 
   private slots:

src/ui/editors/w_OutboundEditor.hpp

@@ -18,7 +18,8 @@ class OutboundEditor
     ~OutboundEditor();
     OUTBOUND OpenEditor();
     QString GetFriendlyName();
-  public slots:
+
+  private:
     QvMessageBusSlotDecl;
   signals:
     void s_reload_config(bool need_restart);

src/ui/editors/w_RoutesEditor.hpp

@@ -36,7 +36,8 @@ class RouteEditor
     explicit RouteEditor(QJsonObject connection, QWidget *parent = nullptr);
     ~RouteEditor();
     CONFIGROOT OpenEditor();
-  public slots:
+
+  private:
     QvMessageBusSlotDecl;
 
   private slots:

src/ui/w_ExportConfig.hpp

@@ -15,7 +15,8 @@ class ConfigExporter
     explicit ConfigExporter(QWidget *parent = nullptr);
     ~ConfigExporter();
     void OpenExport();
-  public slots:
+
+  private:
     QvMessageBusSlotDecl;
 
   protected:

src/ui/w_ImportConfig.hpp

@@ -18,7 +18,8 @@ class ImportConfigWindow
     explicit ImportConfigWindow(QWidget *parent = nullptr);
     ~ImportConfigWindow();
     QMultiMap<QString, CONFIGROOT> OpenImport(bool outboundsOnly = false);
-  public slots:
+
+  private:
     QvMessageBusSlotDecl;
   private slots:
 

src/ui/w_MainWindow.hpp

@@ -38,7 +38,8 @@ class MainWindow
     void StartConnection() const;
     void StopConnection() const;
     void RestartConnection() const;
-  public slots:
+
+  private:
     QvMessageBusSlotDecl;
   private slots:
     void on_activatedTray(QSystemTrayIcon::ActivationReason reason);

src/ui/w_PreferencesWindow.hpp

@@ -18,7 +18,7 @@ class PreferencesWindow
   signals:
     void s_reload_config(bool need_restart);
 
-  public slots:
+  private:
     QvMessageBusSlotDecl;
 
   private slots:

src/ui/w_SubscriptionManager.hpp

@@ -18,7 +18,7 @@ class SubscribeEditor
     ~SubscribeEditor();
     tuple<QString, CONFIGROOT> GetSelectedConfig();
 
-  public slots:
+  private:
     QvMessageBusSlotDecl;
 
   private slots: