summaryrefslogtreecommitdiffstats
path: root/twin
diff options
context:
space:
mode:
Diffstat (limited to 'twin')
-rw-r--r--twin/client.cpp4
-rw-r--r--twin/clients/keramik/keramik.cpp20
-rw-r--r--twin/clients/plastik/plastik.cpp6
-rw-r--r--twin/clients/plastik/plastikbutton.cpp2
-rw-r--r--twin/clients/web/Web.cpp4
-rw-r--r--twin/geometry.cpp20
-rw-r--r--twin/geometrytip.cpp2
-rw-r--r--twin/kcmtwin/twinoptions/windows.cpp2
-rw-r--r--twin/lib/kcommondecoration.cpp4
-rw-r--r--twin/placement.cpp4
-rw-r--r--twin/rules.cpp2
-rw-r--r--twin/tabbox.cpp8
12 files changed, 39 insertions, 39 deletions
diff --git a/twin/client.cpp b/twin/client.cpp
index 957a0b3ba..a5b5e808b 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -889,7 +889,7 @@ void Client::setShade( ShadeMode mode )
// FRAME repaint( FALSE );
// bool wasStaticContents = testWFlags( WStaticContents );
// setWFlags( WStaticContents );
- int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
+ int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
do
{
h -= step;
@@ -919,7 +919,7 @@ void Client::setShade( ShadeMode mode )
TQSize s( sizeForClientSize( clientSize()));
// FRAME bool wasStaticContents = testWFlags( WStaticContents );
// setWFlags( WStaticContents );
- int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
+ int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
do
{
h += step;
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;
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 84f3fa25f..5c71e7c1f 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -717,10 +717,10 @@ void Client::keepInArea( TQRect area, bool partial )
if( partial )
{
// increase the area so that can have only 100 pixels in the area
- area.setLeft( QMIN( area.left() - width() + 100, area.left()));
- area.setTop( QMIN( area.top() - height() + 100, area.top()));
- area.setRight( QMAX( area.right() + width() - 100, area.right()));
- area.setBottom( QMAX( area.bottom() + height() - 100, area.bottom()));
+ area.setLeft( TQMIN( area.left() - width() + 100, area.left()));
+ area.setTop( TQMIN( area.top() - height() + 100, area.top()));
+ area.setRight( TQMAX( area.right() + width() - 100, area.right()));
+ area.setBottom( TQMAX( area.bottom() + height() - 100, area.bottom()));
}
if ( geometry().right() > area.right() && width() < area.width() )
move( area.right() - width(), y() );
@@ -1131,10 +1131,10 @@ TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool nofra
if( decominsize.height() > min_size.height())
min_size.setHeight( decominsize.height());
}
- w = QMIN( max_size.width(), w );
- h = QMIN( max_size.height(), h );
- w = QMAX( min_size.width(), w );
- h = QMAX( min_size.height(), h );
+ w = TQMIN( max_size.width(), w );
+ h = TQMIN( max_size.height(), h );
+ w = TQMAX( min_size.width(), w );
+ h = TQMAX( min_size.height(), h );
int w1 = w;
int h1 = h;
@@ -1307,8 +1307,8 @@ void Client::getWmNormalHints()
xSizeHint.max_width = xSizeHint.max_height = INT_MAX;
else
{
- xSizeHint.max_width = QMAX( xSizeHint.max_width, 1 );
- xSizeHint.max_height = QMAX( xSizeHint.max_height, 1 );
+ xSizeHint.max_width = TQMAX( xSizeHint.max_width, 1 );
+ xSizeHint.max_height = TQMAX( xSizeHint.max_height, 1 );
}
if( xSizeHint.flags & PResizeInc )
{
diff --git a/twin/geometrytip.cpp b/twin/geometrytip.cpp
index 046f1d594..66ed01cf0 100644
--- a/twin/geometrytip.cpp
+++ b/twin/geometrytip.cpp
@@ -48,7 +48,7 @@ void GeometryTip::setGeometry( const TQRect& geom )
}
}
- h = QMAX( h, 0 ); // in case of isShade() and PBaseSize
+ h = TQMAX( h, 0 ); // in case of isShade() and PBaseSize
TQString pos;
pos.sprintf( "%+d,%+d<br>(<b>%d&nbsp;x&nbsp;%d</b>)",
geom.x(), geom.y(), w, h );
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 74b8d3140..38e72d953 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -192,7 +192,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool)));
fLay->addWidget(clickRaiseOn);
-// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(),
+// fLay->addColSpacing(0,TQMAX(autoRaiseOn->sizeHint().width(),
// clickRaiseOn->sizeHint().width()) + 15);
TQHBoxLayout* focusStealingLayout = new TQHBoxLayout(lay,KDialog::spacingHint());
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 997845a5c..48db91040 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -524,8 +524,8 @@ void KCommonDecoration::resize( const TQSize& s )
TQSize KCommonDecoration::minimumSize() const
{
- const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft))
- +QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight))
+ const int minWidth = TQMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft))
+ +TQMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight))
+layoutMetric(LM_TitleBorderLeft)+layoutMetric(LM_TitleBorderRight);
return TQSize(minWidth,
layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)
diff --git a/twin/placement.cpp b/twin/placement.cpp
index 84be2e0b8..bea707d1f 100644
--- a/twin/placement.cpp
+++ b/twin/placement.cpp
@@ -188,8 +188,8 @@ void Placement::placeSmart(Client* c, const TQRect& area, Policy /*next*/ )
if((cxl < xr) && (cxr > xl) &&
(cyt < yb) && (cyb > yt))
{
- xl = QMAX(cxl, xl); xr = QMIN(cxr, xr);
- yt = QMAX(cyt, yt); yb = QMIN(cyb, yb);
+ xl = TQMAX(cxl, xl); xr = TQMIN(cxr, xr);
+ yt = TQMAX(cyt, yt); yb = TQMIN(cyb, yb);
if((*l)->keepAbove())
overlap += 16 * (xr - xl) * (yb - yt);
else if((*l)->keepBelow() && !(*l)->isDock()) // ignore KeepBelow windows
diff --git a/twin/rules.cpp b/twin/rules.cpp
index fb22b86e7..63fc0e37b 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -113,7 +113,7 @@ Rules::Rules( TDEConfig& cfg )
readFromCfg( cfg );
}
-static int limit0to4( int i ) { return QMAX( 0, QMIN( 4, i )); }
+static int limit0to4( int i ) { return TQMAX( 0, TQMIN( 4, i )); }
void Rules::readFromCfg( TDEConfig& cfg )
{
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index 3d75edef1..505af7abc 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -183,7 +183,7 @@ void TabBox::reset()
// calculate height of 1 line
// fontheight + 1 pixel above + 1 pixel below, or 32x32 icon + 2 pixel above + below
- lineHeight = QMAX(fontMetrics().height() + 2, 32 + 4);
+ lineHeight = TQMAX(fontMetrics().height() + 2, 32 + 4);
if ( mode() == WindowsMode )
{
@@ -218,7 +218,7 @@ void TabBox::reset()
{
showMiniIcon = true;
// fontheight + 1 pixel above + 1 pixel below, or 16x16 icon + 1 pixel above + below
- lineHeight = QMAX(fontMetrics().height() + 2, 16 + 2);
+ lineHeight = TQMAX(fontMetrics().height() + 2, 16 + 2);
h = clients.count() * lineHeight;
@@ -496,11 +496,11 @@ void TabBox::drawContents( TQPainter * )
int wmax = 0;
for ( int i = 1; i <= workspace()->numberOfDesktops(); i++ )
{
- wmax = QMAX(wmax, fontMetrics().width(workspace()->desktopName(i)));
+ wmax = TQMAX(wmax, fontMetrics().width(workspace()->desktopName(i)));
// calculate max width of desktop-number text
TQString num = TQString::number(i);
- iconWidth = QMAX(iconWidth - 4, fm.boundingRect(num).width()) + 4;
+ iconWidth = TQMAX(iconWidth - 4, fm.boundingRect(num).width()) + 4;
}
// In DesktopMode, start at the current desktop
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 13:33:02 +0000