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

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
pull/4/head
Alexander Golubev 5 years ago committed by Slávek Banko
parent f9440f0f50
commit 913d32ae21
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -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);
}
}
}

Loading…
Cancel
Save