Qt4 - Remove now unneeded files.

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 66148d7164d284f272f9d5f26ed40a5ca52e2627..7f556ca666163c5666fd52fb9ccec03e58cd9d1c 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -57,7 +57,6 @@ nodist_SOURCES_qt4 = \
                ui/sprefs_interface.h \
                ui/sprefs_subtitles.h \
                ui/sprefs_video.h \
-               ui/sprefs_hotkeys.h \
                ui/streampanel.h \
                ui/sout.h
 
@@ -157,7 +156,6 @@ EXTRA_DIST += \
        ui/sprefs_audio.ui \
        ui/sprefs_input.ui \
        ui/sprefs_interface.ui \
-       ui/sprefs_hotkeys.ui \
        ui/sprefs_subtitles.ui \
        ui/sprefs_video.ui \
        ui/streampanel.ui \

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 389835020499086854141ec5c280ff9853d93cc4..004737e83f9eacfca48af5441e04297eb5080a75 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -32,7 +32,6 @@
 #include "ui/sprefs_audio.h"
 #include "ui/sprefs_video.h"
 #include "ui/sprefs_subtitles.h"
-#include "ui/sprefs_hotkeys.h"
 #include "ui/sprefs_interface.h"
 
 enum {

diff --git a/modules/gui/qt4/ui/sprefs_hotkeys.ui b/modules/gui/qt4/ui/sprefs_hotkeys.ui
deleted file mode 100644 (file)
index 098469a..0000000
--- a/modules/gui/qt4/ui/sprefs_hotkeys.ui
+++ /dev/null
@@ -1,91 +0,0 @@
-<ui version="4.0" >
- <author>Jean-Baptiste Kempf</author>
- <class>SPrefsHotkeys</class>
- <widget class="QWidget" name="SPrefsHotkeys" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>421</width>
-    <height>438</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>10</number>
-   </property>
-   <item row="2" column="1" >
-    <widget class="QLineEdit" name="shortcutValue" >
-     <property name="inputMask" >
-      <string/>
-     </property>
-     <property name="text" >
-      <string>Customize here</string>
-     </property>
-     <property name="echoMode" >
-      <enum>QLineEdit::Normal</enum>
-     </property>
-     <property name="readOnly" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QPushButton" name="customizeShortcut" >
-     <property name="text" >
-      <string>Customize</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QTreeWidget" name="shortcutsTree" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>3</vsizetype>
-       <horstretch>4</horstretch>
-       <verstretch>4</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize" >
-      <size>
-       <width>350</width>
-       <height>350</height>
-      </size>
-     </property>
-     <property name="columnCount" >
-      <number>2</number>
-     </property>
-     <column>
-      <property name="text" >
-       <string>_("Action")</string>
-      </property>
-     </column>
-     <column>
-      <property name="text" >
-       <string>_("Shortcut")</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>_("Search")</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="QLineEdit" name="actionSearch" />
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>