From 480ee1bb25f144c0c55f13a55f2b66810c0702d7 Mon Sep 17 00:00:00 2001
From: Qv2ray-dev <59914293+Qv2ray-dev@users.noreply.github.com>
Date: Fri, 6 Mar 2020 17:26:54 +0800
Subject: [PATCH] cmake: fixed moc slots issue where MACROS are not being
 expanded

---
 makespec/BUILDVERSION               | 2 +-
 src/ui/editors/w_InboundEditor.hpp  | 3 ++-
 src/ui/editors/w_JsonEditor.hpp     | 3 ++-
 src/ui/editors/w_OutboundEditor.hpp | 3 ++-
 src/ui/editors/w_RoutesEditor.hpp   | 3 ++-
 src/ui/w_ExportConfig.hpp           | 3 ++-
 src/ui/w_ImportConfig.hpp           | 3 ++-
 src/ui/w_MainWindow.hpp             | 3 ++-
 src/ui/w_PreferencesWindow.hpp      | 2 +-
 src/ui/w_SubscriptionManager.hpp    | 2 +-
 10 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
index ce7544c5..90d39491 100644
--- a/makespec/BUILDVERSION
+++ b/makespec/BUILDVERSION
@@ -1 +1 @@
-4561
+4562
diff --git a/src/ui/editors/w_InboundEditor.hpp b/src/ui/editors/w_InboundEditor.hpp
index be23aed7..9e6a8333 100644
--- a/src/ui/editors/w_InboundEditor.hpp
+++ b/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:
diff --git a/src/ui/editors/w_JsonEditor.hpp b/src/ui/editors/w_JsonEditor.hpp
index afdf0b5f..01a155fc 100644
--- a/src/ui/editors/w_JsonEditor.hpp
+++ b/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:
diff --git a/src/ui/editors/w_OutboundEditor.hpp b/src/ui/editors/w_OutboundEditor.hpp
index 153076e0..34a81964 100644
--- a/src/ui/editors/w_OutboundEditor.hpp
+++ b/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);
diff --git a/src/ui/editors/w_RoutesEditor.hpp b/src/ui/editors/w_RoutesEditor.hpp
index 9aa52f4d..5fe867c1 100644
--- a/src/ui/editors/w_RoutesEditor.hpp
+++ b/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:
diff --git a/src/ui/w_ExportConfig.hpp b/src/ui/w_ExportConfig.hpp
index ffce983a..44546167 100644
--- a/src/ui/w_ExportConfig.hpp
+++ b/src/ui/w_ExportConfig.hpp
@@ -15,7 +15,8 @@ class ConfigExporter
     explicit ConfigExporter(QWidget *parent = nullptr);
     ~ConfigExporter();
     void OpenExport();
-  public slots:
+
+  private:
     QvMessageBusSlotDecl;
 
   protected:
diff --git a/src/ui/w_ImportConfig.hpp b/src/ui/w_ImportConfig.hpp
index 754d865b..ef1210d9 100644
--- a/src/ui/w_ImportConfig.hpp
+++ b/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:
 
diff --git a/src/ui/w_MainWindow.hpp b/src/ui/w_MainWindow.hpp
index 936d7a18..0c20cab1 100644
--- a/src/ui/w_MainWindow.hpp
+++ b/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);
diff --git a/src/ui/w_PreferencesWindow.hpp b/src/ui/w_PreferencesWindow.hpp
index 06348abe..e45f102c 100644
--- a/src/ui/w_PreferencesWindow.hpp
+++ b/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:
diff --git a/src/ui/w_SubscriptionManager.hpp b/src/ui/w_SubscriptionManager.hpp
index 986c5db2..b4e60bd8 100644
--- a/src/ui/w_SubscriptionManager.hpp
+++ b/src/ui/w_SubscriptionManager.hpp
@@ -18,7 +18,7 @@ class SubscribeEditor
     ~SubscribeEditor();
     tuple<QString, CONFIGROOT> GetSelectedConfig();
 
-  public slots:
+  private:
     QvMessageBusSlotDecl;
 
   private slots: