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/plastik/plastik.cpp | 6 +++--- twin/clients/plastik/plastikbutton.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'twin/clients/plastik') 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); -- cgit v1.2.3