Qt4 - move the playlist_model with the other files of the playlist

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 6666a146781953b5c19ef994d1a7d85aa753c03f..1f8dcf14a5e67b50a836efa3cdea32853da92d33 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -17,7 +17,6 @@ nodist_SOURCES_qt4 = \
                menus.moc.cpp \
                dialogs_provider.moc.cpp \
                input_manager.moc.cpp \
-               playlist_model.moc.cpp \
                dialogs/playlist.moc.cpp \
         dialogs/bookmarks.moc.cpp \
                dialogs/mediainfo.moc.cpp \
@@ -39,6 +38,7 @@ nodist_SOURCES_qt4 = \
                components/simple_preferences.moc.cpp \
                components/open_panels.moc.cpp \
                components/interface_widgets.moc.cpp \
+               components/playlist/playlist_model.moc.cpp \
                components/playlist/playlist.moc.cpp \
                components/playlist/panels.moc.cpp \
                components/playlist/selector.moc.cpp \
@@ -86,7 +86,6 @@ SOURCES_qt4 =         qt4.cpp \
                main_interface.cpp \
                dialogs_provider.cpp \
                input_manager.cpp \
-               playlist_model.cpp \
                dialogs/playlist.cpp \
         dialogs/bookmarks.cpp \
                dialogs/preferences.cpp \
@@ -108,6 +107,7 @@ SOURCES_qt4 =       qt4.cpp \
                components/simple_preferences.cpp \
                components/open_panels.cpp \
                components/interface_widgets.cpp \
+               components/playlist/playlist_model.cpp \
                components/playlist/standardpanel.cpp \
                components/playlist/playlist.cpp \
                components/playlist/selector.cpp \
@@ -120,7 +120,6 @@ noinst_HEADERS = \
        main_interface.hpp \
        dialogs_provider.hpp \
        input_manager.hpp \
-       playlist_model.hpp \
        dialogs/playlist.hpp \
     dialogs/bookmarks.hpp \
        dialogs/mediainfo.hpp \
@@ -142,6 +141,7 @@ noinst_HEADERS = \
        components/simple_preferences.hpp \
        components/open_panels.hpp \
        components/interface_widgets.hpp \
+       components/playlist/playlist_model.hpp \
        components/playlist/panels.hpp \
        components/playlist/playlist.hpp \
        components/playlist/selector.hpp \

diff --git a/modules/gui/qt4/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
similarity index 99%
rename from modules/gui/qt4/playlist_model.cpp
rename to modules/gui/qt4/components/playlist/playlist_model.cpp
index 5ff79bee362d314f502893f37244f873831458e2..be4643687a8dd5b476dbbe2d48b5dc923eed29b2 100644 (file)
--- a/modules/gui/qt4/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -28,7 +28,7 @@
 #include <QApplication>
 
 #include "qt4.hpp"
-#include "playlist_model.hpp"
+#include "components/playlist/playlist_model.hpp"
 #include "dialogs/mediainfo.hpp"
 #include <vlc_intf_strings.h>
 

diff --git a/modules/gui/qt4/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
similarity index 100%
rename from modules/gui/qt4/playlist_model.hpp
rename to modules/gui/qt4/components/playlist/playlist_model.hpp

diff --git a/modules/gui/qt4/components/playlist/selector.hpp b/modules/gui/qt4/components/playlist/selector.hpp
index 9d413afba698666a94c995eac75a5ffeeb352990..016ba3a4036c489b84d52f936befab91b9dd92b7 100644 (file)
--- a/modules/gui/qt4/components/playlist/selector.hpp
+++ b/modules/gui/qt4/components/playlist/selector.hpp
@@ -27,7 +27,7 @@
 #include <vlc/vlc.h>
 #include <QWidget>
 #include <QString>
-#include <playlist_model.hpp>
+#include "components/playlist/playlist_model.hpp"
 
 class QTreeView;
 class PlaylistWidget;

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 16376efde8685016f94eb5d60f433257e21da9c2..b3d29f00f41a04d9d770cd85c4d9fd6d10d75a52 100644 (file)
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -23,7 +23,7 @@
 
 #include "qt4.hpp"
 #include "dialogs_provider.hpp"
-#include "playlist_model.hpp"
+#include "components/playlist/playlist_model.hpp"
 #include "components/playlist/panels.hpp"
 #include "util/customwidgets.hpp"