Qt4 - Moving function from one file to another...

diff --git a/modules/gui/qt4/components/open.cpp b/modules/gui/qt4/components/open.cpp
index 283be751b43ff86f16d07b8a172d8a56811e0107..504dfa585bdbb67f65889bc681343912b5503572 100644 (file)
--- a/modules/gui/qt4/components/open.cpp
+++ b/modules/gui/qt4/components/open.cpp
@@ -31,7 +31,8 @@
 #include "components/open.hpp"
 #include "dialogs/open.hpp"
 #include "dialogs_provider.hpp"
-#include "util/customwidgets.hpp"
+#include "components/preferences_widgets.hpp"
+
 
 #include <QFileDialog>
 #include <QDialogButtonBox>

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index d6286639ed01172b455d2d1c650fac0f312fc93f..af39ee0b2dfe405a072f8311bbdf1badf9681e86 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -434,6 +434,27 @@ QString StringListConfigControl::getValue()
     return combo->itemData( combo->currentIndex() ).toString();
 }
 
+
+void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf,
+                        QComboBox *combo, QWidget *parent )
+{
+    module_config_t *p_config =
+                      config_FindConfig( VLC_OBJECT(p_intf), configname );
+    if( p_config )
+    {
+        for ( int i_index = 0; i_index < p_config->i_list; i_index++ )
+        {
+            combo->addItem( qfu( p_config->ppsz_list_text[i_index] ),
+                    QVariant( p_config->pi_list[i_index] ) );
+            if( p_config->value.i == p_config->pi_list[i_index] )
+            {
+                combo->setCurrentIndex( i_index );
+            }
+        }
+        combo->setToolTip( qfu( p_config->psz_longtext ) );
+    }
+}
+
 /********* Module **********/
 ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this,
                module_config_t *_p_item, QWidget *_parent, bool bycat,

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index 605dabbffa2513436578f096bfff222ad006e9a3..f4ae90be7a1f75929c7334c6484d4ff23a1cbdfa 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -378,6 +378,11 @@ private slots:
     void actionRequested( int );
 
 };
+
+void setfillVLCConfigCombo(const char *configname, intf_thread_t *p_intf,
+                        QComboBox *combo, QWidget *parent = 0 );
+
+
 #if 0
 struct ModuleCheckBox {
     QCheckBox *checkbox;

diff --git a/modules/gui/qt4/util/customwidgets.cpp b/modules/gui/qt4/util/customwidgets.cpp
index 67e7e99bb5487126c0261f1ceaa609cbf27855f1..95540ef158331417d1c5411c07076d1c0dcb53b5 100644 (file)
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -196,26 +196,4 @@ QString VLCKeyToString( int val )
         }
     }
     return r;
-}
-
-#include <QComboBox>
-
-void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf,
-                        QComboBox *combo, QWidget *parent )
-{
-    module_config_t *p_config =
-                      config_FindConfig( VLC_OBJECT(p_intf), configname );
-    if( p_config )
-    {
-        for ( int i_index = 0; i_index < p_config->i_list; i_index++ )
-        {
-            combo->addItem( qfu( p_config->ppsz_list_text[i_index] ),
-                    QVariant( p_config->pi_list[i_index] ) );
-            if( p_config->value.i == p_config->pi_list[i_index] )
-            {
-                combo->setCurrentIndex( i_index );
-            }
-        }
-        combo->setToolTip( qfu( p_config->psz_longtext ) );
-    }
-}
+}
\ No newline at end of file

diff --git a/modules/gui/qt4/util/customwidgets.hpp b/modules/gui/qt4/util/customwidgets.hpp
index 2ee76e8ece8c3286dd44453c89585ce561d12627..869e4bbb8c99eea3c71d4de49b145831f5e01c80 100644 (file)
--- a/modules/gui/qt4/util/customwidgets.hpp
+++ b/modules/gui/qt4/util/customwidgets.hpp
@@ -93,10 +93,4 @@ int qtEventToVLCKey( QKeyEvent *e );
 int qtWheelEventToVLCKey( QWheelEvent *e );
 QString VLCKeyToString( int val );
 
-#include "qt4.hpp"
-#include <vlc/vlc.h>
-class QComboBox;
-void setfillVLCConfigCombo(const char *configname, intf_thread_t *p_intf,
-                        QComboBox *combo, QWidget *parent = 0 );
-
 #endif