summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2013-11-28 13:28:01 -0600
committerDarrell Anderson <[email protected]>2013-11-28 13:28:01 -0600
commit72849e2a6f973af3eeaa573a66635e37cc427bb0 (patch)
tree2d3beea645819ba70a32c19a092a874f4e89c399 /tdecore
parentb46a7c35c167304acc48675b979ca8b32bc3d293 (diff)
downloadtdelibs-72849e2a6f973af3eeaa573a66635e37cc427bb0.tar.gz
tdelibs-72849e2a6f973af3eeaa573a66635e37cc427bb0.zip
Fix remnant QMIN/QMAX to TQMIN/TQMAX.
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kdebug.cpp2
-rw-r--r--tdecore/kiconeffect.cpp6
-rw-r--r--tdecore/kiconloader.cpp2
-rw-r--r--tdecore/tdeconfigskeleton.cpp28
4 files changed, 19 insertions, 19 deletions
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 13894cf19..e4219cd75 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -587,7 +587,7 @@ kdbgstream& kdbgstream::operator<<( const TQByteArray& data) {
if (!print) return *this;
output += '[';
unsigned int i = 0;
- unsigned int sz = QMIN( data.size(), 64 );
+ unsigned int sz = TQMIN( data.size(), 64 );
for ( ; i < sz ; ++i ) {
output += TQString::number( (unsigned char) data[i], 16 ).rightJustify(2, '0');
if ( i < sz )
diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp
index c1a4a8ca5..675731401 100644
--- a/tdecore/kiconeffect.cpp
+++ b/tdecore/kiconeffect.cpp
@@ -693,7 +693,7 @@ void TDEIconEffect::overlay(TQImage &src, TQImage &overlay)
r2 = (a1 * r1 + (0xff - a1) * r2) >> 8;
g2 = (a1 * g1 + (0xff - a1) * g2) >> 8;
b2 = (a1 * b1 + (0xff - a1) * b2) >> 8;
- a2 = QMAX(a1, a2);
+ a2 = TQMAX(a1, a2);
sline[j] = tqRgba(r2, g2, b2, a2);
}
@@ -711,7 +711,7 @@ TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect)
uint actSpeed = TDEGlobalSettings::visualActivateSpeed();
- uint actCount = QMIN(rect.width(), rect.height()) / 2;
+ uint actCount = TQMIN(rect.width(), rect.height()) / 2;
// Clip actCount to range 1..10.
@@ -749,7 +749,7 @@ TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect)
// The spacing between the rects we draw.
// Use the minimum of width and height to avoid painting outside the
// pixmap area.
- //unsigned int delta(QMIN(rect.width() / actCount, rect.height() / actCount));
+ //unsigned int delta(TQMIN(rect.width() / actCount, rect.height() / actCount));
// Support for rectangles by David
unsigned int deltaX = rect.width() / actCount;
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index df233cec1..0f13f7cef 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -814,7 +814,7 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in
{
QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y));
for (int x = 0; x < img->width(); x++)
- line[x] = (line[x] & 0x00ffffff) | (QMIN(0x80, tqAlpha(line[x])) << 24);
+ line[x] = (line[x] & 0x00ffffff) | (TQMIN(0x80, tqAlpha(line[x])) << 24);
}
}
}
diff --git a/tdecore/tdeconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp
index 45a4b4112..4a389f3fe 100644
--- a/tdecore/tdeconfigskeleton.cpp
+++ b/tdecore/tdeconfigskeleton.cpp
@@ -177,9 +177,9 @@ void TDEConfigSkeleton::ItemInt::readConfig( TDEConfig *config )
config->setGroup( mGroup );
mReference = config->readNumEntry( mKey, mDefault );
if (mHasMin)
- mReference = QMAX(mReference, mMin);
+ mReference = TQMAX(mReference, mMin);
if (mHasMax)
- mReference = QMIN(mReference, mMax);
+ mReference = TQMIN(mReference, mMax);
mLoadedValue = mReference;
readImmutability( config );
@@ -234,9 +234,9 @@ void TDEConfigSkeleton::ItemInt64::readConfig( TDEConfig *config )
config->setGroup( mGroup );
mReference = config->readNum64Entry( mKey, mDefault );
if (mHasMin)
- mReference = QMAX(mReference, mMin);
+ mReference = TQMAX(mReference, mMin);
if (mHasMax)
- mReference = QMIN(mReference, mMax);
+ mReference = TQMIN(mReference, mMax);
mLoadedValue = mReference;
readImmutability( config );
@@ -348,9 +348,9 @@ void TDEConfigSkeleton::ItemUInt::readConfig( TDEConfig *config )
config->setGroup( mGroup );
mReference = config->readUnsignedNumEntry( mKey, mDefault );
if (mHasMin)
- mReference = QMAX(mReference, mMin);
+ mReference = TQMAX(mReference, mMin);
if (mHasMax)
- mReference = QMIN(mReference, mMax);
+ mReference = TQMIN(mReference, mMax);
mLoadedValue = mReference;
readImmutability( config );
@@ -405,9 +405,9 @@ void TDEConfigSkeleton::ItemUInt64::readConfig( TDEConfig *config )
config->setGroup( mGroup );
mReference = config->readUnsignedNum64Entry( mKey, mDefault );
if (mHasMin)
- mReference = QMAX(mReference, mMin);
+ mReference = TQMAX(mReference, mMin);
if (mHasMax)
- mReference = QMIN(mReference, mMax);
+ mReference = TQMIN(mReference, mMax);
mLoadedValue = mReference;
readImmutability( config );
@@ -461,9 +461,9 @@ void TDEConfigSkeleton::ItemLong::readConfig( TDEConfig *config )
config->setGroup( mGroup );
mReference = config->readLongNumEntry( mKey, mDefault );
if (mHasMin)
- mReference = QMAX(mReference, mMin);
+ mReference = TQMAX(mReference, mMin);
if (mHasMax)
- mReference = QMIN(mReference, mMax);
+ mReference = TQMIN(mReference, mMax);
mLoadedValue = mReference;
readImmutability( config );
@@ -519,9 +519,9 @@ void TDEConfigSkeleton::ItemULong::readConfig( TDEConfig *config )
config->setGroup( mGroup );
mReference = config->readUnsignedLongNumEntry( mKey, mDefault );
if (mHasMin)
- mReference = QMAX(mReference, mMin);
+ mReference = TQMAX(mReference, mMin);
if (mHasMax)
- mReference = QMIN(mReference, mMax);
+ mReference = TQMIN(mReference, mMax);
mLoadedValue = mReference;
readImmutability( config );
@@ -576,9 +576,9 @@ void TDEConfigSkeleton::ItemDouble::readConfig( TDEConfig *config )
config->setGroup( mGroup );
mReference = config->readDoubleNumEntry( mKey, mDefault );
if (mHasMin)
- mReference = QMAX(mReference, mMin);
+ mReference = TQMAX(mReference, mMin);
if (mHasMax)
- mReference = QMIN(mReference, mMax);
+ mReference = TQMIN(mReference, mMax);
mLoadedValue = mReference;
readImmutability( config );