aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/General/mpris/CMakeLists.txt4
-rw-r--r--src/plugins/General/mpris/mpris.cpp4
-rw-r--r--src/plugins/General/mpris/mpris.pro8
-rw-r--r--src/plugins/General/mpris/player2object.cpp (renamed from src/plugins/General/mpris/mpris2/player2object.cpp)0
-rw-r--r--src/plugins/General/mpris/player2object.h (renamed from src/plugins/General/mpris/mpris2/player2object.h)0
-rw-r--r--src/plugins/General/mpris/root2object.cpp (renamed from src/plugins/General/mpris/mpris2/root2object.cpp)0
-rw-r--r--src/plugins/General/mpris/root2object.h (renamed from src/plugins/General/mpris/mpris2/root2object.h)0
7 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/General/mpris/CMakeLists.txt b/src/plugins/General/mpris/CMakeLists.txt
index e18c46b53..669649d22 100644
--- a/src/plugins/General/mpris/CMakeLists.txt
+++ b/src/plugins/General/mpris/CMakeLists.txt
@@ -10,8 +10,8 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
SET(libmpris_SRCS
mpris.cpp
mprisfactory.cpp
- mpris2/root2object.cpp
- mpris2/player2object.cpp
+ root2object.cpp
+ player2object.cpp
)
SET(libmpris_RCCS translations/translations.qrc)
diff --git a/src/plugins/General/mpris/mpris.cpp b/src/plugins/General/mpris/mpris.cpp
index 4cf5df042..d373f3bc4 100644
--- a/src/plugins/General/mpris/mpris.cpp
+++ b/src/plugins/General/mpris/mpris.cpp
@@ -19,8 +19,8 @@
***************************************************************************/
#include <QtDBus>
-#include "mpris2/root2object.h"
-#include "mpris2/player2object.h"
+#include "root2object.h"
+#include "player2object.h"
#include "mpris.h"
MPRIS::MPRIS(QObject *parent) : QObject(parent)
diff --git a/src/plugins/General/mpris/mpris.pro b/src/plugins/General/mpris/mpris.pro
index b13250c34..7d7cdd4b6 100644
--- a/src/plugins/General/mpris/mpris.pro
+++ b/src/plugins/General/mpris/mpris.pro
@@ -6,13 +6,13 @@ QT += dbus
HEADERS += mprisfactory.h \
mpris.h \
- mpris2/root2object.h \
- mpris2/player2object.h
+ root2object.h \
+ player2object.h
SOURCES += mprisfactory.cpp \
mpris.cpp \
- mpris2/root2object.cpp \
- mpris2/player2object.cpp
+ root2object.cpp \
+ player2object.cpp
RESOURCES = translations/translations.qrc
diff --git a/src/plugins/General/mpris/mpris2/player2object.cpp b/src/plugins/General/mpris/player2object.cpp
index 7773d86ae..7773d86ae 100644
--- a/src/plugins/General/mpris/mpris2/player2object.cpp
+++ b/src/plugins/General/mpris/player2object.cpp
diff --git a/src/plugins/General/mpris/mpris2/player2object.h b/src/plugins/General/mpris/player2object.h
index af69844a4..af69844a4 100644
--- a/src/plugins/General/mpris/mpris2/player2object.h
+++ b/src/plugins/General/mpris/player2object.h
diff --git a/src/plugins/General/mpris/mpris2/root2object.cpp b/src/plugins/General/mpris/root2object.cpp
index a7e9bdd50..a7e9bdd50 100644
--- a/src/plugins/General/mpris/mpris2/root2object.cpp
+++ b/src/plugins/General/mpris/root2object.cpp
diff --git a/src/plugins/General/mpris/mpris2/root2object.h b/src/plugins/General/mpris/root2object.h
index 762e04655..762e04655 100644
--- a/src/plugins/General/mpris/mpris2/root2object.h
+++ b/src/plugins/General/mpris/root2object.h