[vlc-devel] commit: Fix for the LAMERS that don't haev Qt4.4 (Jean-Baptiste Kempf )

git version control git at videolan.org
Wed Apr 16 17:44:26 CEST 2008


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Apr 16 08:44:59 2008 -0700| [62126df626d8eca871073cf207ed445c31587c77]

Fix for the LAMERS that don't haev Qt4.4

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=62126df626d8eca871073cf207ed445c31587c77
---

 modules/gui/qt4/components/simple_preferences.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index c65c82a..b8de3df 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -225,7 +225,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             QComboBox * name ## Device = new QComboBox( name ## Control ); \
             name ## Layout->addWidget( name ## Device ); \
             name ## Label->setBuddy( name ## Device ); \
-            ui.outputAudioLayout->addWidget( name ## Control, ui.outputAudioLayout->rowCount(), 0, 1, -1 );
+            outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 );
 
 #define audioControl2( name) \
             audioCommon( name ) \
@@ -234,7 +234,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             name ## Label->setBuddy( name ## Device ); \
             QPushButton * name ## Browse = new QPushButton( qtr( "Browse..." ), name ## Control); \
             name ## Layout->addWidget( name ## Browse ); \
-            ui.outputAudioLayout->addWidget( name ## Control, ui.outputAudioLayout->rowCount(), 0, 1, -1 );
+            outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 );
 
             /* hide if necessary */
             ui.lastfm_user_edit->hide();
@@ -243,6 +243,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             ui.lastfm_pass_label->hide();
 
             /* Build if necessary */
+            QGridLayout * outputAudioLayout = qobject_cast<QGridLayout *>(ui.outputAudioBox->layout());
 #ifdef WIN32
             audioControl( DirectX );
             optionWidgets.append( DirectXControl );




More information about the vlc-devel mailing list