Qt: rename panels.hpp to standardpanel.hpp

We don't have anymore 2 types of panels.

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index d80f7b2cc18132ef20910da4252e4bc4c974d4b7..9ce1baf6d12e7b687ac13fd926539d785e9da7e1 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -52,7 +52,7 @@ nodist_SOURCES_qt4 = \
                components/controller_widget.moc.cpp \
                components/playlist/playlist_model.moc.cpp \
                components/playlist/playlist.moc.cpp \
-               components/playlist/panels.moc.cpp \
+               components/playlist/standardpanel.moc.cpp \
                components/playlist/selector.moc.cpp \
                components/sout/profile_selector.moc.cpp \
                components/sout/sout_widgets.moc.cpp \
@@ -290,7 +290,7 @@ noinst_HEADERS = \
        components/controller_widget.hpp \
        components/playlist/playlist_model.hpp \
        components/playlist/playlist_item.hpp \
-       components/playlist/panels.hpp \
+       components/playlist/standardpanel.hpp \
        components/playlist/playlist.hpp \
        components/playlist/selector.hpp \
        components/playlist/sorting.h \

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 7c793745fe2a0ef1689a8611f5f27334d9933815..82b9a18ef1a0a0bdf111e677caf0ce0e892dcb6a 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include "components/playlist/panels.hpp"
+#include "components/playlist/standardpanel.hpp"
 #include "components/playlist/selector.hpp"
 #include "components/playlist/playlist.hpp"
 

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 2de4c8b65324772f9a591f1db3f96590ea0de429..8023740480e4b84acc1c5acdb85fdae89fa3af68 100644 (file)
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -30,7 +30,7 @@
 #include "dialogs_provider.hpp"
 
 #include "components/playlist/playlist_model.hpp"
-#include "components/playlist/panels.hpp"
+#include "components/playlist/standardpanel.hpp"
 #include "util/customwidgets.hpp"
 
 #include <vlc_intf_strings.h>

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

diff --git a/po/POTFILES.in b/po/POTFILES.in
index a5dc0dd72d5b68020595b0323b594c3f6e8d654a..1fb90d14e5b03b5c24c0fab3973d07e95475a77e 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -655,7 +655,6 @@ modules/gui/qt4/components/interface_widgets.cpp
 modules/gui/qt4/components/interface_widgets.hpp
 modules/gui/qt4/components/open_panels.cpp
 modules/gui/qt4/components/open_panels.hpp
-modules/gui/qt4/components/playlist/panels.hpp
 modules/gui/qt4/components/playlist/playlist.cpp
 modules/gui/qt4/components/playlist/playlist.hpp
 modules/gui/qt4/components/playlist/playlist_item.cpp
@@ -665,6 +664,7 @@ modules/gui/qt4/components/playlist/playlist_model.hpp
 modules/gui/qt4/components/playlist/selector.cpp
 modules/gui/qt4/components/playlist/selector.hpp
 modules/gui/qt4/components/playlist/sorting.h
+modules/gui/qt4/components/playlist/standardpanel.hpp
 modules/gui/qt4/components/playlist/standardpanel.cpp
 modules/gui/qt4/components/preferences_widgets.cpp
 modules/gui/qt4/components/preferences_widgets.hpp