a2b5ebc · unity8 · git.iko.soy

plugins/LightDM/DBusGreeter.h−1

compare with xenial

unifiedsplit

@@ -19,7 +19,6 @@

19

20#include "unitydbusobject.h"

21#include <QDBusConnection>

22−#include <QObject>

23

22

24class Greeter;

23class Greeter;

25

24

plugins/LightDM/DBusGreeterList.h−1

@@ -19,7 +19,6 @@

19

20#include "unitydbusobject.h"

21#include <QDBusConnection>

22−#include <QObject>

23

22

24class Greeter;

23class Greeter;

25

24

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp−1

@@ -19,7 +19,6 @@

19#include <QDBusConnection>

20#include <QDBusInterface>

21#include <QDebug>

22−#include <QTimer>

23

22

24DBusDashCommunicatorService::DBusDashCommunicatorService(QObject *parent):

23DBusDashCommunicatorService::DBusDashCommunicatorService(QObject *parent):

25 UnityDBusObject("/com/canonical/UnityDash", "com.canonical.UnityDash", parent)

24 UnityDBusObject("/com/canonical/UnityDash", "com.canonical.UnityDash", parent)

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h−1

@@ -18,7 +18,6 @@

18#define DBUSDASHCOMMUNICATORSERVICE_H

19

20#include "unitydbusobject.h"

21−#include <QObject>

22

21

23class DBusDashCommunicatorService: public UnityDBusObject

22class DBusDashCommunicatorService: public UnityDBusObject

24{

23{

plugins/Unity/Launcher/dbusinterface.cpp−1

@@ -25,7 +25,6 @@

25#include <QDBusConnection>

26#include <QDBusMessage>

27#include <QDebug>

28−#include <QTimer>

29

28

30DBusInterface::DBusInterface(LauncherModel *parent):

29DBusInterface::DBusInterface(LauncherModel *parent):

31 UnityDBusVirtualObject("/com/canonical/Unity/Launcher", "com.canonical.Unity.Launcher", parent),

30 UnityDBusVirtualObject("/com/canonical/Unity/Launcher", "com.canonical.Unity.Launcher", parent),

plugins/Unity/Launcher/dbusinterface.h+1−2

@@ -20,8 +20,6 @@

20#include "launcheritem.h"

21#include "unitydbusvirtualobject.h"

22

23−#include <QDBusVirtualObject>

24−

25class LauncherModel;

23class LauncherModel;

26

24

27class DBusInterface: public UnityDBusVirtualObject

25class DBusInterface: public UnityDBusVirtualObject

@@ -45,4 +43,5 @@ private:

45 static QString encodeAppId(const QString& appId);

43 static QString encodeAppId(const QString& appId);

46

44

47 LauncherModel *m_launcherModel;

45 LauncherModel *m_launcherModel;

46+

48};

47};

plugins/Unity/Session/dbusunitysessionservice.cpp−1

@@ -20,7 +20,6 @@

20// Qt

21#include <QDBusConnection>

22#include <QDBusInterface>

23−#include <QTimer>

24

23

25DBusUnitySessionService::DBusUnitySessionService()

24DBusUnitySessionService::DBusUnitySessionService()

26 : UnityDBusObject("/com/canonical/Unity/Session", "com.canonical.Unity")

25 : UnityDBusObject("/com/canonical/Unity/Session", "com.canonical.Unity")

plugins/Unity/Session/dbusunitysessionservice.h−1

@@ -18,7 +18,6 @@

18#define DBUSUNITYSESSIONSERVICE_H

19

20#include "unitydbusobject.h"

21−#include <QObject>

22

21

23/**

22/**

24 * DBusUnitySessionService provides com.canonical.Unity.Session dbus

23 * DBusUnitySessionService provides com.canonical.Unity.Session dbus

tests/plugins/LightDM/CMakeLists.txt−4

@@ -1,7 +1,5 @@

1add_executable(test-lightdm-dbus

2 dbus.cpp

3− ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp

4− ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp

5 ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp

3 ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp

6 )

4 )

7qt5_use_modules(test-lightdm-dbus Core DBus Quick Test)

5qt5_use_modules(test-lightdm-dbus Core DBus Quick Test)

@@ -11,14 +9,12 @@ include_directories(

11 ${CMAKE_SOURCE_DIR}/plugins/LightDM

9 ${CMAKE_SOURCE_DIR}/plugins/LightDM

12 ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM

10 ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM

13 ${LIBLIGHTDM_INCLUDE_DIRS}

11 ${LIBLIGHTDM_INCLUDE_DIRS}

14− ${libunity8-private_SOURCE_DIR}

15 )

12 )

16

13

17add_dependencies(test-lightdm-dbus MockLightDM-full)

14add_dependencies(test-lightdm-dbus MockLightDM-full)

18target_link_libraries(test-lightdm-dbus

15target_link_libraries(test-lightdm-dbus

19 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full

16 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full

20 -llightdm-qt5-2

17 -llightdm-qt5-2

21− unity8-private

22 )

18 )

23

19

24add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")

20add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")