git.iko.soy/unity8
on xenial help sign in
logging & review fixes
commitc1d4d9dc885a5b286dc96ab9e1ed64f43dd1345e authorNick Dedekind <nick.dedekind@canonical.com> dateThu 30 Jun 2016, 12:15 (10 years ago) parent5117985
5 files changed+40−22
compare with xenial
unifiedsplit
plugins/Unity/ApplicationMenu/applicationmenuregistry.cpp+24−8 plugins/Unity/ApplicationMenu/applicationmenuregistry.h+8−6 plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.cpp+2−2 plugins/Unity/ApplicationMenu/plugin.cpp+3−3 tests/mocks/Unity/ApplicationMenu/plugin.cpp+3−3
plugins/Unity/ApplicationMenu/applicationmenuregistry.cpp+24−8
@@ -19,6 +19,10 @@
1919#include <QQmlEngine>
2020#include <QDebug>
2121
22+Q_LOGGING_CATEGORY(UNITY_APPMENU, "unity.appmenu", QtDebugMsg)
23+
24+#define DEBUG_MSG qCDebug(UNITY_APPMENU).nospace().noquote() << "ApplicationMenuRegistry::" << __func__
25+#define WARNING_MSG qCWarning(UNITY_APPMENU).nospace().noquote() << "ApplicationMenuRegistry::" << __func__
2226
2327ApplicationMenuRegistry::ApplicationMenuRegistry(QObject *parent)
2428 : QObject(parent)
@@ -39,18 +43,23 @@ void ApplicationMenuRegistry::RegisterAppMenu(pid_t processId,
3943 const QDBusObjectPath &actionObjectPath,
4044 const QString &service)
4145{
42− qDebug() << "RegisterApplicationMenu" << processId << " @ " << service << menuObjectPath.path() << actionObjectPath.path();
46+ DEBUG_MSG << "(pid=" << processId
47+ << ", menuPath=" << menuObjectPath.path()
48+ << ", actionPath=" << actionObjectPath.path()
49+ << ", service=" << service;
4350
4451 QMultiMap<pid_t, MenuServicePath*>::iterator i = m_appMenus.find(processId);
4552 while (i != m_appMenus.end() && i.key() == processId) {
4653 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
47− qWarning() << "Already have a menu for application:" << processId << service << menuObjectPath.path();
54+ WARNING_MSG << "Already have a menu for application (pid= " << processId
55+ << ", service=" << service
56+ << ", menuPath=" << menuObjectPath.path() << ")";
4857 return;
4958 }
5059 ++i;
5160 }
5261
53− auto menu = new MenuServicePath(service.toUtf8(), menuObjectPath.path().toUtf8(), actionObjectPath.path().toUtf8());
62+ auto menu = new MenuServicePath(service, menuObjectPath, actionObjectPath);
5463 QQmlEngine::setObjectOwnership(menu, QQmlEngine::CppOwnership);
5564
5665 m_appMenus.insert(processId, menu);
@@ -59,7 +68,8 @@ void ApplicationMenuRegistry::RegisterAppMenu(pid_t processId,
5968
6069void ApplicationMenuRegistry::UnregisterAppMenu(pid_t processId, const QDBusObjectPath &menuObjectPath)
6170{
62− qDebug() << "RegisterApplicationMenu" << processId << " @ " << menuObjectPath.path();
71+ DEBUG_MSG << "(pid=" << processId
72+ << ", menuPath=" << menuObjectPath.path();
6373
6474 QMultiMap<pid_t, MenuServicePath*>::iterator i = m_appMenus.find(processId);
6575 while (i != m_appMenus.end() && i.key() == processId) {
@@ -78,18 +88,23 @@ void ApplicationMenuRegistry::RegisterSurfaceMenu(const QString &surfaceId,
7888 const QDBusObjectPath &actionObjectPath,
7989 const QString &service)
8090{
81− qDebug() << "RegisterSurfaceMenu" << surfaceId << " @ " << service << menuObjectPath.path() << actionObjectPath.path();
91+ DEBUG_MSG << "(surfaceId=" << surfaceId
92+ << ", menuPath=" << menuObjectPath.path()
93+ << ", actionPath=" << actionObjectPath.path()
94+ << ", service=" << service;
8295
8396 QMultiMap<QString, MenuServicePath*>::iterator i = m_surfaceMenus.find(surfaceId);
8497 while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
8598 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
86− qWarning() << "Already have a menu for surface:" << surfaceId << service << menuObjectPath.path();
99+ WARNING_MSG << "Already have a menu for surface (surfaceId= " << surfaceId
100+ << ", service=" << service
101+ << ", menuPath=" << menuObjectPath.path() << ")";
87102 return;
88103 }
89104 ++i;
90105 }
91106
92− auto menu = new MenuServicePath(service.toUtf8(), menuObjectPath.path().toUtf8(), actionObjectPath.path().toUtf8());
107+ auto menu = new MenuServicePath(service, menuObjectPath, actionObjectPath);
93108 QQmlEngine::setObjectOwnership(menu, QQmlEngine::CppOwnership);
94109
95110 m_surfaceMenus.insert(surfaceId, menu);
@@ -98,7 +113,8 @@ void ApplicationMenuRegistry::RegisterSurfaceMenu(const QString &surfaceId,
98113
99114void ApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, const QDBusObjectPath &menuObjectPath)
100115{
101− qDebug() << "UnregisterSurfaceMenu" << surfaceId << " @ " << menuObjectPath.path();
116+ DEBUG_MSG << "(surfaceId=" << surfaceId
117+ << ", menuPath=" << menuObjectPath.path();
102118
103119 QMultiMap<QString, MenuServicePath*>::iterator i = m_surfaceMenus.find(surfaceId);
104120 while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
plugins/Unity/ApplicationMenu/applicationmenuregistry.h+8−6
@@ -22,6 +22,8 @@
2222#include <QDBusObjectPath>
2323#include <QtQml>
2424
25+Q_DECLARE_LOGGING_CATEGORY(UNITY_APPMENU)
26+
2527class MenuServicePath : public QObject
2628{
2729 Q_OBJECT
@@ -29,12 +31,12 @@ class MenuServicePath : public QObject
2931 Q_PROPERTY(QByteArray menuPath MEMBER m_menuPath CONSTANT)
3032 Q_PROPERTY(QByteArray actionPath MEMBER m_actionPath CONSTANT)
3133public:
32− explicit MenuServicePath(const QByteArray &service,
33− const QByteArray &menuPath,
34− const QByteArray &actionPath)
35− : m_service(service)
36− , m_menuPath(menuPath)
37− , m_actionPath(actionPath)
34+ explicit MenuServicePath(const QString &service,
35+ const QDBusObjectPath &menuPath,
36+ const QDBusObjectPath &actionPath)
37+ : m_service(service.toUtf8())
38+ , m_menuPath(menuPath.path().toUtf8())
39+ , m_actionPath(actionPath.path().toUtf8())
3840 {}
3941
4042 const QByteArray m_service;
plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.cpp+2−2
@@ -24,10 +24,10 @@ DBusApplicationMenuRegistry::DBusApplicationMenuRegistry(QObject *parent)
2424
2525 QDBusConnection connection = QDBusConnection::sessionBus();
2626 if (!connection.registerObject("/com/ubuntu/MenuRegistrar", this)) {
27− qWarning() << "Unable to register DBus object /com/ubuntu/MenuRegistrar";
27+ qCWarning(UNITY_APPMENU) << "Unable to register DBus object /com/ubuntu/MenuRegistrar";
2828 }
2929 if (!connection.registerService("com.ubuntu.MenuRegistrar")) {
30− qWarning() << "Unable to register DBus service com.ubuntu.MenuRegistrar";
30+ qCWarning(UNITY_APPMENU) << "Unable to register DBus service com.ubuntu.MenuRegistrar";
3131 }
3232}
3333
plugins/Unity/ApplicationMenu/plugin.cpp+3−3
@@ -19,7 +19,7 @@
1919
2020#include <QtQml>
2121
22−static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
22+static QObject *menuRegistry(QQmlEngine *engine, QJSEngine *scriptEngine)
2323{
2424 Q_UNUSED(engine)
2525 Q_UNUSED(scriptEngine)
@@ -31,12 +31,12 @@ void ApplicationMenuPlugin::registerTypes(const char *uri)
3131 Q_ASSERT(uri == QLatin1String("Unity.ApplicationMenu"));
3232
3333 qmlRegisterUncreatableType<MenuServicePath>(uri, 0, 1, "MenuServicePath", "You cannot create a MenuServicePath");
34− qmlRegisterSingletonType<DBusApplicationMenuRegistry>(uri, 0, 1, "ApplicationMenuRegistry", service_provider);
34+ qmlRegisterSingletonType<DBusApplicationMenuRegistry>(uri, 0, 1, "ApplicationMenuRegistry", menuRegistry);
3535}
3636
3737void ApplicationMenuPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
3838{
3939 QQmlExtensionPlugin::initializeEngine(engine, uri);
4040
41− service_provider(nullptr, nullptr);
41+ menuRegistry(nullptr, nullptr);
4242}
tests/mocks/Unity/ApplicationMenu/plugin.cpp+3−3
@@ -19,7 +19,7 @@
1919
2020#include <QtQml>
2121
22−static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
22+static QObject *menuRegistry(QQmlEngine *engine, QJSEngine *scriptEngine)
2323{
2424 Q_UNUSED(engine)
2525 Q_UNUSED(scriptEngine)
@@ -31,12 +31,12 @@ void ApplicationMenuPlugin::registerTypes(const char *uri)
3131 Q_ASSERT(uri == QLatin1String("Unity.ApplicationMenu"));
3232
3333 qmlRegisterUncreatableType<MenuServicePath>(uri, 0, 1, "MenuServicePath", "You cannot create a MenuServicePath");
34− qmlRegisterSingletonType<ApplicationMenuRegistry>(uri, 0, 1, "ApplicationMenuRegistry", service_provider);
34+ qmlRegisterSingletonType<ApplicationMenuRegistry>(uri, 0, 1, "ApplicationMenuRegistry", menuRegistry);
3535}
3636
3737void ApplicationMenuPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
3838{
3939 QQmlExtensionPlugin::initializeEngine(engine, uri);
4040
41− service_provider(nullptr, nullptr);
41+ menuRegistry(nullptr, nullptr);
4242}