Use std::min/max instead of ancient macros.

Signed-off-by: Alexander Golubev <[email protected]>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/kooldock.cpp b/src/kooldock.cpp
index d81143e..d6d853a 100644
--- a/src/kooldock.cpp
+++ b/src/kooldock.cpp
@@ -60,10 +60,7 @@
 #include <kdebug.h>
 #include "setupdialogprg.h"
 
-// macros
-#define min(a, b) (a < b) ? (a) : (b)
-#define max(a, b) (a > b) ? (a) : (b)
-
+#include <algorithm>
 #include <dcopclient.h>
 //#include <iostream>
 #include <tqdatastream.h>
@@ -1124,10 +1121,10 @@ void KoolDock::mMoveEvent(int ex, int ey)
       else {
         iSize[i] = iwSmall;
         if (cx[i] < mx) {
-          ii_first = min (i + 1, items.count() - 1);
+          ii_first = std::min (i + 1, items.count() - 1);
         }
         else if (ii_last == (int) items.count() - 1) {
-          ii_last = max (i - 1, 0);
+          ii_last = std::max ( (int) i - 1, 0);
         }
       }
     }