[vlc-commits] Qt: AbstractController: fix visibility warning

Francois Cartegnie git at videolan.org
Sat Mar 24 15:45:38 CET 2012


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Mar 24 15:22:06 2012 +0100| [b0a779e93a804b6993edfd30ded41ce8bbe6ea6d] | committer: Francois Cartegnie

Qt: AbstractController: fix visibility warning

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

 modules/gui/qt4/components/controller.cpp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index 8746e1c..6622cea 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -150,7 +150,7 @@ void AbstractController::parseAndCreate( const QString& config,
     }
 }
 
-void AbstractController::createAndAddWidget( QBoxLayout *controlLayout,
+void AbstractController::createAndAddWidget( QBoxLayout *controlLayout_,
                                              int i_index,
                                              buttonType_e i_type,
                                              int i_option )
@@ -160,18 +160,18 @@ void AbstractController::createAndAddWidget( QBoxLayout *controlLayout,
     /* Close the current buttonGroup if we have a special widget or a spacer */
     if( buttonGroupLayout && i_type > BUTTON_MAX )
     {
-        controlLayout->addLayout( buttonGroupLayout );
+        controlLayout_->addLayout( buttonGroupLayout );
         buttonGroupLayout = NULL;
     }
 
     /* Special case for SPACERS, who aren't QWidgets */
     if( i_type == WIDGET_SPACER )
     {
-        controlLayout->addSpacing( 12 );
+        controlLayout_->addSpacing( 12 );
     }
     else if(  i_type == WIDGET_SPACER_EXTEND )
     {
-        controlLayout->addStretch( 12 );
+        controlLayout_->addStretch( 12 );
     }
     else
     {
@@ -191,7 +191,7 @@ void AbstractController::createAndAddWidget( QBoxLayout *controlLayout,
         }
         else /* Special widgets */
         {
-            controlLayout->addWidget( widg );
+            controlLayout_->addWidget( widg );
         }
     }
 }



More information about the vlc-commits mailing list