Merge pull request #12 from dingjingmaster/master

CHANGE
ukui · Mar 13, 2020 · 37e5985 · 37e5985
2 parents 57d89cd + c95c4fd
commit 37e5985
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 17 deletions.
diff --git a/common/QGSettings/qgsettings.cpp b/common/QGSettings/qgsettings.cpp
@@ -31,7 +31,7 @@ void QGSettingsPrivate::settingChanged(GSettings *, const gchar *key, gpointer u
      * Qt::AutoConnection           则如果obj与调用者位于同一个线程中，则会同步调用该成员; 否则它将异步调用该成员
      *
      */
-    QMetaObject::invokeMethod(self, "changed", Qt::DirectConnection, Q_ARG(QString, key));
+    QMetaObject::invokeMethod(self, "changed", Qt::AutoConnection, Q_ARG(QString, key));
 }
 
 

diff --git a/common/clib-syslog.h b/common/clib-syslog.h
@@ -1,6 +1,5 @@
 #ifndef CLIB_SYSLOG_H
 #define CLIB_SYSLOG_H
-#include "global.h"
 #include <stdio.h>
 #include <stdarg.h>
 #include <syslog.h>

diff --git a/common/common.pri b/common/common.pri
@@ -1,4 +1,15 @@
-INCLUDEPATH += $$PWD/
+QT += core gui dbus
+CONFIG += c++11 no_keywords link_pkgconfig
+CONFIG -= app_bundle
+
+include($$PWD/../common/common.pri)
+
+INCLUDEPATH += -I $$PWD/
+
+PKGCONFIG += \
+        glib-2.0\
+        gio-2.0
+
 
 SOURCES += \
     $$PWD/clib-syslog.c\

diff --git a/daemon/daemon.pro b/daemon/daemon.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = ukui-settings-daemon
 
 QT += core gui dbus
-CONFIG += c++11 link_pkgconfig
+CONFIG += no_keywords link_pkgconfig c++11
 CONFIG -= app_bundle
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -33,5 +33,5 @@ HEADERS += \
         $$PWD/plugin-info.h\
         $$PWD/plugin-manager.h\
         $$PWD/manager-interface.h \
-        global.h
+        $$PWD/global.h
 
diff --git a/daemon/manager-interface.h b/daemon/manager-interface.h
@@ -31,7 +31,7 @@ class PluginManagerDBus: public QDBusAbstractInterface
 
     ~PluginManagerDBus();
 
-public slots:
+public Q_SLOTS:
     inline QDBusPendingReply<bool> managerAwake()
     {
         QList<QVariant> argumentList;
@@ -61,8 +61,6 @@ public slots:
         QList<QVariant> argumentList;
         return asyncCallWithArgumentList(QStringLiteral("onPluginDeactivated"), argumentList);
     }
-
-signals: // SIGNALS
 };
 
 #endif
diff --git a/daemon/plugin-info.cpp b/daemon/plugin-info.cpp
@@ -216,7 +216,7 @@ bool PluginInfo::activatePlugin()
 
     if (res) {
         mPlugin->activate();
-        emit activated(mName);
+        Q_EMIT activated(mName);
     } else {
         CT_SYSLOG(LOG_ERR, "Error activating plugin '%s'", this->mName.toUtf8().data());
     }
@@ -266,7 +266,7 @@ bool PluginInfo::loadPluginModule()
 void PluginInfo::deactivatePlugin()
 {
     mPlugin->deactivate();
-    emit deactivated(mName);
+    Q_EMIT deactivated(mName);
 }
 
 //void PluginInfo::pluginEnabledCB(GSettings *settings, gchar *key, PluginInfo*)

diff --git a/daemon/plugin-info.h b/daemon/plugin-info.h
@@ -42,7 +42,7 @@ class PluginInfo : public QObject
 
     bool operator== (PluginInfo&);
 
-signals:
+Q_SIGNALS:
     void activated(QString&);
     void deactivated(QString&);
 

diff --git a/daemon/plugin-manager.cpp b/daemon/plugin-manager.cpp
@@ -19,7 +19,6 @@
 #include <QDBusConnectionInterface>
 #include <QApplication>
 
-QList<PluginInfo*>* PluginManager::mPlugin = NULL;
 PluginManager* PluginManager::mPluginManager = NULL;
 
 static bool is_schema (QString& schema);
@@ -79,14 +78,14 @@ bool PluginManager::managerAwake()
 void PluginManager::onPluginActivated(QString &name)
 {
     CT_SYSLOG(LOG_DEBUG, "emitting plugin-activated '%s'", name.toUtf8().data());
-    emit pluginActivated(name);
+    Q_EMIT pluginActivated(name);
 }
 
 // FIXME://
 void PluginManager::onPluginDeactivated(QString &name)
 {
     CT_SYSLOG(LOG_DEBUG, "emitting plugin-deactivated '%s'", name.toUtf8().data());
-    emit pluginDeactivated(name);
+    Q_EMIT pluginDeactivated(name);
 }
 
 void PluginManager::loadAll()

diff --git a/daemon/plugin-manager.h b/daemon/plugin-manager.h
@@ -32,11 +32,11 @@ class PluginManager : QObject
     void loadFile (QString& fileName);
     void unloadAll ();
 
-signals:
+Q_SIGNALS:
     void pluginActivated (QString& name);
     void pluginDeactivated (QString& name);
 
-public slots:
+public Q_SLOTS:
     bool managerStart ();
     void managerStop ();
     bool managerAwake ();
@@ -45,7 +45,7 @@ public slots:
     void onPluginDeactivated (QString& name);
 
 private:
-    static QList<PluginInfo*>*  mPlugin;
+    QList<PluginInfo*>*  mPlugin;
     static PluginManager*       mPluginManager;
 };
-Original file line number
+Diff line change
@@ Expand Up @@
          * Qt::AutoConnection           则如果obj与调用者位于同一个线程中，则会同步调用该成员; 否则它将异步调用该成员
          *
          */
-        QMetaObject::invokeMethod(self, "changed", Qt::DirectConnection, Q_ARG(QString, key));
+        QMetaObject::invokeMethod(self, "changed", Qt::AutoConnection, Q_ARG(QString, key));
     }
@@ Expand Down @@