From b836183247b991a2ca665f1bda79800f17d1bd85 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 6 Jun 2019 11:48:31 +0200 Subject: [PATCH] SocketApi: cleanup debug output --- src/gui/socketapi.cpp | 48 +++++++++++++++++++++++-------------------- src/gui/socketapi.h | 2 ++ 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp index 7efca2fba6..ed1bc0a902 100644 --- a/src/gui/socketapi.cpp +++ b/src/gui/socketapi.cpp @@ -71,11 +71,12 @@ // The first number should be changed if there is an incompatible change that breaks old clients. // The second number should be changed when there are new features. #define MIRALL_SOCKET_API_VERSION "1.1" -#define DEBUG qDebug() << "SocketApi: " namespace { #if GUI_TESTING +using namespace OCC; + QList allObjects(const QList &widgets) { QList objects; std::copy(widgets.constBegin(), widgets.constEnd(), std::back_inserter(objects)); @@ -92,13 +93,13 @@ QObject *findWidget(const QString &queryString, const QList &widgets = QList::const_iterator foundWidget; if (queryString.contains('>')) { - DEBUG << "queryString contains >"; + qCDebug(lcSocketApi) << "queryString contains >"; auto subQueries = queryString.split('>', QString::SkipEmptyParts); Q_ASSERT(subQueries.count() == 2); auto parentQueryString = subQueries[0].trimmed(); - DEBUG << "Find parent: " << parentQueryString; + qCDebug(lcSocketApi) << "Find parent: " << parentQueryString; auto parent = findWidget(parentQueryString); if(!parent) { @@ -107,12 +108,12 @@ QObject *findWidget(const QString &queryString, const QList &widgets = auto childQueryString = subQueries[1].trimmed(); auto child = findWidget(childQueryString, parent->findChildren()); - DEBUG << "found child: " << !!child; + qCDebug(lcSocketApi) << "found child: " << !!child; return child; } else if(queryString.startsWith('#')) { auto objectName = queryString.mid(1); - DEBUG << "find objectName: " << objectName; + qCDebug(lcSocketApi) << "find objectName: " << objectName; foundWidget = std::find_if(objects.constBegin(), objects.constEnd(), [&](QObject *widget) { return widget->objectName() == objectName; }); @@ -124,7 +125,7 @@ QObject *findWidget(const QString &queryString, const QList &widgets = std::for_each(matches.constBegin(), matches.constEnd(), [](QObject* w) { if(!w) return; - DEBUG << "WIDGET: " << w->objectName() << w->metaObject()->className(); + qCDebug(lcSocketApi) << "WIDGET: " << w->objectName() << w->metaObject()->className(); }); if(matches.empty()) { @@ -1138,10 +1139,10 @@ void SocketApi::command_ASYNC_INVOKE_WIDGET_METHOD(const QSharedPointer &job) { - auto widget = findWidget(job->arguments()[QLatin1String("objectName")].toString()); + QString widgetName = job->arguments()[QLatin1String("objectName")].toString(); + auto widget = findWidget(widgetName); if (!widget) { - QString message("Widget not found: 2: "); - message.append(job->arguments()["objectName"].toString()); + QString message = QString(QLatin1String("Widget not found: 2: %1")).arg(widgetName); job->reject(message); return; } @@ -1159,8 +1160,6 @@ void SocketApi::command_ASYNC_GET_WIDGET_PROPERTY(const QSharedPointer()) { var.convert(QMetaType::QString); value = var.value(); - - DEBUG << "VALUE: " << value; break; } @@ -1168,7 +1167,9 @@ void SocketApi::command_ASYNC_GET_WIDGET_PROPERTY(const QSharedPointerreject(message); + return; } } @@ -1178,9 +1179,11 @@ void SocketApi::command_ASYNC_GET_WIDGET_PROPERTY(const QSharedPointer &job) { auto &arguments = job->arguments(); - auto widget = findWidget(arguments["objectName"].toString()); + QString widgetName = arguments["objectName"].toString(); + auto widget = findWidget(widgetName); if (!widget) { - job->reject(QLatin1String("widget not found")); + QString message = QString(QLatin1String("Widget not found: 4: %1")).arg(widgetName); + job->reject(message); return; } widget->setProperty(arguments["property"].toString().toUtf8().constData(), @@ -1191,9 +1194,11 @@ void SocketApi::command_ASYNC_SET_WIDGET_PROPERTY(const QSharedPointer &job) { auto &arguments = job->arguments(); + QString widgetName = arguments["objectName"].toString(); auto widget = findWidget(arguments["objectName"].toString()); if (!widget) { - job->reject(QLatin1String("widget not found")); + QString message = QString(QLatin1String("Widget not found: 5: %1")).arg(widgetName); + job->reject(message); return; } @@ -1213,7 +1218,8 @@ void SocketApi::command_ASYNC_TRIGGER_MENU_ACTION(const QSharedPointerreject(QLatin1String("widget not found: ") + objectName); + QString message = QString(QLatin1String("Object not found: 1: %1")).arg(objectName); + job->reject(message); return; } @@ -1231,15 +1237,15 @@ void SocketApi::command_ASYNC_TRIGGER_MENU_ACTION(const QSharedPointerreject("Action not found"); + QString message = QString(QLatin1String("Action not found: 1: %1")).arg(arguments["actionName"].toString()); + job->reject(message); } void SocketApi::command_ASYNC_ASSERT_ICON_IS_EQUAL(const QSharedPointer &job) { auto widget = findWidget(job->arguments()[QLatin1String("queryString")].toString()); if (!widget) { - QString message("Widget not found: 37: "); - message.append(job->arguments()["objectName"].toString()); + QString message = QString(QLatin1String("Object not found: 6: %1")).arg(job->arguments()["queryString"].toString()); job->reject(message); return; } @@ -1257,8 +1263,6 @@ void SocketApi::command_ASYNC_ASSERT_ICON_IS_EQUAL(const QSharedPointer()) { var.convert(QMetaType::QIcon); value = var.value(); - - DEBUG << "VALUE: " << value; break; } @@ -1266,7 +1270,7 @@ void SocketApi::command_ASYNC_ASSERT_ICON_IS_EQUAL(const QSharedPointerreject(QString(QLatin1String("Icon not found: %1")).arg(propertyName)); } } diff --git a/src/gui/socketapi.h b/src/gui/socketapi.h index 4e3f146ae4..bc076ad83c 100644 --- a/src/gui/socketapi.h +++ b/src/gui/socketapi.h @@ -40,6 +40,8 @@ class Folder; class SocketListener; class SocketApiJob; +Q_DECLARE_LOGGING_CATEGORY(lcSocketApi) + /** * @brief The SocketApi class * @ingroup gui