=== modified file 'launcher/app/launcherview.cpp'
@@ -32,6 +32,9 @@ #include <X11/Xlib.h> #include <X11/Xatom.h>
+#define MAX(a,b) ((a >= b) ? a : b) +#define MIN(a,b) ((a <= b) ? a : b) +
Remove and replace with Qt's qMax and qMin.
(http://doc.qt.nokia.com/latest/qtglobal.html#qMax)
« Back to merge proposal
=== modified file 'launcher/ app/launchervie w.cpp'
@@ -32,6 +32,9 @@
#include <X11/Xlib.h>
#include <X11/Xatom.h>
+#define MAX(a,b) ((a >= b) ? a : b)
+#define MIN(a,b) ((a <= b) ? a : b)
+
Remove and replace with Qt's qMax and qMin.
(http:// doc.qt. nokia.com/ latest/ qtglobal. html#qMax)