qt4 - Rename a confusing component

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 92f4e925b10f6c1bf38a58876d7cdfb4e1dfc0c7..937d744646e19ddb15ef9968afb7976c42fd243e 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -52,7 +52,7 @@ TOMOC = main_interface \
        components/extended_panels \
        components/infopanels \
        components/preferences_widgets \
-       components/preferences \
+       components/complete_preferences \
        components/simple_preferences \
        components/open \
        components/interface_widgets \
@@ -82,7 +82,7 @@ nodist_SOURCES_qt4 = \
                components/extended_panels.moc.cpp \
                components/infopanels.moc.cpp \
                components/preferences_widgets.moc.cpp \
-               components/preferences.moc.cpp \
+               components/complete_preferences.moc.cpp \
                components/simple_preferences.moc.cpp \
                components/open.moc.cpp \
                components/interface_widgets.moc.cpp \
@@ -132,7 +132,7 @@ SOURCES_qt4 =       qt4.cpp \
                components/extended_panels.cpp \
                components/infopanels.cpp \
                components/preferences_widgets.cpp \
-               components/preferences.cpp \
+               components/complete_preferences.cpp \
                components/simple_preferences.cpp \
                components/open.cpp \
                components/interface_widgets.cpp \
@@ -164,7 +164,7 @@ EXTRA_DIST += \
        components/extended_panels.hpp \
        components/infopanels.hpp \
        components/preferences_widgets.hpp \
-       components/preferences.hpp \
+       components/complete_preferences.hpp \
        components/simple_preferences.hpp \
        components/open.hpp \
        components/interface_widgets.hpp \

diff --git a/modules/gui/qt4/components/preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
similarity index 99%
rename from modules/gui/qt4/components/preferences.cpp
rename to modules/gui/qt4/components/complete_preferences.cpp
index 234b7900bcf9edcc09b3a31666b996b62023afae..8bbc1162b48d5125418891ebd33aecd8eb591e4f 100644 (file)
--- a/modules/gui/qt4/components/preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -37,7 +37,7 @@
 #include <QPalette>
 #include <QColor>
 
-#include "components/preferences.hpp"
+#include "components/complete_preferences.hpp"
 #include "components/preferences_widgets.hpp"
 #include "qt4.hpp"
 

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

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index 83ca1f7240bce641a02539c80825357e825f48c5..1b9a9968bde02ad53a03498b6203da9cfbc02be0 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -26,7 +26,7 @@
 #include "dialogs_provider.hpp"
 #include "util/qvlcframe.hpp"
 
-#include "components/preferences.hpp"
+#include "components/complete_preferences.hpp"
 #include "components/simple_preferences.hpp"
 #include "qt4.hpp"