git.iko.soy/unity8
on xenial help sign in
small cleanups
commita2b5ebc0ca6106c3ab2995a7023e942c3c9aaf24 authorMichael Terry <michael.terry@canonical.com> dateThu 9 Oct 2014, 11:00 (12 years ago) parent4bf0fdb
9 files changed+1−13
compare with xenial
unifiedsplit
plugins/LightDM/DBusGreeter.h−1 plugins/LightDM/DBusGreeterList.h−1 plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp−1 plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h−1 plugins/Unity/Launcher/dbusinterface.cpp−1 plugins/Unity/Launcher/dbusinterface.h+1−2 plugins/Unity/Session/dbusunitysessionservice.cpp−1 plugins/Unity/Session/dbusunitysessionservice.h−1 tests/plugins/LightDM/CMakeLists.txt−4
plugins/LightDM/DBusGreeter.h−1
@@ -19,7 +19,6 @@
1919
2020#include "unitydbusobject.h"
2121#include <QDBusConnection>
22−#include <QObject>
2322
2423class Greeter;
2524
plugins/LightDM/DBusGreeterList.h−1
@@ -19,7 +19,6 @@
1919
2020#include "unitydbusobject.h"
2121#include <QDBusConnection>
22−#include <QObject>
2322
2423class Greeter;
2524
plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp−1
@@ -19,7 +19,6 @@
1919#include <QDBusConnection>
2020#include <QDBusInterface>
2121#include <QDebug>
22−#include <QTimer>
2322
2423DBusDashCommunicatorService::DBusDashCommunicatorService(QObject *parent):
2524 UnityDBusObject("/com/canonical/UnityDash", "com.canonical.UnityDash", parent)
plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h−1
@@ -18,7 +18,6 @@
1818#define DBUSDASHCOMMUNICATORSERVICE_H
1919
2020#include "unitydbusobject.h"
21−#include <QObject>
2221
2322class DBusDashCommunicatorService: public UnityDBusObject
2423{
plugins/Unity/Launcher/dbusinterface.cpp−1
@@ -25,7 +25,6 @@
2525#include <QDBusConnection>
2626#include <QDBusMessage>
2727#include <QDebug>
28−#include <QTimer>
2928
3029DBusInterface::DBusInterface(LauncherModel *parent):
3130 UnityDBusVirtualObject("/com/canonical/Unity/Launcher", "com.canonical.Unity.Launcher", parent),
plugins/Unity/Launcher/dbusinterface.h+1−2
@@ -20,8 +20,6 @@
2020#include "launcheritem.h"
2121#include "unitydbusvirtualobject.h"
2222
23−#include <QDBusVirtualObject>
24−
2523class LauncherModel;
2624
2725class DBusInterface: public UnityDBusVirtualObject
@@ -45,4 +43,5 @@ private:
4543 static QString encodeAppId(const QString& appId);
4644
4745 LauncherModel *m_launcherModel;
46+
4847};
plugins/Unity/Session/dbusunitysessionservice.cpp−1
@@ -20,7 +20,6 @@
2020// Qt
2121#include <QDBusConnection>
2222#include <QDBusInterface>
23−#include <QTimer>
2423
2524DBusUnitySessionService::DBusUnitySessionService()
2625 : UnityDBusObject("/com/canonical/Unity/Session", "com.canonical.Unity")
plugins/Unity/Session/dbusunitysessionservice.h−1
@@ -18,7 +18,6 @@
1818#define DBUSUNITYSESSIONSERVICE_H
1919
2020#include "unitydbusobject.h"
21−#include <QObject>
2221
2322/**
2423 * DBusUnitySessionService provides com.canonical.Unity.Session dbus
tests/plugins/LightDM/CMakeLists.txt−4
@@ -1,7 +1,5 @@
11add_executable(test-lightdm-dbus
22 dbus.cpp
3− ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp
4− ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
53 ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
64 )
75qt5_use_modules(test-lightdm-dbus Core DBus Quick Test)
@@ -11,14 +9,12 @@ include_directories(
119 ${CMAKE_SOURCE_DIR}/plugins/LightDM
1210 ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
1311 ${LIBLIGHTDM_INCLUDE_DIRS}
14− ${libunity8-private_SOURCE_DIR}
1512 )
1613
1714add_dependencies(test-lightdm-dbus MockLightDM-full)
1815target_link_libraries(test-lightdm-dbus
1916 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
2017 -llightdm-qt5-2
21− unity8-private
2218 )
2319
2420add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")