From 90f1f50f00651f7bc9f8acf50556968b4288400d Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 28 Nov 2013 13:30:19 -0600 Subject: Fix remnant QMIN/QMAX to TQMIN/TQMAX. --- ksplashml/main.cpp | 2 +- ksplashml/themeengine/default/themelegacy.cpp | 2 +- ksplashml/themeengine/standard/wndicon.cpp | 16 ++++++++-------- ksplashml/themeengine/standard/wndstatus.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ksplashml') diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp index 790e0e5d6..b36c6a2bd 100644 --- a/ksplashml/main.cpp +++ b/ksplashml/main.cpp @@ -64,7 +64,7 @@ int main( int argc, char **argv ) KSplash wndMain("ksplash"); if ( arg->isSet( "steps" ) ) { - int steps = QMAX( arg->getOption( "steps" ).toInt(), 0 ); + int steps = TQMAX( arg->getOption( "steps" ).toInt(), 0 ); if ( steps ) wndMain.setStartupItemCount( steps ); } diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index bd56f968b..7cebc5a33 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -163,7 +163,7 @@ void ThemeDefault::_initUi() mProgressBar->setBackgroundOrigin( TQWidget::ParentOrigin ); mProgressBar->setPaletteBackgroundPixmap( blimage ); - bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) ); + bottom_label->setFixedWidth( TQMAX(blimage.width(),tlimage.width()) ); bottom_label->setFixedHeight( mLabel->sizeHint().height()+4 ); // 3 pixels of whitespace between the label and the progressbar. diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index 030456f4e..856547895 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -122,7 +122,7 @@ TQPoint WndIcon::determinePosition() nSlot = ( DW / wid ); while( x > nSlot ) { - x = QMAX(0,x-nSlot); + x = TQMAX(0,x-nSlot); y++; } X = (3) + ((x - 1) * wid); @@ -134,7 +134,7 @@ TQPoint WndIcon::determinePosition() nSlot = ( DW / wid ); while( x > nSlot ) { - x = QMAX(0,x-nSlot); + x = TQMAX(0,x-nSlot); y++; } X = (3) + ((x - 1) * wid); @@ -146,7 +146,7 @@ TQPoint WndIcon::determinePosition() nSlot = ( DW / wid ); while( x > nSlot ) { - x = QMAX(0,x-nSlot); + x = TQMAX(0,x-nSlot); y++; } X = (DW - 3) - (( x ) * wid ); @@ -158,7 +158,7 @@ TQPoint WndIcon::determinePosition() nSlot = ( DW / wid ); while( x > nSlot ) { - x = QMAX(0,x-nSlot); + x = TQMAX(0,x-nSlot); y++; } X = (DW - 3) - (( x ) * wid ); @@ -170,7 +170,7 @@ TQPoint WndIcon::determinePosition() nSlot = ( DH / wid ); while( x > nSlot ) { - x = QMAX(0,x-nSlot); + x = TQMAX(0,x-nSlot); y++; } X = (3) + (( y - 1 ) * wid ); @@ -182,7 +182,7 @@ TQPoint WndIcon::determinePosition() nSlot = ( DH / wid ); while( x > nSlot ) { - x = QMAX(0,x-nSlot); + x = TQMAX(0,x-nSlot); y++; } X = (DW - 3) - (( y ) * wid ); @@ -194,7 +194,7 @@ TQPoint WndIcon::determinePosition() nSlot = ( DH / wid ); while( x > nSlot ) { - x = QMAX(0,x-nSlot); + x = TQMAX(0,x-nSlot); y++; } X = (3) + (( y - 1 ) * wid ); @@ -206,7 +206,7 @@ TQPoint WndIcon::determinePosition() nSlot = ( DH / wid ); while( x > nSlot ) { - x = QMAX(0,x-nSlot); + x = TQMAX(0,x-nSlot); y++; } X = (DW - 3) - (( y ) * wid ); diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp index b3a2e69f9..9eb8be9a0 100644 --- a/ksplashml/themeengine/standard/wndstatus.cpp +++ b/ksplashml/themeengine/standard/wndstatus.cpp @@ -72,7 +72,7 @@ WndStatus::WndStatus( TQPalette /*pal*/, TQWidget *widg = new TQWidget( this ); setStretchFactor(widg,50); - setFixedSize( rect.width(), QMAX(m_progress->height(),m_label->height()) ); + setFixedSize( rect.width(), TQMAX(m_progress->height(),m_label->height()) ); if ( atTop ) move( rect.topLeft() ); -- cgit v1.2.3