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. --- twin/clients/keramik/keramik.cpp | 20 ++++++++++---------- twin/clients/plastik/plastik.cpp | 6 +++--- twin/clients/plastik/plastikbutton.cpp | 2 +- twin/clients/web/Web.cpp | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'twin/clients') diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 02320d9ad..cdfd822c4 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -1279,7 +1279,7 @@ void KeramikClient::updateCaptionBuffer() int tw = p.fontMetrics().width( caption() ) + ( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 ); - int xpos = QMAX( (captionRect.width() - tw) / 3, 8 ); + int xpos = TQMAX( (captionRect.width() - tw) / 3, 8 ); TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, captionRect.height() - 4), captionBuffer.rect() ); @@ -1348,7 +1348,7 @@ void KeramikClient::calculateCaptionRect() if ( clientHandler->showAppIcons() ) cw += 16 + 4; // icon width + space - cw = QMIN( cw, titlebar->geometry().width() ); + cw = TQMIN( cw, titlebar->geometry().width() ); captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), cw, clientHandler->titleBarHeight(largeCaption) ), titlebar->geometry() ); @@ -1554,8 +1554,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e ) // Space between the top left corner and the caption bubble if ( updateRect.x() < captionRect.left() && updateRect.right() >= 15 ) { - int x1 = QMAX( 15, updateRect.x() ); - int x2 = QMIN( captionRect.left(), updateRect.right() ); + int x1 = TQMAX( 15, updateRect.x() ); + int x2 = TQMIN( captionRect.left(), updateRect.right() ); p.drawTiledPixmap( x1, titleBaseY, x2 - x1 + 1, titleBarBaseHeight, *clientHandler->tile( TitleCenter, active ) ); @@ -1572,8 +1572,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e ) // Space between the caption bubble and the top right corner if ( updateRect.right() > captionRect.right() && updateRect.x() < width() - 15 ) { // FRAME - int x1 = QMAX( captionRect.right() + 1, updateRect.x() ); - int x2 = QMIN( width() - 15, updateRect.right() ); + int x1 = TQMAX( captionRect.right() + 1, updateRect.x() ); + int x2 = TQMIN( width() - 15, updateRect.right() ); p.drawTiledPixmap( x1, titleBaseY, x2 - x1 + 1, titleBarBaseHeight, *clientHandler->tile( TitleCenter, active ) ); @@ -1590,8 +1590,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e ) if ( updateRect.bottom() >= titleBarHeight && updateRect.top() < height() - grabBarHeight ) { - int top = QMAX( titleBarHeight, updateRect.top() ); - int bottom = QMIN( updateRect.bottom(), height() - grabBarHeight ); + int top = TQMAX( titleBarHeight, updateRect.top() ); + int bottom = TQMIN( updateRect.bottom(), height() - grabBarHeight ); // Left border if ( updateRect.x() < leftBorderWidth ) @@ -1614,8 +1614,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e ) // Space between the left corner and the right corner if ( updateRect.x() < width() - 9 ) { - int x1 = QMAX( 9, updateRect.x() ); - int x2 = QMIN( width() - 9, updateRect.right() ); + int x1 = TQMAX( 9, updateRect.x() ); + int x2 = TQMIN( width() - 9, updateRect.right() ); p.drawTiledPixmap( x1, height() - grabBarHeight, x2 - x1 + 1, grabBarHeight, *clientHandler->tile( GrabBarCenter, active ) ); diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp index 5e03b7a51..b5cdeb85b 100644 --- a/twin/clients/plastik/plastik.cpp +++ b/twin/clients/plastik/plastik.cpp @@ -171,7 +171,7 @@ void PlastikHandler::readConfig() TQFontMetrics fm(m_titleFont); // active font = inactive font int titleHeightMin = config.readNumEntry("MinTitleHeight", 16); // The title should strech with bigger font sizes! - m_titleHeight = QMAX(titleHeightMin, fm.height() + 4); // 4 px for the shadow etc. + m_titleHeight = TQMAX(titleHeightMin, fm.height() + 4); // 4 px for the shadow etc. // have an even title/button size so the button icons are fully centered... if ( m_titleHeight%2 == 0) m_titleHeight++; @@ -179,7 +179,7 @@ void PlastikHandler::readConfig() fm = TQFontMetrics(m_titleFontTool); // active font = inactive font int titleHeightToolMin = config.readNumEntry("MinTitleHeightTool", 13); // The title should strech with bigger font sizes! - m_titleHeightTool = QMAX(titleHeightToolMin, fm.height() ); // don't care about the shadow etc. + m_titleHeightTool = TQMAX(titleHeightToolMin, fm.height() ); // don't care about the shadow etc. // have an even title/button size so the button icons are fully centered... if ( m_titleHeightTool%2 == 0) m_titleHeightTool++; @@ -560,7 +560,7 @@ const TQBitmap &PlastikHandler::buttonBitmap(ButtonIcon type, const TQSize &size delete m_bitmaps[toolWindow][typeIndex]; m_bitmaps[toolWindow][typeIndex] = 0; - TQBitmap bmp = IconEngine::icon(type /*icon*/, QMIN(w,h) ); + TQBitmap bmp = IconEngine::icon(type /*icon*/, TQMIN(w,h) ); TQBitmap *bitmap = new TQBitmap(bmp); m_bitmaps[toolWindow][typeIndex] = bitmap; return *bitmap; diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp index 428c8e72c..3a097be15 100644 --- a/twin/clients/plastik/plastikbutton.cpp +++ b/twin/clients/plastik/plastikbutton.cpp @@ -531,7 +531,7 @@ TQBitmap IconEngine::icon(ButtonIcon icon, int size) lw2 = 1; } - int h = QMAX( (r.width()/2), (lw1+2*lw2) ); + int h = TQMAX( (r.width()/2), (lw1+2*lw2) ); // horizontal bars drawObject(p, HorizontalLine, r.x(), r.y(), r.width(), lw1); diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp index 53ec5a4df..496187d3b 100644 --- a/twin/clients/web/Web.cpp +++ b/twin/clients/web/Web.cpp @@ -179,7 +179,7 @@ WebClient::init() default: borderSize_ = 4; } - titleHeight_ = QMAX(QMAX(14, fm.height() + textVMargin * 2), borderSize_); + titleHeight_ = TQMAX(TQMAX(14, fm.height() + textVMargin * 2), borderSize_); if (0 != titleHeight_ % 2) titleHeight_ += 1; @@ -202,7 +202,7 @@ WebClient::reset( unsigned long changed ) // title height const int textVMargin = 2; TQFontMetrics fm(options()->font(isActive(), isToolWindow())); - titleHeight_ = QMAX(QMAX(14, fm.height() + textVMargin * 2), borderSize_); + titleHeight_ = TQMAX(TQMAX(14, fm.height() + textVMargin * 2), borderSize_); if (0 != titleHeight_ % 2) titleHeight_ += 1; -- cgit v1.2.1