Qt: Drop the no longer used sample_classic

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index bb505e259281f6ee149f2e3f8be522af502d4c1d..6da49d0a9fbbb3726ef485e42ae9ba182f0a2a7f 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -133,7 +133,6 @@ DEPS_res = \
        pixmaps/previous.png \
        pixmaps/previous_16px.png \
        pixmaps/profile_new.png \
-       pixmaps/sample_classic.png \
        pixmaps/sample_complete.png \
        pixmaps/sample_minimal.png \
        pixmaps/sample_skins.png \

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 90c8bc75ce7186015c1ac7b68bfcc7cb0166eb83..fa697f3f5413ad5d541c014a1946b15977f6f666 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -217,9 +217,6 @@ void InterfacePreviewWidget::setPreview( enum_style e_style )
     switch( e_style )
     {
     default:
-    case CLASSIC:
-        pixmapLocationString += "sample_classic";
-        break;
     case COMPLETE:
         pixmapLocationString += "sample_complete";
         break;

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index df6120bb11b058708d1975929664b057134a88bb..4ef0c35274b260c3a819af63a89377e30c4c6238 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -63,7 +63,7 @@ class InterfacePreviewWidget : public QLabel
     Q_OBJECT
 public:
     InterfacePreviewWidget( QWidget * );
-    enum enum_style { CLASSIC,  // aka VLC 0.8.6
+    enum enum_style {
                  COMPLETE, // aka MPC
                  MINIMAL,  // aka WMP12 minimal
                  SKINS };

diff --git a/modules/gui/qt4/pixmaps/sample_classic.png b/modules/gui/qt4/pixmaps/sample_classic.png
deleted file mode 100644 (file)
index e5dab5c..0000000
Binary files a/modules/gui/qt4/pixmaps/sample_classic.png and /dev/null differ

diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index 4de860d54656e000ffe94046d9cb56b5f6e0dd7e..b7dbc4e7bfe59e99439e61b243c60fd7d31b3e28 100644 (file)
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -96,7 +96,6 @@
         <file alias="cone_interface_64" >pixmaps/prefs/spref_cone_Interface_64.png</file>
         <file alias="cone_subtitles_64" >pixmaps/prefs/spref_cone_Subtitles_64.png</file>
         <file alias="cone_video_64" >pixmaps/prefs/spref_cone_Video_64.png</file>
-        <file alias="sample_classic" >pixmaps/sample_classic.png</file>
         <file alias="sample_complete" >pixmaps/sample_complete.png</file>
         <file alias="sample_minimal" >pixmaps/sample_minimal.png</file>
         <file alias="sample_skins" >pixmaps/sample_skins.png</file>