Merge lp:~unity-team/qtmir/centralizeLoggingCategories into lp:qtmir

[Michał Sawicz]

Centralize logging categories

The header part is already centralized. Make the cpp the same.

Moves all logging category symbols to the mirserver lib.

Enables mirserver to use logging categories that were previously declared in the Unity.Application module.

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:483
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/200/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1500
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1465
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1465
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1465/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/200/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Looks good

review: Approve

[Michał Sawicz (saviq)]

This conflicts with lp:~alan-griffiths/qtmir/MirServer-is-not-a-context-object - please merge it and make a prerequisite here.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:484
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/205/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1530
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1490
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1490
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1490
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1490/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1490
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1490/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1490
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1490/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1490
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1490/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1490
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1490/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1490
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1490/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/205/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

I'll just copy Gerry's approval from the pre-merge version over, for silo bookkeeping.

review: Approve

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2016-05-06 08:42:04 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2016-05-06 08:42:04 +0000
@@ -53,8 +53,6 @@
 
 namespace ms = mir::scene;
 
-Q_LOGGING_CATEGORY(QTMIR_APPLICATIONS, "qtmir.applications")
-
 namespace unityapi = unity::shell::application;
 
 #define DEBUG_MSG qCDebug(QTMIR_APPLICATIONS).nospace() << "ApplicationManager::" << __func__

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2016-05-06 08:42:04 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2016-05-06 08:42:04 +0000
@@ -39,8 +39,6 @@
 #include <mir/scene/surface.h>
 
 
-Q_LOGGING_CATEGORY(QTMIR_SURFACES, "qtmir.surfaces")
-
 namespace ms = mir::scene;
 
 namespace qtmir {

=== modified file 'src/modules/Unity/Application/sessionmanager.cpp'
--- src/modules/Unity/Application/sessionmanager.cpp	2016-04-29 15:41:00 +0000
+++ src/modules/Unity/Application/sessionmanager.cpp	2016-05-06 08:42:04 +0000
@@ -33,8 +33,6 @@
 #include <mir/scene/prompt_session.h>
 #include <mir/scene/prompt_session_manager.h>
 
-Q_LOGGING_CATEGORY(QTMIR_SESSIONS, "qtmir.sessions")
-
 namespace ms = mir::scene;
 
 namespace qtmir {

=== modified file 'src/platforms/mirserver/CMakeLists.txt'
--- src/platforms/mirserver/CMakeLists.txt	2016-04-26 08:30:26 +0000
+++ src/platforms/mirserver/CMakeLists.txt	2016-05-06 08:42:04 +0000
@@ -52,6 +52,7 @@
     ${CMAKE_SOURCE_DIR}/src/common/debughelpers.cpp
     ${CMAKE_SOURCE_DIR}/src/common/timestamp.cpp
     cursor.cpp
+    logging.cpp
     mircursorimages.cpp
     mirdisplayconfigurationpolicy.cpp
     mirwindowmanager.cpp

=== modified file 'src/platforms/mirserver/clipboard.cpp'
--- src/platforms/mirserver/clipboard.cpp	2015-08-11 12:08:32 +0000
+++ src/platforms/mirserver/clipboard.cpp	2016-05-06 08:42:04 +0000
@@ -24,8 +24,6 @@
 #include <QDBusError>
 #include <QMimeData>
 
-Q_LOGGING_CATEGORY(QTMIR_CLIPBOARD, "qtmir.clipboard")
-
 // FIXME(loicm) The clipboard data format is not defined by Ubuntu Platform API
 //     which makes it impossible to have non-Qt applications communicate with Qt
 //     applications through the clipboard API. The solution would be to have

=== added file 'src/platforms/mirserver/logging.cpp'
--- src/platforms/mirserver/logging.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/logging.cpp	2016-05-06 08:42:04 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "logging.h"
+
+Q_LOGGING_CATEGORY(QTMIR_APPLICATIONS, "qtmir.applications")
+Q_LOGGING_CATEGORY(QTMIR_SESSIONS, "qtmir.sessions")
+Q_LOGGING_CATEGORY(QTMIR_SURFACES, "qtmir.surfaces")
+Q_LOGGING_CATEGORY(QTMIR_MIR_INPUT, "qtmir.mir.input", QtWarningMsg)
+Q_LOGGING_CATEGORY(QTMIR_MIR_MESSAGES, "qtmir.mir")
+Q_LOGGING_CATEGORY(QTMIR_CLIPBOARD, "qtmir.clipboard")
+Q_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES, "qtmir.sensor")
+Q_LOGGING_CATEGORY(QTMIR_SCREENS, "qtmir.screens")

=== modified file 'src/platforms/mirserver/mirserver.cpp'
--- src/platforms/mirserver/mirserver.cpp	2016-05-06 08:42:04 +0000
+++ src/platforms/mirserver/mirserver.cpp	2016-05-06 08:42:04 +0000
@@ -48,9 +48,6 @@
 namespace msh = mir::shell;
 namespace ms = mir::scene;
 
-Q_LOGGING_CATEGORY(QTMIR_MIR_MESSAGES, "qtmir.mir")
-
-
 MirServer::MirServer(int &argc, char **argv,
                      const QSharedPointer<ScreensModel> &screensModel, QObject* parent)
     : QObject(parent)

=== modified file 'src/platforms/mirserver/qteventfeeder.cpp'
--- src/platforms/mirserver/qteventfeeder.cpp	2016-04-13 14:25:42 +0000
+++ src/platforms/mirserver/qteventfeeder.cpp	2016-05-06 08:42:04 +0000
@@ -35,8 +35,6 @@
 // common dir
 #include <debughelpers.h>
 
-Q_LOGGING_CATEGORY(QTMIR_MIR_INPUT, "qtmir.mir.input", QtWarningMsg)
-
 // XKB Keysyms which do not map directly to Qt types (i.e. Unicode points)
 static const uint32_t KeyTable[] = {
     // misc keys

=== modified file 'src/platforms/mirserver/screen.cpp'
--- src/platforms/mirserver/screen.cpp	2016-04-29 15:41:00 +0000
+++ src/platforms/mirserver/screen.cpp	2016-05-06 08:42:04 +0000
@@ -38,8 +38,6 @@
 
 namespace mg = mir::geometry;
 
-Q_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES, "qtmir.sensor")
-
 namespace {
 bool isLittleEndian() {
     unsigned int i = 1;

=== modified file 'src/platforms/mirserver/screensmodel.cpp'
--- src/platforms/mirserver/screensmodel.cpp	2016-04-29 15:41:00 +0000
+++ src/platforms/mirserver/screensmodel.cpp	2016-05-06 08:42:04 +0000
@@ -35,8 +35,6 @@
 // std
 #include <memory>
 
-Q_LOGGING_CATEGORY(QTMIR_SCREENS, "qtmir.screens")
-
 namespace mg = mir::graphics;