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.cpp4
-rw-r--r--twin/geometry.cpp58
-rw-r--r--twin/popupinfo.cpp2
4 files changed, 34 insertions, 34 deletions
diff --git a/twin/client.cpp b/twin/client.cpp
index 42aac61ad..74bee8535 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -896,7 +896,7 @@ void Client::setShade( ShadeMode mode )
// FRAME repaint( FALSE );
// bool wasStaticContents = testWFlags( WStaticContents );
// setWFlags( WStaticContents );
- int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
+ int step = TQMAX( 4, TQABS( h - s.height() ) / as )+1;
do
{
h -= step;
@@ -926,7 +926,7 @@ void Client::setShade( ShadeMode mode )
TQSize s( sizeForClientSize( clientSize()));
// FRAME bool wasStaticContents = testWFlags( WStaticContents );
// setWFlags( WStaticContents );
- int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
+ int step = TQMAX( 4, TQABS( h - s.height() ) / as )+1;
do
{
h += step;
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 73bc859fc..0a9c7e2d5 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -1647,10 +1647,10 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
int dy = 0;
if ( e->oldSize().width() != width() )
- dx = 32 + QABS( e->oldSize().width() - width() );
+ dx = 32 + TQABS( e->oldSize().width() - width() );
if ( e->oldSize().height() != height() )
- dy = 8 + QABS( e->oldSize().height() - height() );
+ dy = 8 + TQABS( e->oldSize().height() - height() );
if ( dy )
widget()->update( 0, height() - dy + 1, width(), dy );
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 6f21e90da..8d08a502c 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -337,23 +337,23 @@ TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
int snap = options->borderSnapZone; //snap trigger
if (snap)
{
- if ((sOWO?(cx<xmin):true) && (QABS(xmin-cx)<snap))
+ if ((sOWO?(cx<xmin):true) && (TQABS(xmin-cx)<snap))
{
deltaX = xmin-cx;
nx = xmin;
}
- if ((sOWO?(rx>xmax):true) && (QABS(rx-xmax)<snap) && (QABS(xmax-rx) < deltaX))
+ if ((sOWO?(rx>xmax):true) && (TQABS(rx-xmax)<snap) && (TQABS(xmax-rx) < deltaX))
{
deltaX = rx-xmax;
nx = xmax - cw;
}
- if ((sOWO?(cy<ymin):true) && (QABS(ymin-cy)<snap))
+ if ((sOWO?(cy<ymin):true) && (TQABS(ymin-cy)<snap))
{
deltaY = ymin-cy;
ny = ymin;
}
- if ((sOWO?(ry>ymax):true) && (QABS(ry-ymax)<snap) && (QABS(ymax-ry) < deltaY))
+ if ((sOWO?(ry>ymax):true) && (TQABS(ry-ymax)<snap) && (TQABS(ymax-ry) < deltaY))
{
deltaY =ry-ymax;
ny = ymax - ch;
@@ -380,14 +380,14 @@ TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
(( ry >= ly ) && ( ry <= lry )) ||
(( cy <= ly ) && ( ry >= lry )) )
{
- if ((sOWO?(cx<lrx):true) && (QABS(lrx-cx)<snap) && ( QABS(lrx -cx) < deltaX) )
+ if ((sOWO?(cx<lrx):true) && (TQABS(lrx-cx)<snap) && ( TQABS(lrx -cx) < deltaX) )
{
- deltaX = QABS( lrx - cx );
+ deltaX = TQABS( lrx - cx );
nx = lrx;
}
- if ((sOWO?(rx>lx):true) && (QABS(rx-lx)<snap) && ( QABS( rx - lx )<deltaX) )
+ if ((sOWO?(rx>lx):true) && (TQABS(rx-lx)<snap) && ( TQABS( rx - lx )<deltaX) )
{
- deltaX = QABS(rx - lx);
+ deltaX = TQABS(rx - lx);
nx = lx - cw;
}
}
@@ -396,15 +396,15 @@ TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
(( rx >= lx ) && ( rx <= lrx )) ||
(( cx <= lx ) && ( rx >= lrx )) )
{
- if ((sOWO?(cy<lry):true) && (QABS(lry-cy)<snap) && (QABS( lry -cy ) < deltaY))
+ if ((sOWO?(cy<lry):true) && (TQABS(lry-cy)<snap) && (TQABS( lry -cy ) < deltaY))
{
- deltaY = QABS( lry - cy );
+ deltaY = TQABS( lry - cy );
ny = lry;
}
- //if ( (QABS( ry-ly ) < snap) && (QABS( ry - ly ) < deltaY ))
- if ((sOWO?(ry>ly):true) && (QABS(ry-ly)<snap) && (QABS( ry - ly ) < deltaY ))
+ //if ( (TQABS( ry-ly ) < snap) && (TQABS( ry - ly ) < deltaY ))
+ if ((sOWO?(ry>ly):true) && (TQABS(ry-ly)<snap) && (TQABS( ry - ly ) < deltaY ))
{
- deltaY = QABS( ry - ly );
+ deltaY = TQABS( ry - ly );
ny = ly - ch;
}
}
@@ -451,30 +451,30 @@ TQRect Workspace::adjustClientSize( Client* c, TQRect moveResizeGeom, int mode )
deltaY = int(snap);
#define SNAP_BORDER_TOP \
- if ((sOWO?(newcy<ymin):true) && (QABS(ymin-newcy)<deltaY)) \
+ if ((sOWO?(newcy<ymin):true) && (TQABS(ymin-newcy)<deltaY)) \
{ \
- deltaY = QABS(ymin-newcy); \
+ deltaY = TQABS(ymin-newcy); \
newcy = ymin; \
}
#define SNAP_BORDER_BOTTOM \
- if ((sOWO?(newry>ymax):true) && (QABS(ymax-newry)<deltaY)) \
+ if ((sOWO?(newry>ymax):true) && (TQABS(ymax-newry)<deltaY)) \
{ \
- deltaY = QABS(ymax-newcy); \
+ deltaY = TQABS(ymax-newcy); \
newry = ymax; \
}
#define SNAP_BORDER_LEFT \
- if ((sOWO?(newcx<xmin):true) && (QABS(xmin-newcx)<deltaX)) \
+ if ((sOWO?(newcx<xmin):true) && (TQABS(xmin-newcx)<deltaX)) \
{ \
- deltaX = QABS(xmin-newcx); \
+ deltaX = TQABS(xmin-newcx); \
newcx = xmin; \
}
#define SNAP_BORDER_RIGHT \
- if ((sOWO?(newrx>xmax):true) && (QABS(xmax-newrx)<deltaX)) \
+ if ((sOWO?(newrx>xmax):true) && (TQABS(xmax-newrx)<deltaX)) \
{ \
- deltaX = QABS(xmax-newrx); \
+ deltaX = TQABS(xmax-newrx); \
newrx = xmax; \
}
switch ( mode )
@@ -543,30 +543,30 @@ TQRect Workspace::adjustClientSize( Client* c, TQRect moveResizeGeom, int mode )
#define SNAP_WINDOW_TOP if ( (sOWO?(newcy<lry):true) \
&& WITHIN_WIDTH \
- && (QABS( lry - newcy ) < deltaY) ) { \
- deltaY = QABS( lry - newcy ); \
+ && (TQABS( lry - newcy ) < deltaY) ) { \
+ deltaY = TQABS( lry - newcy ); \
newcy=lry; \
}
#define SNAP_WINDOW_BOTTOM if ( (sOWO?(newry>ly):true) \
&& WITHIN_WIDTH \
- && (QABS( ly - newry ) < deltaY) ) { \
- deltaY = QABS( ly - newry ); \
+ && (TQABS( ly - newry ) < deltaY) ) { \
+ deltaY = TQABS( ly - newry ); \
newry=ly; \
}
#define SNAP_WINDOW_LEFT if ( (sOWO?(newcx<lrx):true) \
&& WITHIN_HEIGHT \
- && (QABS( lrx - newcx ) < deltaX)) { \
- deltaX = QABS( lrx - newcx ); \
+ && (TQABS( lrx - newcx ) < deltaX)) { \
+ deltaX = TQABS( lrx - newcx ); \
newcx=lrx; \
}
#define SNAP_WINDOW_RIGHT if ( (sOWO?(newrx>lx):true) \
&& WITHIN_HEIGHT \
- && (QABS( lx - newrx ) < deltaX)) \
+ && (TQABS( lx - newrx ) < deltaX)) \
{ \
- deltaX = QABS( lx - newrx ); \
+ deltaX = TQABS( lx - newrx ); \
newrx=lx; \
}
diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp
index 79386a5a8..c347991fe 100644
--- a/twin/popupinfo.cpp
+++ b/twin/popupinfo.cpp
@@ -74,7 +74,7 @@ void PopupInfo::reset()
void PopupInfo::paintEvent( TQPaintEvent* )
{
TQPainter p( this );
- style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ),
+ style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ),
colorGroup(), TQStyle::Style_Default );
paintContents();
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-01 01:56:01 +0000