From b99940686673f62ae3110099db81402a1c5bac60 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 1 Dec 2009 02:04:59 +0100
Subject: [PATCH] Qt: remove unnecessary macro

---
 modules/gui/qt4/components/controller.cpp        | 4 ++--
 modules/gui/qt4/components/controller_widget.cpp | 2 +-
 modules/gui/qt4/components/interface_widgets.cpp | 2 +-
 modules/gui/qt4/dialogs/extended.cpp             | 2 +-
 modules/gui/qt4/dialogs/preferences.cpp          | 2 +-
 modules/gui/qt4/qt4.hpp                          | 2 --
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index 0f688bef6b..ef23e8f1cd 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -549,7 +549,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     b_advancedVisible = b_advControls;
 
     QVBoxLayout *controlLayout = new QVBoxLayout( this );
-    controlLayout->setLayoutMargins( 6, 4, 6, 2, 5 );
+    controlLayout->setContentsMargins( 5, 3, 5, 2 );
     controlLayout->setSpacing( 0 );
     QHBoxLayout *controlLayout1 = new QHBoxLayout;
     controlLayout1->setSpacing( 0 );
@@ -641,7 +641,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, QWi
     setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
 
     QVBoxLayout *controlLayout2 = new QVBoxLayout( this );
-    controlLayout2->setLayoutMargins( 4, 6, 4, 2, 5 );
+    controlLayout2->setContentsMargins( 4, 6, 4, 2 );
 
     /* First line */
     InputControlsWidget *inputC = new InputControlsWidget( p_intf, this );
diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index aa377bacdd..93127836f5 100644
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/modules/gui/qt4/components/controller_widget.cpp
@@ -71,7 +71,7 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
 
         volumeControlWidget = new QFrame;
         subLayout = new QVBoxLayout( volumeControlWidget );
-        subLayout->setLayoutMargins( 4, 4, 4, 4, 4 );
+        subLayout->setContentsMargins( 4, 4, 4, 4 );
         volumeMenu = new QMenu( this );
 
         QWidgetAction *widgetAction = new QWidgetAction( volumeControlWidget );
diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 2909f41c68..07520e514b 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -491,7 +491,7 @@ SpeedControlWidget::SpeedControlWidget( intf_thread_t *_p_i, QWidget *_parent )
     CONNECT( normalSpeedButton, clicked(), this, resetRate() );
 
     QVBoxLayout *speedControlLayout = new QVBoxLayout( this );
-    speedControlLayout->setLayoutMargins( 4, 4, 4, 4, 4 );
+    speedControlLayout->setContentsMargins( 4, 4, 4, 4 );
     speedControlLayout->setSpacing( 4 );
     speedControlLayout->addWidget( speedSlider );
     speedControlLayout->addWidget( normalSpeedButton );
diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index f4fe68b467..c44bcbd213 100644
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -43,7 +43,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     setWindowRole( "vlc-extended" );
 
     QGridLayout *layout = new QGridLayout( this );
-    layout->setLayoutMargins( 0, 2, 0, 1, 1 );
+    layout->setContentsMargins( 0, 2, 0, 1 );
     layout->setSpacing( 3 );
 
     mainTabW = new QTabWidget( this );
diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index 150dea80ff..39373720a7 100644
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -107,7 +107,7 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
 
     /* Margins */
     tree_panel_l->setMargin( 1 );
-    main_panel_l->setLayoutMargins( 6, 0, 0, 3, 3 );
+    main_panel_l->setContentsMargins( 6, 0, 0, 3 );
 
     b_small = (p_intf->p_sys->i_screenHeight < 750);
     if( b_small ) msg_Dbg( p_intf, "Small");
diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 1cd012ce67..470a4d68c2 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -115,8 +115,6 @@ struct intf_sys_t
 #define TOGGLEV( x ) { if( x->isVisible() ) x->hide();          \
             else  x->show(); }
 
-#define setLayoutMargins( a, b, c, d, e) setContentsMargins( a, b, c, d )
-
 #define getSettings() p_intf->p_sys->mainSettings
 
 static inline QString QVLCUserDir( vlc_userdir_t type )
-- 
2.39.2