git.iko.soy/unity8
on xenial help sign in
drop some debug prints from mocked applicationmanager
f7114adMichael Zanetti
tests/mocks/Unity/Application/ApplicationInfo.h−1
compare with xenial
unifiedsplit
@@ -19,7 +19,6 @@
19
19
20#include <QObject>
20#include <QObject>
21#include <QQmlComponent>
21#include <QQmlComponent>
22−#include <QDebug>
23
22
24class QQuickItem;
23class QQuickItem;
25
24
tests/mocks/Unity/Application/ApplicationManager.cpp−7
@@ -26,7 +26,6 @@
26#include <QQmlComponent>
26#include <QQmlComponent>
27#include <QTimer>
27#include <QTimer>
28#include <QDateTime>
28#include <QDateTime>
29−#include <QDebug>
30
29
31ApplicationManager::ApplicationManager(QObject *parent)
30ApplicationManager::ApplicationManager(QObject *parent)
32 : ApplicationManagerInterface(parent)
31 : ApplicationManagerInterface(parent)
@@ -94,7 +93,6 @@ void ApplicationManager::add(ApplicationInfo *application) {
94 if (!application) {
93 if (!application) {
95 return;
94 return;
96 }
95 }
97− qDebug() << "add() " << application->appId();
98
96
99 beginInsertRows(QModelIndex(), m_runningApplications.size(), m_runningApplications.size());
97 beginInsertRows(QModelIndex(), m_runningApplications.size(), m_runningApplications.size());
100 m_runningApplications.append(application);
98 m_runningApplications.append(application);
@@ -198,13 +196,11 @@ bool ApplicationManager::stopApplication(const QString &appId)
198 unfocusCurrentApplication();
196 unfocusCurrentApplication();
199 }
197 }
200 remove(application);
198 remove(application);
201− qDebug() << Q_FUNC_INFO << "emitting focusedAppChanged" << focusedApplicationId();
202 return true;
199 return true;
203}
200}
204
201
205bool ApplicationManager::updateScreenshot(const QString &appId)
202bool ApplicationManager::updateScreenshot(const QString &appId)
206{
203{
207− qDebug() << "updating screenshot for" << appId;
208 int idx = -1;
204 int idx = -1;
209 ApplicationInfo *application = nullptr;
205 ApplicationInfo *application = nullptr;
210 for (int i = 0; i < m_availableApplications.count(); ++i) {
206 for (int i = 0; i < m_availableApplications.count(); ++i) {
@@ -221,7 +217,6 @@ bool ApplicationManager::updateScreenshot(const QString &appId)
221
217
222 application->setScreenshot(QString("image://application/%1/%2").arg(appId).arg(QDateTime::currentMSecsSinceEpoch()));
218 application->setScreenshot(QString("image://application/%1/%2").arg(appId).arg(QDateTime::currentMSecsSinceEpoch()));
223 QModelIndex appIndex = index(idx);
219 QModelIndex appIndex = index(idx);
224− qDebug() << "emitting dataChanged for RoleScreenshot on" << appId;
225 Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
220 Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
226 return true;
221 return true;
227}
222}
@@ -298,7 +293,6 @@ bool ApplicationManager::focusApplication(const QString &appId)
298
293
299 // move app to top of stack
294 // move app to top of stack
300 move(m_runningApplications.indexOf(application), 0);
295 move(m_runningApplications.indexOf(application), 0);
301− qDebug() << Q_FUNC_INFO << "emitting focusedAppChanged" << focusedApplicationId();
302 Q_EMIT focusedApplicationIdChanged();
296 Q_EMIT focusedApplicationIdChanged();
303 return true;
297 return true;
304}
298}
@@ -320,7 +314,6 @@ void ApplicationManager::unfocusCurrentApplication()
320 app->setFocused(false);
314 app->setFocused(false);
321 }
315 }
322 }
316 }
323− qDebug() << Q_FUNC_INFO << "emitting focusedAppChanged" << focusedApplicationId();
324 Q_EMIT focusedApplicationIdChanged();
317 Q_EMIT focusedApplicationIdChanged();
325}
318}
326
319
tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp+1−3
@@ -41,7 +41,6 @@ QImage ApplicationScreenshotProvider::requestImage(const QString &imageId, QSize
41
41
42 ApplicationInfo* app = static_cast<ApplicationInfo*>(m_appManager->findApplication(appId));
42 ApplicationInfo* app = static_cast<ApplicationInfo*>(m_appManager->findApplication(appId));
43 if (app == NULL) {
43 if (app == NULL) {
44− qDebug() << "ApplicationScreenshotProvider - app not found:" << appId;
45 return QImage();
44 return QImage();
46 }
45 }
47
46
@@ -49,7 +48,7 @@ QImage ApplicationScreenshotProvider::requestImage(const QString &imageId, QSize
49
48
50 QImage image;
49 QImage image;
51 if (!image.load(filePath)) {
50 if (!image.load(filePath)) {
52− qDebug() << "failed loading app image" << filePath;
51+ qWarning() << "failed loading app image" << filePath;
53 }
52 }
54
53
55 QGuiApplication *unity = qobject_cast<QGuiApplication*>(qApp);
54 QGuiApplication *unity = qobject_cast<QGuiApplication*>(qApp);
@@ -68,7 +67,6 @@ QImage ApplicationScreenshotProvider::requestImage(const QString &imageId, QSize
68
67
69 size->setWidth(image.width());
68 size->setWidth(image.width());
70 size->setHeight(image.height());
69 size->setHeight(image.height());
71− qDebug() << "got image of size" << size->width() << size->height() << requestedSize;
72
70
73 return image;
71 return image;
74}
72}