[vlc-commits] Qt: use __MIN when applicable

Jean-Baptiste Kempf git at videolan.org
Tue Aug 16 17:32:22 CEST 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Aug 16 17:23:15 2011 +0200| [084f3f4cf043f351efefa319f455bd2597cc40d7] | committer: Jean-Baptiste Kempf

Qt: use __MIN when applicable

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

 modules/gui/qt4/components/interface_widgets.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 1d85532..71466b0 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -235,8 +235,8 @@ void BackgroundWidget::paintEvent( QPaintEvent *e )
     QBitmap pMask;
     float f_alpha = 1.0;
 
-    i_maxwidth = std::min( maximumWidth(), width() ) - MARGIN * 2;
-    i_maxheight = std::min( maximumHeight(), height() ) - MARGIN * 2;
+    i_maxwidth  = __MIN( maximumWidth(), width() ) - MARGIN * 2;
+    i_maxheight = __MIN( maximumHeight(), height() ) - MARGIN * 2;
 
     if ( height() > MARGIN * 2 )
     {



More information about the vlc-commits mailing list