diff --git a/libdbusmenuqt/CMakeLists.txt b/libdbusmenuqt/CMakeLists.txt --- a/libdbusmenuqt/CMakeLists.txt +++ b/libdbusmenuqt/CMakeLists.txt @@ -5,6 +5,11 @@ utils.cpp ) +ecm_qt_declare_logging_category(libdbusmenu_SRCS HEADER debug.h + IDENTIFIER DBUSMENUQT + CATEGORY_NAME org.kde.libdbusmenuqt + DEFAULT_SEVERITY Info) + set_source_files_properties(com.canonical.dbusmenu.xml PROPERTIES NO_NAMESPACE true INCLUDE "dbusmenutypes_p.h" diff --git a/libdbusmenuqt/dbusmenuimporter.cpp b/libdbusmenuqt/dbusmenuimporter.cpp --- a/libdbusmenuqt/dbusmenuimporter.cpp +++ b/libdbusmenuqt/dbusmenuimporter.cpp @@ -20,6 +20,8 @@ */ #include "dbusmenuimporter.h" +#include "debug.h" + // Qt #include #include @@ -50,7 +52,7 @@ #endif #define DMRETURN_IF_FAIL(cond) if (!(cond)) { \ - qWarning() << "Condition failed: " #cond; \ + qCWarning(DBUSMENUQT) << "Condition failed: " #cond; \ return; \ } @@ -181,7 +183,7 @@ } else if (key == QLatin1String("shortcut")) { updateActionShortcut(action, value); } else { - qWarning() << "Unhandled property update" << key; + qDebug(DBUSMENUQT) << "Unhandled property update" << key; } } @@ -229,7 +231,7 @@ action->setProperty(DBUSMENU_PROPERTY_ICON_DATA_HASH, dataHash); QPixmap pix; if (!pix.loadFromData(data)) { - qWarning() << "Failed to decode icon-data property for action" << action->text(); + qDebug(DBUSMENUQT) << "Failed to decode icon-data property for action" << action->text(); action->setIcon(QIcon()); return; } @@ -382,7 +384,7 @@ QDBusPendingReply reply = *watcher; if (!reply.isValid()) { - qWarning() << reply.error().message(); + qDebug(DBUSMENUQT) << reply.error().message(); if (menu) { emit menuUpdated(menu); } @@ -395,7 +397,7 @@ DBusMenuLayoutItem rootItem = reply.argumentAt<1>(); if (!menu) { - qWarning() << "No menu for id" << parentId; + qDebug(DBUSMENUQT) << "No menu for id" << parentId; return; } @@ -494,7 +496,7 @@ QDBusPendingReply reply = *watcher; if (reply.isError()) { - qWarning() << "Call to AboutToShow() failed:" << reply.error().message(); + qDebug(DBUSMENUQT) << "Call to AboutToShow() failed:" << reply.error().message(); menuUpdated(menu); return; }