Qt4 - Rename dialog/prefs_dialog to dialog/preferences: files in dialog/ are already...

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 95473c43b29e9180d789be2868b909f2efde4323..92f4e925b10f6c1bf38a58876d7cdfb4e1dfc0c7 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -39,7 +39,7 @@ TOMOC = main_interface \
        input_manager \
        playlist_model \
        dialogs/playlist \
-       dialogs/prefs_dialog \
+       dialogs/preferences \
        dialogs/messages \
        dialogs/errors \
        dialogs/mediainfo \
@@ -73,7 +73,7 @@ nodist_SOURCES_qt4 = \
                dialogs/extended.moc.cpp \
                dialogs/messages.moc.cpp \
                dialogs/errors.moc.cpp \
-               dialogs/prefs_dialog.moc.cpp \
+               dialogs/preferences.moc.cpp \
                dialogs/interaction.moc.cpp \
                dialogs/sout.moc.cpp \
                dialogs/help.moc.cpp \
@@ -119,7 +119,7 @@ SOURCES_qt4 =       qt4.cpp \
                input_manager.cpp \
                playlist_model.cpp \
                dialogs/playlist.cpp \
-               dialogs/prefs_dialog.cpp \
+               dialogs/preferences.cpp \
                dialogs/mediainfo.cpp \
                dialogs/extended.cpp \
                dialogs/messages.cpp \
@@ -155,7 +155,7 @@ EXTRA_DIST += \
        dialogs/extended.hpp \
        dialogs/messages.hpp \
        dialogs/errors.hpp \
-       dialogs/prefs_dialog.hpp \
+       dialogs/preferences.hpp \
        dialogs/interaction.hpp \
        dialogs/sout.hpp \
        dialogs/help.hpp \

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 4ebd97643a10b3fe0509d5caf33d44cb84396231..2476dd9046985fb5f1b0c6cb2a1834d8ff9d78ac 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -29,7 +29,7 @@
 #include <QSignalMapper>
 
 #include "components/extended_panels.hpp"
-#include "dialogs/prefs_dialog.hpp"
+#include "dialogs/preferences.hpp"
 #include "dialogs_provider.hpp"
 #include "qt4.hpp"
 

diff --git a/modules/gui/qt4/dialogs/prefs_dialog.cpp b/modules/gui/qt4/dialogs/preferences.cpp
similarity index 99%
rename from modules/gui/qt4/dialogs/prefs_dialog.cpp
rename to modules/gui/qt4/dialogs/preferences.cpp
index 85ca8815895066f0d91da5190cdc0e27d901bdf9..d404a687e334003e1cbca30bdce09fae60200d71 100644 (file)
--- a/modules/gui/qt4/dialogs/prefs_dialog.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * prefs_dialog.cpp : Preferences
+ * preferences.cpp : Preferences
  *****************************************************************************
  * Copyright (C) 2006-2007 the VideoLAN team
  * $Id$
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "dialogs/prefs_dialog.hpp"
+#include "dialogs/preferences.hpp"
 #include "dialogs_provider.hpp"
 #include "util/qvlcframe.hpp"
 

diff --git a/modules/gui/qt4/dialogs/prefs_dialog.hpp b/modules/gui/qt4/dialogs/preferences.hpp
similarity index 98%
rename from modules/gui/qt4/dialogs/prefs_dialog.hpp
rename to modules/gui/qt4/dialogs/preferences.hpp
index 17dc7b959511762683296fb02a8326ad61dfc2c2..55e409b10007edb7429b9c0d560a93a61be2de81 100644 (file)
--- a/modules/gui/qt4/dialogs/prefs_dialog.hpp
+++ b/modules/gui/qt4/dialogs/preferences.hpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * prefs_dialog.hpp : Preferences
+ * preferences.hpp : Preferences
  *****************************************************************************
  * Copyright (C) 2006-2007 the VideoLAN team
  * $Id$

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 363c4abfa5b038ad60eca768797ab5c951f8ceb6..624eb0f555f934edb2c25a325c56896ef612efd9 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -34,7 +34,7 @@
 
 /* The dialogs */
 #include "dialogs/playlist.hpp"
-#include "dialogs/prefs_dialog.hpp"
+#include "dialogs/preferences.hpp"
 #include "dialogs/mediainfo.hpp"
 #include "dialogs/messages.hpp"
 #include "dialogs/extended.hpp"