From 0d7ba446915ea1528ed17a95dbe36d3df6515554 Mon Sep 17 00:00:00 2001 From: dingjingmaster Date: Fri, 13 Mar 2020 02:40:30 -0700 Subject: [PATCH 1/2] CHANGE --- common/clib-syslog.h | 1 - common/common.pri | 13 ++++++++++++- daemon/daemon.pro | 4 ++-- daemon/manager-interface.h | 4 +--- daemon/plugin-info.cpp | 4 ++-- daemon/plugin-info.h | 2 +- daemon/plugin-manager.cpp | 5 ++--- daemon/plugin-manager.h | 6 +++--- 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/common/clib-syslog.h b/common/clib-syslog.h index 3243f561..d4baf563 100644 --- 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 #include #include diff --git a/common/common.pri b/common/common.pri index c7b2bad9..2e14fd97 100644 --- 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 index fa9fc02a..f3ea4414 100644 --- 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 index 8bc44211..fe94263b 100644 --- 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 managerAwake() { QList argumentList; @@ -61,8 +61,6 @@ public slots: QList argumentList; return asyncCallWithArgumentList(QStringLiteral("onPluginDeactivated"), argumentList); } - -signals: // SIGNALS }; #endif diff --git a/daemon/plugin-info.cpp b/daemon/plugin-info.cpp index ea71e80d..e578f594 100644 --- 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 index 63ca9a93..4bcf627b 100644 --- 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 index 6765b122..f750ad31 100644 --- a/daemon/plugin-manager.cpp +++ b/daemon/plugin-manager.cpp @@ -19,7 +19,6 @@ #include #include -QList* 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 index 8b7a7bea..69438f82 100644 --- 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* mPlugin; + QList* mPlugin; static PluginManager* mPluginManager; }; From c95c4fd7390c4b549aaa3161e278f995bfc1ae9e Mon Sep 17 00:00:00 2001 From: dingjingmaster Date: Fri, 13 Mar 2020 02:51:22 -0700 Subject: [PATCH 2/2] change --- common/QGSettings/qgsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/QGSettings/qgsettings.cpp b/common/QGSettings/qgsettings.cpp index 7f656b18..88d8e910 100644 --- 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)); }