Merge lp:~nick-dedekind/qmenumodel/logging-categories into lp:qmenumodel

[Nick Dedekind]

Use Qt logging categories

use categories.
change loadExtendedAttributes to log hit failure to debug.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/61/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qmenumodel-wily-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qmenumodel-wily-armhf-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qmenumodel-ci/61/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

/tmp/buildd/qmenumodel-0.2.9+15.04.20150430bzr119pkg0wily4/libqmenumodel/src/unitymenumodel.cpp:25:21: fatal error: logging.h: No such file or directory

review: Needs Fixing

[lp:~nick-dedekind/qmenumodel/logging-categories]

120. By Nick Dedekind on 2016-02-23

added missing file

[Nick Dedekind (nick-dedekind)]

> /tmp/buildd/qmenumodel-0.2.9+15.04.20150430bzr119pkg0wily4/libqmenumodel/src/u
> nitymenumodel.cpp:25:21: fatal error: logging.h: No such file or directory

Added

[lp:~nick-dedekind/qmenumodel/logging-categories]

121. By Nick Dedekind on 2016-02-23

only log critical

[Daniel d'Andrada (dandrader)]

Works great!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:120
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-wily-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-wily-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-wily-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qmenumodel-ci/62/rebuild

review: Approve (continuous-integration)

=== added file 'libqmenumodel/src/logging.h'
--- libqmenumodel/src/logging.h	1970-01-01 00:00:00 +0000
+++ libqmenumodel/src/logging.h	2016-02-23 14:36:05 +0000
@@ -0,0 +1,23 @@
+/*
+ * 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/>.
+ */
+
+#ifndef QMENUMODEL_LOGGING_H
+#define QMENUMODEL_LOGGING_H
+
+#include <QLoggingCategory>
+Q_DECLARE_LOGGING_CATEGORY(unitymenumodel)
+
+#endif // QMENUMODEL_LOGGING_H

=== modified file 'libqmenumodel/src/unitymenumodel.cpp'
--- libqmenumodel/src/unitymenumodel.cpp	2014-07-29 13:39:50 +0000
+++ libqmenumodel/src/unitymenumodel.cpp	2016-02-23 14:36:05 +0000
@@ -22,6 +22,7 @@
 #include "unitymenumodelevents.h"
 #include "unitymenuaction.h"
 #include "unitymenuactionevents.h"
+#include "logging.h"
 
 #include <QIcon>
 #include <QQmlComponent>
@@ -33,6 +34,8 @@
   #include "gtk/gtksimpleactionobserver.h"
 }
 
+Q_LOGGING_CATEGORY(unitymenumodel, "qmenumodel.unitymenumodel", QtCriticalMsg)
+
 G_DEFINE_QUARK (UNITY_MENU_MODEL, unity_menu_model)
 G_DEFINE_QUARK (UNITY_SUBMENU_MODEL, unity_submenu_model)
 G_DEFINE_QUARK (UNITY_MENU_ITEM_EXTENDED_ATTRIBUTES, unity_menu_item_extended_attributes)
@@ -654,7 +657,7 @@
 
         GVariant *value = gtk_menu_tracker_item_get_attribute_value (item, name.toUtf8(), NULL);
         if (value == NULL) {
-            qWarning("loadExtendedAttributes: menu item does not contain '%s'", it.key().toUtf8().constData());
+            qCWarning(unitymenumodel, "loadExtendedAttributes: menu item does not contain '%s'", it.key().toUtf8().constData());
             continue;
         }
 
@@ -662,7 +665,7 @@
         if (qvalue.isValid())
             extendedAttrs->insert(qtify_name (name.toUtf8()), qvalue);
         else
-            qWarning("loadExtendedAttributes: key '%s' is of type '%s' (expected '%s')",
+            qCWarning(unitymenumodel, "loadExtendedAttributes: key '%s' is of type '%s' (expected '%s')",
                      name.toUtf8().constData(), g_variant_get_type_string(value), type.constData());
 
         g_variant_unref (value);