summaryrefslogtreecommitdiff
path: root/window.h
diff options
context:
space:
mode:
authorAlex Merry <dev@randomguy3.me.uk>2010-08-13 18:54:49 +0100
committerAlex Merry <dev@randomguy3.me.uk>2010-08-13 18:54:49 +0100
commitc6fc16ba027236c1f8fd4f23a1744a4500291579 (patch)
tree58dffc860c004fd3d25763c8920a2557c4504a9b /window.h
parent4ff3f85f315e519b744b49915a561ce23c1a7e07 (diff)
Preparations for 2.0: rearrange dbus/ folder
Diffstat (limited to 'window.h')
-rw-r--r--window.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/window.h b/window.h
index 7c5cde7..eaae8f4 100644
--- a/window.h
+++ b/window.h
@@ -20,16 +20,16 @@
#include "ui_window.h"
#include "metadatamodel.h"
-#include "dbus/mpristypes.h"
+#include "dbus/1.0/mpristypes.h"
#include <QDBusError>
#include <QMainWindow>
#include <QTimer>
class QActionGroup;
-class MprisRoot;
-class MprisPlayer;
-class MprisTracklist;
+class Mpris1RootProxy;
+class Mpris1PlayerProxy;
+class Mpris1TrackListProxy;
class QAction;
class Window : public QMainWindow
@@ -86,9 +86,9 @@ private:
MetadataModel m_tracklistModel;
QTimer m_timer;
- MprisRoot* m_mprisRoot;
- MprisPlayer* m_mprisPlayer;
- MprisTracklist* m_mprisTracklist;
+ Mpris1RootProxy* m_mprisRoot;
+ Mpris1PlayerProxy* m_mprisPlayer;
+ Mpris1TrackListProxy* m_mprisTracklist;
QMap<QString, QAction*> m_playerActions;
QActionGroup* m_playerActionGroup;