Qt: extended panels, remove last tab and simplify code

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 51952fd121327e108c9997d2a3448c0f51f8e2fb..2c15dfa7aa39f62a25961500b54893e6b2dcc6dc 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -73,7 +73,7 @@ private:
 };
 #endif
 
-QString ModuleFromWidgetName( QObject *obj )
+const QString ModuleFromWidgetName( QObject *obj )
 {
     return obj->objectName().replace( "Enable","" );
 }
@@ -240,10 +240,6 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
              ui.cropRightPx, setDisabled( bool ) );
 }
 
-ExtVideo::~ExtVideo()
-{
-}
-
 void ExtVideo::cropChange()
 {
     if( ui.topBotCropSync->isChecked() )
@@ -362,12 +358,6 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
     }
     /* Vout is not kept, so put that in the config */
     config_PutPsz( p_intf, psz_filter_type, psz_string );
-    if( !strcmp( psz_filter_type, "video-filter" ) )
-        ui.videoFilterText->setText( psz_string );
-    else if( !strcmp( psz_filter_type, "vout-filter" ) )
-        ui.voutFilterText->setText( psz_string );
-    else if( !strcmp( psz_filter_type, "sub-filter" ) )
-        ui.subpictureFilterText->setText( psz_string );
 
     /* Try to set on the fly */
     p_vout = THEMIM->getVout();
@@ -646,11 +636,6 @@ ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent )
     box = NULL;
 }
 
-ExtV4l2::~ExtV4l2()
-{
-    delete box;
-}
-
 void ExtV4l2::showEvent( QShowEvent *event )
 {
     QWidget::showEvent( event );

diff --git a/modules/gui/qt4/components/extended_panels.hpp b/modules/gui/qt4/components/extended_panels.hpp
index c7b751d1f592a54424f45d76956f19f2c7e178af..89721a47bba718f90717835c6d5e15c04d0e303d 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -49,7 +49,6 @@ class ExtVideo: public QObject
     friend class ExtendedDialog;
 public:
     ExtVideo( struct intf_thread_t *, QTabWidget * );
-    virtual ~ExtVideo();
     /*void gotoConf( QObject* );*/
 private:
     Ui::ExtVideoWidget ui;
@@ -71,7 +70,6 @@ class ExtV4l2 : public QWidget
     Q_OBJECT
 public:
     ExtV4l2( intf_thread_t *, QWidget * );
-    virtual ~ExtV4l2();
 
     virtual void showEvent( QShowEvent *event );
 

diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui
index 1c4375f853b1e42a089f4affb894891bcd053bfb..f5f4436c13fc5638f6766f0a69ed0d131619d74f 100644 (file)
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>619</width>
-    <height>280</height>
+    <height>308</height>
    </rect>
   </property>
   <property name="currentIndex">
@@ -1324,57 +1324,6 @@
     </item>
    </layout>
   </widget>
-  <widget class="QWidget" name="tab_6">
-   <attribute name="title">
-    <string>Advanced video filter controls</string>
-   </attribute>
-   <layout class="QGridLayout">
-    <item row="2" column="1" colspan="2">
-     <widget class="QLineEdit" name="subpictureFilterText"/>
-    </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="label_34">
-      <property name="text">
-       <string>Subpicture filters</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1" colspan="2">
-     <widget class="QLineEdit" name="videoFilterText"/>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label_33">
-      <property name="text">
-       <string>Video filters</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="0">
-     <widget class="QLabel" name="label_32">
-      <property name="text">
-       <string>Vout filters</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0" colspan="2">
-     <widget class="QPushButton" name="filtersResetButton">
-      <property name="text">
-       <string>Reset</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="2">
-     <widget class="QPushButton" name="filtersUpdateButton">
-      <property name="text">
-       <string>Update</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1" colspan="2">
-     <widget class="QLineEdit" name="voutFilterText"/>
-    </item>
-   </layout>
-  </widget>
  </widget>
  <tabstops>
   <tabstop>logoEnable</tabstop>
@@ -1442,11 +1391,6 @@
   <tabstop>brightnessSlider</tabstop>
   <tabstop>contrastSlider</tabstop>
   <tabstop>hueSlider</tabstop>
-  <tabstop>filtersResetButton</tabstop>
-  <tabstop>videoFilterText</tabstop>
-  <tabstop>filtersUpdateButton</tabstop>
-  <tabstop>subpictureFilterText</tabstop>
-  <tabstop>voutFilterText</tabstop>
   <tabstop>adjustEnable</tabstop>
   <tabstop>transformEnable</tabstop>
   <tabstop>brightnessThresholdCheck</tabstop>