Qt4 -reinventing the wheel is ALWAYS a good idea...

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 5f1b85d687f48c7a2e9174d0cf0c42e9c65377d0..433389eecda9b31514a899e0056f2c50212e47d0 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -551,7 +551,7 @@ QSize MainInterface::sizeHint() const
     if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget()  )
     {
         nheight += dockPL->size().height();
-        nwidth = MAX( nwidth, dockPL->size().width() );
+        nwidth = __MAX( nwidth, dockPL->size().width() );
         msg_Dbg( p_intf, "3 %i %i", nheight, nwidth );
     }
     msg_Dbg( p_intf, "4 %i %i", nheight, nwidth );

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 94b283a0fdbf7ae6b99c29e66468e3029b2aea99..7670514801884e3a386ac79b931cbd30c2cc8d93 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -93,8 +93,6 @@ struct intf_sys_t
 #define TOGGLEV( x ) { if( x->isVisible() ) x->hide();          \
             else  x->show(); }
 
-#define MAX(A,B) ( (A) > (B) ? (A):(B))
-
 static int DialogEvent_Type = QEvent::User + 1;
 //static int PLUndockEvent_Type = QEvent::User + 2;
 //static int PLDockEvent_Type = QEvent::User + 3;