summaryrefslogtreecommitdiffstats
path: root/twin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
commit2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (patch)
tree65f4f4370cf4269757d7fa4d0f4d15996a1bf68f /twin
parent73c08b592db45af554b9f21029bc549d70f683ab (diff)
downloadtdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.tar.gz
tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
Diffstat (limited to 'twin')
-rw-r--r--twin/client.cpp92
-rw-r--r--twin/client.h12
-rw-r--r--twin/clients/b2/b2client.cpp54
-rw-r--r--twin/clients/b2/b2client.h4
-rw-r--r--twin/clients/default/kdedefault.cpp26
-rw-r--r--twin/clients/keramik/embedtool.cpp4
-rw-r--r--twin/clients/keramik/keramik.cpp56
-rw-r--r--twin/clients/keramik/keramik.h2
-rw-r--r--twin/clients/kwmtheme/cli_installer/main.cpp16
-rw-r--r--twin/clients/kwmtheme/kwmthemeclient.cpp28
-rw-r--r--twin/clients/kwmtheme/kwmthemeclient.h2
-rw-r--r--twin/clients/laptop/laptopclient.cpp24
-rw-r--r--twin/clients/modernsystem/config/config.cpp8
-rw-r--r--twin/clients/modernsystem/config/config.h2
-rw-r--r--twin/clients/modernsystem/modernsys.cpp20
-rw-r--r--twin/clients/plastik/plastik.cpp2
-rw-r--r--twin/clients/plastik/plastikbutton.cpp2
-rw-r--r--twin/clients/plastik/plastikclient.cpp6
-rw-r--r--twin/clients/quartz/quartz.cpp26
-rw-r--r--twin/clients/redmond/redmond.cpp14
-rw-r--r--twin/clients/test/test.cpp2
-rw-r--r--twin/clients/test/test.h2
-rw-r--r--twin/clients/web/Web.cpp32
-rw-r--r--twin/clients/web/Web.h2
-rw-r--r--twin/clients/web/WebButton.cpp26
-rw-r--r--twin/clients/web/WebButton.h4
-rw-r--r--twin/events.cpp4
-rw-r--r--twin/geometry.cpp4
-rw-r--r--twin/geometrytip.cpp2
-rw-r--r--twin/kcmtwin/twindecoration/buttons.cpp38
-rw-r--r--twin/kcmtwin/twindecoration/buttons.h2
-rw-r--r--twin/kcmtwin/twindecoration/preview.cpp14
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.cpp10
-rw-r--r--twin/kcmtwin/twinoptions/main.cpp2
-rw-r--r--twin/kcmtwin/twinoptions/mouse.cpp14
-rw-r--r--twin/kcmtwin/twinoptions/windows.cpp22
-rw-r--r--twin/kcmtwin/twinrules/detectwidgetbase.ui2
-rw-r--r--twin/kcmtwin/twinrules/editshortcutbase.ui6
-rw-r--r--twin/kcmtwin/twinrules/kcm.cpp2
-rw-r--r--twin/kcmtwin/twinrules/main.cpp4
-rw-r--r--twin/kcmtwin/twinrules/ruleslistbase.ui2
-rw-r--r--twin/kcmtwin/twinrules/ruleswidget.cpp6
-rw-r--r--twin/kcmtwin/twinrules/ruleswidgetbase.ui50
-rw-r--r--twin/killer/killer.cpp4
-rw-r--r--twin/layers.cpp2
-rw-r--r--twin/lib/kcommondecoration.cpp6
-rw-r--r--twin/lib/kcommondecoration.h6
-rw-r--r--twin/lib/kdecoration.cpp4
-rw-r--r--twin/lib/kdecoration.h10
-rw-r--r--twin/lib/kdecoration_p.cpp2
-rw-r--r--twin/lib/kdecorationfactory.h2
-rw-r--r--twin/manage.cpp4
-rw-r--r--twin/options.cpp4
-rw-r--r--twin/options.h2
-rw-r--r--twin/popupinfo.cpp4
-rw-r--r--twin/tabbox.cpp24
-rw-r--r--twin/tools/decobenchmark/main.cpp4
-rw-r--r--twin/tools/decobenchmark/preview.cpp6
-rw-r--r--twin/useractions.cpp6
-rw-r--r--twin/utils.cpp18
-rw-r--r--twin/utils.h10
-rw-r--r--twin/wm-spec/x351.html4
-rw-r--r--twin/workspace.cpp14
63 files changed, 394 insertions, 394 deletions
diff --git a/twin/client.cpp b/twin/client.cpp
index c09df53f..fbd2d75a 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -140,7 +140,7 @@ Client::Client( Workspace *ws )
deleting = false;
keep_above = FALSE;
keep_below = FALSE;
- is_shape = FALSE;
+ is_tqshape = FALSE;
motif_noborder = false;
motif_may_move = TRUE;
motif_may_resize = TRUE;
@@ -285,7 +285,7 @@ void Client::destroyClient()
destroyDecoration();
cleanGrouping();
workspace()->removeClient( this, Allowed );
- client = None; // invalidate
+ client = None; // tqinvalidate
XDestroyWindow( qt_xdisplay(), wrapper );
wrapper = None;
XDestroyWindow( qt_xdisplay(), frame );
@@ -306,7 +306,7 @@ void Client::updateDecoration( bool check_workspace_pos, bool force )
destroyDecoration();
if( !noBorder())
{
- setMask( TQRegion()); // reset shape mask
+ setMask( TQRegion()); // reset tqshape mask
decoration = workspace()->createDecoration( bridge );
// TODO check decoration's minimum size?
decoration->init();
@@ -344,7 +344,7 @@ void Client::destroyDecoration()
decoration = NULL;
TQPoint grav = calculateGravitation( true );
border_left = border_right = border_top = border_bottom = 0;
- setMask( TQRegion()); // reset shape mask
+ setMask( TQRegion()); // reset tqshape mask
int save_workarea_diff_x = workarea_diff_x;
int save_workarea_diff_y = workarea_diff_y;
plainResize( sizeForClientSize( clientSize()), ForceGeometrySet );
@@ -515,32 +515,32 @@ bool Client::isModalSystemNotification() const
void Client::updateShape()
{
- // workaround for #19644 - shaped windows shouldn't have decoration
- if( shape() && !noBorder())
+ // workaround for #19644 - tqshaped windows shouldn't have decoration
+ if( tqshape() && !noBorder())
{
noborder = true;
updateDecoration( true );
}
updateOpacityCache();
- if ( shape() )
+ if ( tqshape() )
{
XShapeCombineShape(qt_xdisplay(), frameId(), ShapeBounding,
clientPos().x(), clientPos().y(),
window(), ShapeBounding, ShapeSet);
setShapable(TRUE);
}
- // !shape() mask setting is done in setMask() when the decoration
+ // !tqshape() mask setting is done in setMask() when the decoration
// calls it or when the decoration is created/destroyed
- if( Shape::version() >= 0x11 ) // 1.1, has input shape support
+ if( Shape::version() >= 0x11 ) // 1.1, has input tqshape support
{ // There appears to be no way to find out if a window has input
- // shape set or not, so always propagate the input shape
- // (it's the same like the bounding shape by default).
- // Also, build the shape using a helper window, not directly
- // in the frame window, because the sequence set-shape-to-frame,
- // remove-shape-of-client, add-input-shape-of-client has the problem
- // that after the second step there's a hole in the input shape
- // until the real shape of the client is added and that can make
+ // tqshape set or not, so always propagate the input tqshape
+ // (it's the same like the bounding tqshape by default).
+ // Also, build the tqshape using a helper window, not directly
+ // in the frame window, because the sequence set-tqshape-to-frame,
+ // remove-tqshape-of-client, add-input-tqshape-of-client has the problem
+ // that after the second step there's a hole in the input tqshape
+ // until the real tqshape of the client is added and that can make
// the window lose focus (which is a problem with mouse focus policies)
static Window helper_window = None;
if( helper_window == None )
@@ -571,7 +571,7 @@ void Client::setMask( const TQRegion& reg, int mode )
reg.handle(), ShapeSet );
else
{
- TQMemArray< TQRect > rects = reg.rects();
+ TQMemArray< TQRect > rects = reg.tqrects();
XRectangle* xrects = new XRectangle[ rects.count() ];
for( unsigned int i = 0;
i < rects.count();
@@ -874,7 +874,7 @@ void Client::setShade( ShadeMode mode )
XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask );
//as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it
//done xcompmgr workaround
-// FRAME repaint( FALSE );
+// FRAME tqrepaint( FALSE );
// bool wasStaticContents = testWFlags( WStaticContents );
// setWFlags( WStaticContents );
int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
@@ -915,7 +915,7 @@ void Client::setShade( ShadeMode mode )
resizeDecoration( TQSize( s.width(), h ));
// assume a border
// we do not have time to wait for X to send us paint events
-// FRAME repaint( 0, h - step-5, width(), step+5, TRUE);
+// FRAME tqrepaint( 0, h - step-5, width(), step+5, TRUE);
TQApplication::syncX();
} while ( h < s.height() - step );
// if ( !wasStaticContents )
@@ -1078,7 +1078,7 @@ void Client::drawIntersectingShadows() {
// active window has a shadow.
return;
- region = shapeBoundingRegion;
+ region = tqshapeBoundingRegion;
// Generate list of Clients whose shadows need to be redrawn. That is,
// those that are currently intersecting or intersected by other windows or
@@ -1116,7 +1116,7 @@ void Client::drawOverlappingShadows(bool waitForMe)
// active window has a shadow.
return;
- region = shapeBoundingRegion;
+ region = tqshapeBoundingRegion;
stacking_order = workspace()->stackingOrder();
for (it = stacking_order.fromLast(); it != stacking_order.end(); --it) {
@@ -1167,7 +1167,7 @@ void Client::drawOverlappingShadows(bool waitForMe)
/*!
Draw shadow after some time has elapsed, to give recently exposed windows a
- chance to repaint before a shadow gradient is drawn over them.
+ chance to tqrepaint before a shadow gradient is drawn over them.
*/
void Client::drawDelayedShadow()
{
@@ -1190,7 +1190,7 @@ void Client::drawShadowAfter(Client *after)
void Client::drawShadow()
{
Window shadows[2];
- XRectangle *shapes;
+ XRectangle *tqshapes;
int i, count, ordering;
// If we are waiting for another Client's shadow to be drawn, stop waiting now
@@ -1206,31 +1206,31 @@ void Client::drawShadow()
* this type of window. Otherwise, drawIntersectingShadows() won't update
* properly when this window is moved/resized/hidden/closed.
*/
- shapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding,
+ tqshapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding,
&count, &ordering);
- if (!shapes)
+ if (!tqshapes)
// XShape extension not supported
- shapeBoundingRegion = TQRegion(x(), y(), width(), height());
+ tqshapeBoundingRegion = TQRegion(x(), y(), width(), height());
else {
- shapeBoundingRegion = TQRegion();
+ tqshapeBoundingRegion = TQRegion();
for (i = 0; i < count; i++) {
// Translate XShaped window into a TQRegion
- TQRegion shapeRectangle(shapes[i].x, shapes[i].y, shapes[i].width,
- shapes[i].height);
- shapeBoundingRegion += shapeRectangle;
+ TQRegion tqshapeRectangle(tqshapes[i].x, tqshapes[i].y, tqshapes[i].width,
+ tqshapes[i].height);
+ tqshapeBoundingRegion += tqshapeRectangle;
}
if (isShade())
// Since XResize() doesn't change a window's XShape regions, ensure that
- // shapeBoundingRegion is not taller than the window's shaded height,
+ // tqshapeBoundingRegion is not taller than the window's shaded height,
// or the bottom shadow will appear to be missing
- shapeBoundingRegion &= TQRegion(0, 0, width(), height());
- shapeBoundingRegion.translate(x(), y());
+ tqshapeBoundingRegion &= TQRegion(0, 0, width(), height());
+ tqshapeBoundingRegion.translate(x(), y());
}
if (!isShadowed() || hidden || isMinimized() ||
maximizeMode() == MaximizeFull ||
!options->shadowWindowType(windowType())) {
- XFree(shapes);
+ XFree(tqshapes);
// Tell whatever Clients are listening that this Client's shadow has been drawn.
// It hasn't, but there's no sense waiting for something that won't happen.
@@ -1264,9 +1264,9 @@ void Client::drawShadow()
ButtonPressMask | ButtonReleaseMask | StructureNotifyMask);
shadowWidget->installEventFilter(this);
- if (!shapes) {
+ if (!tqshapes) {
// XShape extension not supported
- exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(),
+ exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(),
shadow.y(), shadow.width(), shadow.height(), thickness,
xOffset, yOffset);
shadowRegion.region = exposedRegion;
@@ -1274,7 +1274,7 @@ void Client::drawShadow()
shadowRegions.append(shadowRegion);
if (opacityCache->isNull())
- imposeRegionShadow(shadowPixmap, shapeBoundingRegion,
+ imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion,
exposedRegion, thickness,
options->shadowOpacity(isActive()));
else
@@ -1285,7 +1285,7 @@ void Client::drawShadow()
TQMemArray<TQRect>::Iterator it, itEnd;
XRectangle *shadowShapes;
- exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(),
+ exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(),
shadow.y(), shadow.width(), shadow.height(), thickness,
xOffset, yOffset);
shadowRegion.region = exposedRegion;
@@ -1293,7 +1293,7 @@ void Client::drawShadow()
shadowRegions.append(shadowRegion);
// XShape the shadow
- exposedRects = exposedRegion.rects();
+ exposedRects = exposedRegion.tqrects();
i = 0;
itEnd = exposedRects.end();
shadowShapes = new XRectangle[exposedRects.count()];
@@ -1311,14 +1311,14 @@ void Client::drawShadow()
delete [] shadowShapes;
if (opacityCache->isNull())
- imposeRegionShadow(shadowPixmap, shapeBoundingRegion,
+ imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion,
exposedRegion, thickness,
options->shadowOpacity(isActive()));
else
imposeCachedShadow(shadowPixmap, exposedRegion);
}
- XFree(shapes);
+ XFree(tqshapes);
// Set the background pixmap
//shadowPixmap.convertFromImage(shadowImage);
@@ -1391,10 +1391,10 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w,
TQMemArray<TQRect>::Iterator it, itEnd;
TQRegion shadowRegion;
- occludedRects = occludedRegion.rects();
+ occludedRects = occludedRegion.tqrects();
itEnd = occludedRects.end();
for (it = occludedRects.begin(); it != itEnd; ++it) {
- // Expand each of the occluded region's shape rectangles to contain
+ // Expand each of the occluded region's tqshape rectangles to contain
// where a shadow of the specified thickness will be drawn. Create
// a new TQRegion that contains the expanded occluded region
it->setTop(it->top() - thickness + yOffset);
@@ -1425,7 +1425,7 @@ void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed)
Window rootWindow;
int thickness, windowX, windowY, xOffset, yOffset;
- rectangles = exposed.rects();
+ rectangles = exposed.tqrects();
rootWindow = qt_xrootwin();
thickness = options->shadowThickness(isActive());
windowX = this->x();
@@ -1485,7 +1485,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded,
Window rootWindow;
int windowX, windowY, xOffset, yOffset;
- rectangles = exposed.rects();
+ rectangles = exposed.tqrects();
rootWindow = qt_xrootwin();
windowX = this->x();
windowY = this->y();
@@ -2430,7 +2430,7 @@ NET::WindowType Client::windowType( bool direct, int supported_types ) const
}
/*!
- Sets an appropriate cursor shape for the logical mouse position \a m
+ Sets an appropriate cursor tqshape for the logical mouse position \a m
*/
void Client::setCursor( Position m )
diff --git a/twin/client.h b/twin/client.h
index 21c40afa..ec94a994 100644
--- a/twin/client.h
+++ b/twin/client.h
@@ -214,8 +214,8 @@ class Client : public TQObject, public KDecorationDefines
// window to be redrawn.
friend void Workspace::updateOverlappingShadows(WId);
- // shape extensions
- bool shape() const;
+ // tqshape extensions
+ bool tqshape() const;
void updateShape();
void setGeometry( int x, int y, int w, int h, ForceGeometry_t force = NormalGeometrySet );
@@ -501,7 +501,7 @@ class Client : public TQObject, public KDecorationDefines
uint active :1;
uint deleting : 1; // true when doing cleanup and destroying the client
uint keep_above : 1; // NET::KeepAbove (was stays_on_top)
- uint is_shape :1;
+ uint is_tqshape :1;
uint skip_taskbar :1;
uint original_skip_taskbar :1; // unaffected by KWin
uint Pdeletewindow :1; // does the window understand the DeleteWindow protocol?
@@ -570,7 +570,7 @@ class Client : public TQObject, public KDecorationDefines
TQMemArray<double> activeOpacityCache;
TQMemArray<double> inactiveOpacityCache;
TQMemArray<double>* opacityCache;
- TQRegion shapeBoundingRegion;
+ TQRegion tqshapeBoundingRegion;
TQTimer* shadowDelayTimer;
bool shadowMe;
@@ -797,9 +797,9 @@ inline bool Client::keepBelow() const
return keep_below;
}
-inline bool Client::shape() const
+inline bool Client::tqshape() const
{
- return is_shape;
+ return is_tqshape;
}
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 6036a727..c5786146 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -12,7 +12,7 @@
#include "b2client.h"
#include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqdrawutil.h>
#include <kpixmapeffect.h>
#include <kimageeffect.h>
@@ -419,7 +419,7 @@ void B2Client::init()
titleLayout->addSpacing(3);
- TQColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()).
+ TQColor c = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()).
color(TQColorGroup::Button);
for (int i = 0; i < BtnCount; i++) {
@@ -558,7 +558,7 @@ bool B2Client::mustDrawHandle() const
void B2Client::iconChange()
{
if (button[BtnMenu])
- button[BtnMenu]->repaint(false);
+ button[BtnMenu]->tqrepaint(false);
}
// Gallium: New button show/hide magic for customizable
@@ -607,7 +607,7 @@ void B2Client::resizeEvent(TQResizeEvent * /*e*/)
titleMoveAbs(bar_x_ofs);
doShape();
- widget()->repaint(); // the frame is misrendered without this
+ widget()->tqrepaint(); // the frame is misrendered without this
}
void B2Client::captionChange()
@@ -616,7 +616,7 @@ void B2Client::captionChange()
titleMoveAbs(bar_x_ofs);
doShape();
titlebar->recalcBuffer();
- titlebar->repaint(false);
+ titlebar->tqrepaint(false);
}
void B2Client::paintEvent(TQPaintEvent* e)
@@ -635,7 +635,7 @@ void B2Client::paintEvent(TQPaintEvent* e)
int bb = mustDrawHandle() ? 4 : 0;
int bDepth = thickness + bb;
- TQColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive());
+ TQColorGroup fillColor = options()->tqcolorGroup(frameColorGroup, isActive());
TQBrush fillBrush(options()->color(frameColorGroup, isActive()));
// outer frame rect
@@ -710,7 +710,7 @@ void B2Client::paintEvent(TQPaintEvent* e)
visibilitinotify events until its state changes, so we just try
*/
if (titlebar->isFullyObscured()) {
- /* We first see, if our repaint contained the titlebar area */
+ /* We first see, if our tqrepaint contained the titlebar area */
TQRegion reg(TQRect(0, 0, width(), buttonSize + 4));
reg = reg.intersect(e->region());
if (!reg.isEmpty())
@@ -815,8 +815,8 @@ void B2Client::titleMoveAbs(int new_ofs)
bar_x_ofs = new_ofs;
positionButtons();
doShape();
- widget()->repaint(0, 0, width(), buttonSize + 4, false);
- titlebar->repaint(false);
+ widget()->tqrepaint(0, 0, width(), buttonSize + 4, false);
+ titlebar->tqrepaint(false);
}
}
@@ -841,7 +841,7 @@ void B2Client::maximizeChange()
bool m = maximizeMode() == MaximizeFull;
if (button[BtnMax]) {
button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX);
- button[BtnMax]->repaint();
+ button[BtnMax]->tqrepaint();
TQToolTip::remove(button[BtnMax]);
TQToolTip::add(button[BtnMax],
m ? i18n("Restore") : i18n("Maximize"));
@@ -851,21 +851,21 @@ void B2Client::maximizeChange()
g->activate();
doShape();
- widget()->repaint(false);
+ widget()->tqrepaint(false);
}
void B2Client::activeChange()
{
- widget()->repaint(false);
- titlebar->repaint(false);
+ widget()->tqrepaint(false);
+ titlebar->tqrepaint(false);
- TQColor c = options()->colorGroup(
+ TQColor c = options()->tqcolorGroup(
KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button);
for (int i = 0; i < BtnCount; i++)
if (button[i]) {
button[i]->setBg(c);
- button[i]->repaint(false);
+ button[i]->tqrepaint(false);
}
}
@@ -881,7 +881,7 @@ void B2Client::shadeChange()
}
}
-TQSize B2Client::minimumSize() const
+TQSize B2Client::tqminimumSize() const
{
int left, right, top, bottom;
borders(left, right, top, bottom);
@@ -960,8 +960,8 @@ void B2Client::unobscureTitlebar()
static void redraw_pixmaps()
{
int i;
- TQColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true);
- TQColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ TQColorGroup aGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
+ TQColorGroup iGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
// close
drawB2Rect(PIXMAP_A(P_CLOSE), aGrp.button(), false);
@@ -1128,7 +1128,7 @@ void B2Client::positionButtons()
// Transparent bound stuff.
static TQRect *visible_bound;
-static TQPointArray bound_shape;
+static TQPointArray bound_tqshape;
bool B2Client::drawbound(const TQRect& geom, bool clear)
{
@@ -1153,7 +1153,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
barLeft += 2;
barRight -= 2;
- bound_shape.putPoints(0, 8,
+ bound_tqshape.putPoints(0, 8,
g.left(), frameTop,
barLeft, frameTop,
barLeft, g.top(),
@@ -1168,7 +1168,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
TQPainter p(workspaceWidget());
p.setPen(TQPen(Qt::white, 5));
p.setRasterOp(TQt::XorROP);
- p.drawPolygon(bound_shape);
+ p.drawPolygon(bound_tqshape);
if (clear) {
delete visible_bound;
@@ -1222,7 +1222,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent,
}
-TQSize B2Button::sizeHint() const
+TQSize B2Button::tqsizeHint() const
{
return TQSize(buttonSize, buttonSize);
}
@@ -1273,7 +1273,7 @@ void B2Button::setPixmaps(int button_id)
for (int i = 0; i < NumStates; i++) {
icon[i] = B2::pixmap[button_id + i];
}
- repaint(false);
+ tqrepaint(false);
}
void B2Button::mousePressEvent(TQMouseEvent * e)
@@ -1297,14 +1297,14 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e)
void B2Button::enterEvent(TQEvent *e)
{
hover = true;
- repaint(false);
+ tqrepaint(false);
TQButton::enterEvent(e);
}
void B2Button::leaveEvent(TQEvent *e)
{
hover = false;
- repaint(false);
+ tqrepaint(false);
TQButton::leaveEvent(e);
}
@@ -1363,7 +1363,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state)
// titlebar fill
const TQColorGroup cg =
- options()->colorGroup(KDecoration::ColorTitleBar, state);
+ options()->tqcolorGroup(KDecoration::ColorTitleBar, state);
TQBrush brush(cg.background());
if (gradient) brush.setPixmap(*gradient);
qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1,
@@ -1388,7 +1388,7 @@ void B2Titlebar::recalcBuffer()
void B2Titlebar::resizeEvent(TQResizeEvent *)
{
recalcBuffer();
- repaint(false);
+ tqrepaint(false);
}
diff --git a/twin/clients/b2/b2client.h b/twin/clients/b2/b2client.h
index 30220b17..d1062348 100644
--- a/twin/clients/b2/b2client.h
+++ b/twin/clients/b2/b2client.h
@@ -38,7 +38,7 @@ public:
void setToggle(){setToggleType(Toggle);}
void setActive(bool on){setOn(on);}
void setUseMiniIcon(){useMiniIcon = true;}
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
TQSizePolicy sizePolicy() const;
protected:
virtual void drawButton(TQPainter *p);
@@ -119,7 +119,7 @@ protected:
Position mousePosition( const TQPoint& p ) const;
void resize(const TQSize&);
void borders(int &, int &, int &, int &) const;
- TQSize minimumSize() const;
+ TQSize tqminimumSize() const;
bool eventFilter(TQObject *, TQEvent *);
private slots:
void menuButtonPressed();
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index a9e9cdbe..f3b8fa2b 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -18,7 +18,7 @@
#include <kimageeffect.h>
#include <kdrawutil.h>
#include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqdrawutil.h>
#include <tqbitmap.h>
#include <tqimage.h>
@@ -240,7 +240,7 @@ unsigned long KDEDefaultHandler::readConfig( bool update )
|| new_useGradients != useGradients
|| new_titleHeight != normalTitleHeight
|| new_toolTitleHeight != toolTitleHeight )
- changed |= SettingColors; // just recreate the pixmaps and repaint
+ changed |= SettingColors; // just recreate the pixmaps and tqrepaint
}
showGrabBar = new_showGrabBar;
@@ -328,7 +328,7 @@ void KDEDefaultHandler::createPixmaps()
TQPainter p;
// Active pins
- g = options()->colorGroup( ColorButtonBg, true );
+ g = options()->tqcolorGroup( ColorButtonBg, true );
pinUpPix = new KPixmap();
pinUpPix->resize(16, 16);
p.begin( pinUpPix );
@@ -346,7 +346,7 @@ void KDEDefaultHandler::createPixmaps()
pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) );
// Inactive pins
- g = options()->colorGroup( ColorButtonBg, false );
+ g = options()->tqcolorGroup( ColorButtonBg, false );
ipinUpPix = new KPixmap();
ipinUpPix->resize(16, 16);
p.begin( ipinUpPix );
@@ -404,25 +404,25 @@ void KDEDefaultHandler::createPixmaps()
irightBtnDownPix[false]->resize(toolTitleHeight, toolTitleHeight);
// Draw the button state pixmaps
- g = options()->colorGroup( ColorTitleBar, true );
+ g = options()->tqcolorGroup( ColorTitleBar, true );
drawButtonBackground( leftBtnUpPix[true], g, false );
drawButtonBackground( leftBtnDownPix[true], g, true );
drawButtonBackground( leftBtnUpPix[false], g, false );
drawButtonBackground( leftBtnDownPix[false], g, true );
- g = options()->colorGroup( ColorButtonBg, true );
+ g = options()->tqcolorGroup( ColorButtonBg, true );
drawButtonBackground( rightBtnUpPix[true], g, false );
drawButtonBackground( rightBtnDownPix[true], g, true );
drawButtonBackground( rightBtnUpPix[false], g, false );
drawButtonBackground( rightBtnDownPix[false], g, true );
- g = options()->colorGroup( ColorTitleBar, false );
+ g = options()->tqcolorGroup( ColorTitleBar, false );
drawButtonBackground( ileftBtnUpPix[true], g, false );
drawButtonBackground( ileftBtnDownPix[true], g, true );
drawButtonBackground( ileftBtnUpPix[false], g, false );
drawButtonBackground( ileftBtnDownPix[false], g, true );
- g = options()->colorGroup( ColorButtonBg, false );
+ g = options()->tqcolorGroup( ColorButtonBg, false );
drawButtonBackground( irightBtnUpPix[true], g, false );
drawButtonBackground( irightBtnDownPix[true], g, true );
drawButtonBackground( irightBtnUpPix[false], g, false );
@@ -720,7 +720,7 @@ void KDEDefaultButton::drawButton(TQPainter *p)
void KDEDefaultButton::enterEvent(TQEvent *e)
{
isMouseOver=true;
- repaint(false);
+ tqrepaint(false);
TQButton::enterEvent(e);
}
@@ -728,7 +728,7 @@ void KDEDefaultButton::enterEvent(TQEvent *e)
void KDEDefaultButton::leaveEvent(TQEvent *e)
{
isMouseOver=false;
- repaint(false);
+ tqrepaint(false);
TQButton::leaveEvent(e);
}
@@ -856,7 +856,7 @@ void KDEDefaultClient::init()
void KDEDefaultClient::reset( unsigned long changed)
{
- widget()->repaint();
+ widget()->tqrepaint();
KCommonDecoration::reset(changed);
}
@@ -909,7 +909,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
p.drawRect(x,y,w,h);
// Draw part of the frame that is the titlebar color
- g = options()->colorGroup(ColorTitleBar, isActive());
+ g = options()->tqcolorGroup(ColorTitleBar, isActive());
p.setPen(g.light());
p.drawLine(x+1, y+1, rightOffset-1, y+1);
p.drawLine(x+1, y+1, x+1, leftFrameStart+borderWidth-4);
@@ -929,7 +929,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2);
// Fill out the border edges
- g = options()->colorGroup(ColorFrame, isActive());
+ g = options()->tqcolorGroup(ColorFrame, isActive());
p.setPen(g.light());
p.drawLine(rightOffset, y+1, x2-1, y+1);
p.drawLine(x+1, leftFrameStart+borderWidth-3, x+1, y2-1);
diff --git a/twin/clients/keramik/embedtool.cpp b/twin/clients/keramik/embedtool.cpp
index c73926a1..d1cbd78f 100644
--- a/twin/clients/keramik/embedtool.cpp
+++ b/twin/clients/keramik/embedtool.cpp
@@ -20,7 +20,7 @@
*/
#include <tqimage.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqregexp.h>
#include <tqfile.h>
#include <tqfileinfo.h>
@@ -60,7 +60,7 @@ private:
KeramikEmbedder::KeramikEmbedder()
{
- TQDateTime date( TQDateTime::currentDateTime() );
+ TQDateTime date( TQDateTime::tqcurrentDateTime() );
TQString datestring( date.toString() );
file = new TQFile( "tiles.h" );
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 999ab1ee..e514e3a2 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -25,7 +25,7 @@
#include <kiconeffect.h>
#include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqbitmap.h>
#include <tqstyle.h>
#include <tqtooltip.h>
@@ -784,7 +784,7 @@ void KeramikButton::enterEvent( TQEvent *e )
TQButton::enterEvent( e );
hover = true;
- repaint( false );
+ tqrepaint( false );
}
@@ -793,7 +793,7 @@ void KeramikButton::leaveEvent( TQEvent *e )
TQButton::leaveEvent( e );
hover = false;
- repaint( false );
+ tqrepaint( false );
}
@@ -832,14 +832,14 @@ void KeramikButton::drawButton( TQPainter *p )
if ( isDown() ) {
// Pressed
- p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(2*size, 0, size, size), pix->rect() ) );
+ p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(2*size, 0, size, size), pix->rect() ) );
p->translate( TQApplication::reverseLayout() ? -1 : 1, 1 );
} else if ( hover )
// Mouse over
- p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(size, 0, size, size), pix->rect() ) );
+ p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(size, 0, size, size), pix->rect() ) );
else
// Normal
- p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(0, 0, size, size), pix->rect() ) );
+ p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(0, 0, size, size), pix->rect() ) );
// Draw the button deco on the bevel
@@ -1014,13 +1014,13 @@ void KeramikClient::reset( unsigned long )
captionBufferDirty = maskDirty = true;
- // Only repaint the window if it's visible
+ // Only tqrepaint the window if it's visible
// (i.e. not minimized and on the current desktop)
if ( widget()->isVisible() ) {
- widget()->repaint( false );
+ widget()->tqrepaint( false );
for ( int i = 0; i < NumButtons; i++ )
- if ( button[i] ) button[i]->repaint( false );
+ if ( button[i] ) button[i]->tqrepaint( false );
}
}
@@ -1280,7 +1280,7 @@ void KeramikClient::updateCaptionBuffer()
( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 );
int xpos = QMAX( (captionRect.width() - tw) / 3, 8 );
- TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10,
+ TQRect tr = TQStyle::tqvisualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10,
captionRect.height() - 4), captionBuffer.rect() );
//p.setPen( Qt::red ); // debug
@@ -1289,7 +1289,7 @@ void KeramikClient::updateCaptionBuffer()
// Application icon
if ( clientHandler->showAppIcons() )
{
- TQRect iconRect = TQStyle::visualRect( TQRect(tr.x(),
+ TQRect iconRect = TQStyle::tqvisualRect( TQRect(tr.x(),
1 + (captionRect.height() - 4 - 16) / 2, 16, 16), tr );
TQRect r( icon->rect() );
r.moveCenter( iconRect.center() );
@@ -1349,7 +1349,7 @@ void KeramikClient::calculateCaptionRect()
cw += 16 + 4; // icon width + space
cw = QMIN( cw, titlebar->geometry().width() );
- captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY),
+ captionRect = TQStyle::tqvisualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY),
cw, clientHandler->titleBarHeight(largeCaption) ),
titlebar->geometry() );
}
@@ -1365,7 +1365,7 @@ void KeramikClient::captionChange()
captionBufferDirty = true;
- widget()->repaint( r | captionRect, false );
+ widget()->tqrepaint( r | captionRect, false );
}
@@ -1381,7 +1381,7 @@ void KeramikClient::iconChange()
activeIcon = inactiveIcon = NULL;
captionBufferDirty = true;
- widget()->repaint( captionRect, false );
+ widget()->tqrepaint( captionRect, false );
}
}
@@ -1400,10 +1400,10 @@ void KeramikClient::activeChange()
captionBufferDirty = true;
- widget()->repaint( false );
+ widget()->tqrepaint( false );
for ( int i=0; i < NumButtons; i++ )
- if ( button[i] ) button[i]->repaint( false );
+ if ( button[i] ) button[i]->tqrepaint( false );
}
@@ -1420,7 +1420,7 @@ void KeramikClient::maximizeChange()
captionBufferDirty = maskDirty = true;
widget()->layout()->activate();
- widget()->repaint( false );
+ widget()->tqrepaint( false );
} else if (( maximizeMode() & MaximizeVertical ) == 0 && !largeTitlebar ) {
// We've been restored - enlarge the titlebar by 3 pixels
topSpacer->changeSize( 10, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@@ -1430,14 +1430,14 @@ void KeramikClient::maximizeChange()
captionBufferDirty = maskDirty = true;
widget()->layout()->activate();
- widget()->repaint( false );
+ widget()->tqrepaint( false );
}
}
if ( button[ MaxButton ] ) {
TQToolTip::remove( button[ MaxButton ] );
TQToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") );
- button[ MaxButton ]->repaint();
+ button[ MaxButton ]->tqrepaint();
}
}
@@ -1446,7 +1446,7 @@ void KeramikClient::desktopChange()
{
if ( button[ OnAllDesktopsButton ] )
{
- button[ OnAllDesktopsButton ]->repaint( true );
+ button[ OnAllDesktopsButton ]->tqrepaint( true );
TQToolTip::remove( button[ OnAllDesktopsButton ] );
TQToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") );
}
@@ -1457,7 +1457,7 @@ void KeramikClient::shadeChange()
{
if ( button[ ShadeButton ] )
{
- button[ ShadeButton ]->repaint( true );
+ button[ ShadeButton ]->tqrepaint( true );
TQToolTip::remove( button[ ShadeButton ] );
TQToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") );
}
@@ -1467,14 +1467,14 @@ void KeramikClient::shadeChange()
void KeramikClient::keepAboveChange( bool )
{
if ( button[ AboveButton ] )
- button[ AboveButton ]->repaint( true );
+ button[ AboveButton ]->tqrepaint( true );
}
void KeramikClient::keepBelowChange( bool )
{
if ( button[ BelowButton ] )
- button[ BelowButton ]->repaint( true );
+ button[ BelowButton ]->tqrepaint( true );
}
@@ -1502,21 +1502,21 @@ void KeramikClient::slotMaximize()
void KeramikClient::slotAbove()
{
setKeepAbove( !keepAbove());
- button[ AboveButton ]->repaint( true );
+ button[ AboveButton ]->tqrepaint( true );
}
void KeramikClient::slotBelow()
{
setKeepBelow( !keepBelow());
- button[ BelowButton ]->repaint( true );
+ button[ BelowButton ]->tqrepaint( true );
}
void KeramikClient::slotShade()
{
setShade( !isSetShade());
- button[ ShadeButton ]->repaint( true );
+ button[ ShadeButton ]->tqrepaint( true );
}
@@ -1794,9 +1794,9 @@ void KeramikClient::borders( int& left, int& right, int& top, int& bottom ) cons
}
-TQSize KeramikClient::minimumSize() const
+TQSize KeramikClient::tqminimumSize() const
{
- return widget()->minimumSize();
+ return widget()->tqminimumSize();
}
diff --git a/twin/clients/keramik/keramik.h b/twin/clients/keramik/keramik.h
index 59f9960c..8e4a9851 100644
--- a/twin/clients/keramik/keramik.h
+++ b/twin/clients/keramik/keramik.h
@@ -148,7 +148,7 @@ namespace Keramik {
virtual Position mousePosition( const TQPoint& p ) const;
virtual void borders( int& left, int& right, int& top, int& bottom ) const;
virtual void resize( const TQSize& s );
- virtual TQSize minimumSize() const;
+ virtual TQSize tqminimumSize() const;
virtual bool eventFilter( TQObject* o, TQEvent* e );
virtual void activeChange();
virtual void captionChange();
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index c67a2d22..4533cf3e 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -73,36 +73,36 @@ int main(int argc, char **argv)
input.setGroup("Window Border");
output->setGroup("General");
- tmpStr = input.readEntry("shapePixmapTop");
+ tmpStr = input.readEntry("tqshapePixmapTop");
if(!tmpStr.isEmpty()){
copy(srcStr+tmpStr, localDirStr+tmpStr);
}
output->writeEntry("wm_top", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapBottom");
+ tmpStr = input.readEntry("tqshapePixmapBottom");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_bottom", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapLeft");
+ tmpStr = input.readEntry("tqshapePixmapLeft");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_left", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapRight");
+ tmpStr = input.readEntry("tqshapePixmapRight");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_right", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapTopLeft");
+ tmpStr = input.readEntry("tqshapePixmapTopLeft");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_topleft", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapTopRight");
+ tmpStr = input.readEntry("tqshapePixmapTopRight");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_topright", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapBottomLeft");
+ tmpStr = input.readEntry("tqshapePixmapBottomLeft");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_bottomleft", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapBottomRight");
+ tmpStr = input.readEntry("tqshapePixmapBottomRight");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_bottomright", tmpStr, true, true);
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 59b471e2..5d5e462f 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -1,7 +1,7 @@
#include <kconfig.h>
#include "kwmthemeclient.h"
#include <kglobal.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqdrawutil.h>
#include <tqpainter.h>
#include <kpixmapeffect.h>
@@ -231,7 +231,7 @@ void MyButton::drawButtonLabel(TQPainter *p)
int offset = (isDown() && ((pixmap()->width() >= width()) ||
(pixmap()->height() >= height()))) ? 1 : 0;
style().drawItem(p, TQRect( offset, offset, width(), height() ),
- AlignCenter, colorGroup(),
+ AlignCenter, tqcolorGroup(),
true, pixmap(), TQString::null);
}
}
@@ -364,7 +364,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
p.begin(&buffer);
if(titleSunken){
- qDrawShadeRect(&p, r, options()->colorGroup(KDecorationOptions::ColorFrame, isActive()),
+ qDrawShadeRect(&p, r, options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()),
true, 1, 0);
r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2);
}
@@ -384,7 +384,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
p.drawTiledPixmap(r, *fill);
}
else{
- p.fillRect(r, options()->colorGroup(KDecorationOptions::ColorTitleBar, isActive()).
+ p.fillRect(r, options()->tqcolorGroup(KDecorationOptions::ColorTitleBar, isActive()).
brush(TQColorGroup::Button));
}
p.setFont(options()->font(isActive()));
@@ -402,12 +402,12 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
void KWMThemeClient::resizeEvent( TQResizeEvent* )
{
doShape();
- widget()->repaint();
+ widget()->tqrepaint();
}
void KWMThemeClient::captionChange()
{
- widget()->repaint( titlebar->geometry(), false );
+ widget()->tqrepaint( titlebar->geometry(), false );
}
void KWMThemeClient::paintEvent( TQPaintEvent *)
@@ -557,7 +557,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *)
}
drawTitle(p);
- TQColor c = widget()->colorGroup().background();
+ TQColor c = widget()->tqcolorGroup().background();
// KWM evidently had a 1 pixel border around the client window. We
// emulate it here, but should be removed at some point in order to
@@ -576,10 +576,10 @@ void KWMThemeClient::paintEvent( TQPaintEvent *)
void KWMThemeClient::doShape()
{
- TQBitmap shapemask(width(), height());
- shapemask.fill(color0);
+ TQBitmap tqshapemask(width(), height());
+ tqshapemask.fill(color0);
TQPainter p;
- p.begin(&shapemask);
+ p.begin(&tqshapemask);
p.setBrush(color1);
p.setPen(color1);
int x,y;
@@ -740,14 +740,14 @@ void KWMThemeClient::doShape()
}
}
p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1);
- setMask(shapemask);
+ setMask(tqshapemask);
}
void KWMThemeClient::showEvent(TQShowEvent *)
{
doShape();
- widget()->repaint(false);
+ widget()->tqrepaint(false);
}
void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e )
@@ -868,9 +868,9 @@ bool KWMThemeClient::eventFilter( TQObject* o, TQEvent* e )
}
}
-TQSize KWMThemeClient::minimumSize() const
+TQSize KWMThemeClient::tqminimumSize() const
{
- return widget()->minimumSize().expandedTo( TQSize( 100, 50 ));
+ return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 ));
}
void KWMThemeClient::resize( const TQSize& s )
diff --git a/twin/clients/kwmtheme/kwmthemeclient.h b/twin/clients/kwmtheme/kwmthemeclient.h
index 58db3d14..e51bfe6d 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.h
+++ b/twin/clients/kwmtheme/kwmthemeclient.h
@@ -30,7 +30,7 @@ public:
~KWMThemeClient(){;}
void init();
void resize( const TQSize& s );
- TQSize minimumSize() const;
+ TQSize tqminimumSize() const;
void borders( int& left, int& right, int& top, int& bottom ) const;
protected:
void doShape();
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 58d54a11..db37feae 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -157,7 +157,7 @@ static void create_pixmaps()
KPixmapEffect::VerticalGradient);
}
// buttons (active/inactive, sunken/unsunken, 2 sizes each)
- TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
+ TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
TQColor c = g.background();
btnPix1 = new KPixmap;
btnPix1->resize(btnWidth1, titleHeight);
@@ -184,7 +184,7 @@ static void create_pixmaps()
KPixmapEffect::DiagonalGradient);
KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120),
KPixmapEffect::DiagonalGradient);
- g = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
c = g.background();
KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130),
KPixmapEffect::DiagonalGradient);
@@ -200,20 +200,20 @@ static void create_pixmaps()
btnDownPix1->fill(c.rgb());
btnPix2->fill(c.rgb());
btnDownPix2->fill(c.rgb());
- g = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
c = g.background();
iBtnPix1->fill(c.rgb());
iBtnDownPix1->fill(c.rgb());
iBtnPix2->fill(c.rgb());
iBtnDownPix2->fill(c.rgb());
}
- g = options()->colorGroup(KDecoration::ColorButtonBg, true);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
c = g.background();
drawButtonFrame(btnPix1, g, false);
drawButtonFrame(btnDownPix1, g, true);
drawButtonFrame(btnPix2, g, false);
drawButtonFrame(btnDownPix2, g, true);
- g = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
c = g.background();
drawButtonFrame(iBtnPix1, g, false);
drawButtonFrame(iBtnDownPix1, g, true);
@@ -293,7 +293,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap)
deco.fill(Qt::color0);
}
deco.setMask(deco);
- repaint();
+ tqrepaint();
}
void LaptopButton::drawButton(TQPainter *p)
@@ -314,7 +314,7 @@ void LaptopButton::drawButton(TQPainter *p)
}
}
else{
- TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive());
+ TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, decoration()->isActive());
int w = width();
int h = height();
p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button());
@@ -469,7 +469,7 @@ void LaptopClient::captionChange()
void LaptopClient::paintEvent( TQPaintEvent* )
{
TQPainter p(widget());
- TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
+ TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive());
TQRect r(widget()->rect());
p.setPen(Qt::black);
@@ -546,7 +546,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
p.setFont(options()->font(false, isToolWindow() ));
TQFontMetrics fm(options()->font(false));
- g = options()->colorGroup(KDecoration::ColorTitleBar, false);
+ g = options()->tqcolorGroup(KDecoration::ColorTitleBar, false);
if(iUpperGradient)
p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4,
r.y(), fm.width(caption())+8, r.height()-1,
@@ -564,7 +564,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
p.setPen(options()->color(KDecoration::ColorFont, false));
p.drawText(r.x(), r.y(), r.width(), r.height()-1,
AlignCenter, caption() );
- g = options()->colorGroup(KDecoration::ColorFrame, true);
+ g = options()->tqcolorGroup(KDecoration::ColorFrame, true);
p.setPen(g.background());
p.drawPoint(r.x(), r.y());
p.drawPoint(r.right(), r.y());
@@ -629,7 +629,7 @@ void LaptopClient::updateActiveBuffer( )
p.setFont(options()->font(true, isToolWindow() ));
TQFontMetrics fm(options()->font(true));
- TQColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true);
+ TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorTitleBar, true);
if(aUpperGradient)
p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4,
r.y(), fm.width(caption())+8, r.height()-1,
@@ -647,7 +647,7 @@ void LaptopClient::updateActiveBuffer( )
p.setPen(options()->color(KDecoration::ColorFont, true));
p.drawText(r.x(), r.y(), r.width(), r.height()-1,
AlignCenter, caption() );
- g = options()->colorGroup(KDecoration::ColorFrame, true);
+ g = options()->tqcolorGroup(KDecoration::ColorFrame, true);
p.setPen(g.background());
p.drawPoint(r.x(), r.y());
p.drawPoint(r.right(), r.y());
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index d09d4867..136ff349 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -5,7 +5,7 @@
#include <kdialog.h>
#include <klocale.h>
#include <kglobal.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwhatsthis.h>
#include "config.h"
@@ -59,11 +59,11 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par
bool rtl = kapp->reverseLayout();
label1 = new TQLabel(i18n("Small"), hbox);
- label1->setAlignment(rtl ? AlignRight : AlignLeft);
+ label1->tqsetAlignment(rtl ? AlignRight : AlignLeft);
label2 = new TQLabel(i18n("Medium"), hbox);
- label2->setAlignment(AlignHCenter);
+ label2->tqsetAlignment(AlignHCenter);
label3 = new TQLabel(i18n("Large"), hbox);
- label3->setAlignment(rtl ? AlignLeft : AlignRight);
+ label3->tqsetAlignment(rtl ? AlignLeft : AlignRight);
vbox->addWidget(handleBox);
vbox->addStretch(1);
diff --git a/twin/clients/modernsystem/config/config.h b/twin/clients/modernsystem/config/config.h
index 3ff794b7..3a04573c 100644
--- a/twin/clients/modernsystem/config/config.h
+++ b/twin/clients/modernsystem/config/config.h
@@ -3,7 +3,7 @@
#include <tqcheckbox.h>
#include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvbox.h>
#include <tqslider.h>
#include <tqlabel.h>
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index 9508ab84..b6e7cda0 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -4,7 +4,7 @@
#include <kconfig.h>
#include <kglobal.h>
#include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqdrawutil.h>
#include <kpixmapeffect.h>
#include <kdrawutil.h>
@@ -171,13 +171,13 @@ static void create_pixmaps()
KPixmapEffect::VerticalGradient);
}
// buttons
- TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true));
+ TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true));
buttonPix = new TQPixmap(14, 15);
make_button_fx(btnColor, buttonPix);
buttonPixDown = new TQPixmap(14, 15);
make_button_fx(btnColor, buttonPixDown, true);
- btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ btnColor = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
iButtonPix = new TQPixmap(14, 15);
make_button_fx(btnColor, iButtonPix);
iButtonPixDown = new TQPixmap(14, 15);
@@ -515,7 +515,7 @@ void ModernSys::recalcTitleBuffer()
p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient);
else
p.fillRect(0, 0, width(), title_height+2,
- options()->colorGroup(ColorTitleBar, true).
+ options()->tqcolorGroup(ColorTitleBar, true).
brush(TQColorGroup::Button));
TQRect t = titleRect(); // titlebar->geometry();
@@ -554,7 +554,7 @@ void ModernSys::updateCaption()
void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h)
{
kDrawRoundButton(&p, x, y, w, h,
- options()->colorGroup(ColorFrame, isActive()), false);
+ options()->tqcolorGroup(ColorFrame, isActive()), false);
}
@@ -570,9 +570,9 @@ void ModernSys::paintEvent( TQPaintEvent* )
TQPainter p( widget() );
TQRect t = titleRect(); // titlebar->geometry();
- TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ?
- widget()->colorGroup().brush(TQColorGroup::Background) :
- options()->colorGroup(ColorFrame, isActive()).
+ TQBrush fillBrush(widget()->tqcolorGroup().tqbrush(TQColorGroup::Background).pixmap() ?
+ widget()->tqcolorGroup().brush(TQColorGroup::Background) :
+ options()->tqcolorGroup(ColorFrame, isActive()).
brush(TQColorGroup::Button));
p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush);
@@ -586,7 +586,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
int h = height() - hw;
// titlebar
- TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive());
+ TQColorGroup g = options()->tqcolorGroup(ColorTitleBar, isActive());
if(isActive()){
p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2);
}
@@ -609,7 +609,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
p.drawLine(0, title_height+2, w-2, title_height+2);
// frame
- g = options()->colorGroup(ColorFrame, isActive());
+ g = options()->tqcolorGroup(ColorFrame, isActive());
p.setPen(g.light());
p.drawLine(1, title_height+3, 1, h-2);
p.setPen(g.dark());
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index 76d64390..9faf73df 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -290,7 +290,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
} else {
pm = new TQPixmap(1, titleBarTileHeight);
painter.begin(pm);
- painter.drawPixmap(0, 0, gradient, 0,2);
+ painter.tqdrawPixmap(0, 0, gradient, 0,2);
if (m_coloredBorder) {
painter.setPen(getColor(TitleGradient3, active).dark(110) );
} else {
diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp
index 428c8e72..5f81033c 100644
--- a/twin/clients/plastik/plastikbutton.cpp
+++ b/twin/clients/plastik/plastikbutton.cpp
@@ -140,7 +140,7 @@ void PlastikButton::animate()
}
}
- repaint(false);
+ tqrepaint(false);
}
void PlastikButton::enterEvent(TQEvent *e)
diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp
index 591d876c..0e72ff59 100644
--- a/twin/clients/plastik/plastikclient.cpp
+++ b/twin/clients/plastik/plastikclient.cpp
@@ -27,7 +27,7 @@
#include <tqfontmetrics.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqdesktopwidget.h>
@@ -435,7 +435,7 @@ void PlastikClient::reset( unsigned long changed )
{
if (changed & SettingColors)
{
- // repaint the whole thing
+ // tqrepaint the whole thing
clearCaptionPixmaps();
widget()->update();
updateButtons();
@@ -445,7 +445,7 @@ void PlastikClient::reset( unsigned long changed )
updateLayout();
- // then repaint
+ // then tqrepaint
clearCaptionPixmaps();
widget()->update();
}
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 21b4c039..d0b8974c 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -291,18 +291,18 @@ void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const TQColor &c1, cons
void QuartzHandler::createPixmaps()
{
// Obtain titlebar blend colours, and create the block stuff on pixmaps.
- TQColorGroup g2 = options()->colorGroup(ColorTitleBlend, true);
+ TQColorGroup g2 = options()->tqcolorGroup(ColorTitleBlend, true);
TQColor c2 = g2.background();
- g2 = options()->colorGroup(ColorTitleBar, true );
+ g2 = options()->tqcolorGroup(ColorTitleBar, true );
TQColor c = g2.background().light(130);
titleBlocks = new KPixmap();
titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight );
drawBlocks( titleBlocks, *titleBlocks, c, c2 );
- g2 = options()->colorGroup(ColorTitleBlend, false);
+ g2 = options()->tqcolorGroup(ColorTitleBlend, false);
c2 = g2.background();
- g2 = options()->colorGroup(ColorTitleBar, false );
+ g2 = options()->tqcolorGroup(ColorTitleBar, false );
c = g2.background().light(130);
ititleBlocks = new KPixmap();
@@ -313,9 +313,9 @@ void QuartzHandler::createPixmaps()
TQColorGroup g;
TQPainter p;
- g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true );
+ g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true );
c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background();
- g2 = options()->colorGroup( ColorButtonBg, true );
+ g2 = options()->tqcolorGroup( ColorButtonBg, true );
pinUpPix = new KPixmap();
pinUpPix->resize(16, 16);
@@ -335,9 +335,9 @@ void QuartzHandler::createPixmaps()
// Inactive pins
- g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false );
+ g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false );
c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background();
- g2 = options()->colorGroup( ColorButtonBg, false );
+ g2 = options()->tqcolorGroup( ColorButtonBg, false );
ipinUpPix = new KPixmap();
ipinUpPix->resize(16, 16);
@@ -437,7 +437,7 @@ void QuartzButton::setBitmap(const unsigned char *bitmap)
if (bitmap) {
deco = new TQBitmap(10, 10, bitmap, true);
deco->setMask( *deco );
- repaint( false );
+ tqrepaint( false );
}
}
@@ -643,8 +643,8 @@ void QuartzClient::reset( unsigned long changed )
{
if (changed & SettingColors || changed & SettingFont)
{
- // repaint the whole thing
- widget()->repaint(false);
+ // tqrepaint the whole thing
+ widget()->tqrepaint(false);
}
KCommonDecoration::reset(changed);
@@ -675,9 +675,9 @@ void QuartzClient::paintEvent( TQPaintEvent* )
// Draw part of the frame that is the title color
if( coloredFrame )
- g = options()->colorGroup(ColorTitleBar, isActive());
+ g = options()->tqcolorGroup(ColorTitleBar, isActive());
else
- g = options()->colorGroup(ColorFrame, isActive());
+ g = options()->tqcolorGroup(ColorFrame, isActive());
// Draw outer highlights and lowlights
p.setPen( g.light().light(120) );
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index 790afa46..9fd625dd 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/clients/redmond/redmond.cpp
@@ -149,7 +149,7 @@ static void create_pixmaps ()
defaultMenuPix = new TQPixmap(kdelogo);
// buttons (active/inactive, sunken/unsunken)
- TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
+ TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
TQColor c = g.background();
btnPix1->resize(normalTitleHeight, normalTitleHeight-2);
btnDownPix1->resize(normalTitleHeight, normalTitleHeight-2);
@@ -172,7 +172,7 @@ static void create_pixmaps ()
KPixmapEffect::gradient(*miniBtnDownPix1, c.dark(130), c.light(130),
KPixmapEffect::VerticalGradient);
- g = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
c = g.background();
KPixmapEffect::gradient(*iBtnPix1, c.light(130), c.dark(130),
KPixmapEffect::VerticalGradient);
@@ -188,7 +188,7 @@ static void create_pixmaps ()
miniBtnPix1->fill(c.rgb());
miniBtnDownPix1->fill(c.rgb());
- g = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
c = g.background();
iBtnPix1->fill(c.rgb());
iBtnDownPix1->fill(c.rgb());
@@ -196,13 +196,13 @@ static void create_pixmaps ()
iMiniBtnDownPix1->fill(c.rgb());
}
- g = options()->colorGroup(KDecoration::ColorButtonBg, true);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
drawButtonFrame(btnPix1, g, false);
drawButtonFrame(btnDownPix1, g, true);
drawButtonFrame(miniBtnPix1, g, false);
drawButtonFrame(miniBtnDownPix1, g, true);
- g = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
drawButtonFrame(iBtnPix1, g, false);
drawButtonFrame(iBtnDownPix1, g, true);
drawButtonFrame(iMiniBtnPix1, g, false);
@@ -294,7 +294,7 @@ void RedmondButton::setPixmap( const TQPixmap &p )
deco.resize(0, 0);
pix = p;
- repaint(false);
+ tqrepaint(false);
}
@@ -491,7 +491,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* )
// Draw part of the frame that is the frame color
// ==============================================
- TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
+ TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive());
p.setPen( g.background() );
p.drawLine( x, y, x2-1, y );
p.drawLine( x, y, x, y2-1 );
diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp
index 2e26a7c4..02fd5b1d 100644
--- a/twin/clients/test/test.cpp
+++ b/twin/clients/test/test.cpp
@@ -93,7 +93,7 @@ void Decoration::resize( const TQSize& s )
widget()->resize( s );
}
-TQSize Decoration::minimumSize() const
+TQSize Decoration::tqminimumSize() const
{
return TQSize( 100, 50 );
}
diff --git a/twin/clients/test/test.h b/twin/clients/test/test.h
index bfe36fa7..e1d3d51a 100644
--- a/twin/clients/test/test.h
+++ b/twin/clients/test/test.h
@@ -22,7 +22,7 @@ class Decoration
virtual MousePosition mousePosition( const TQPoint& p ) const;
virtual void borders( int& left, int& right, int& top, int& bottom ) const;
virtual void resize( const TQSize& s );
- virtual TQSize minimumSize() const;
+ virtual TQSize tqminimumSize() const;
virtual void activeChange() {};
virtual void captionChange() {};
virtual void maximizeChange() {};
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index f799e1b8..793b406a 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -120,31 +120,31 @@ KCommonDecorationButton *WebClient::createButton(ButtonType type)
{
switch (type) {
case MenuButton:
- return new WebButton(MenuButton, this, "menu", shape_);
+ return new WebButton(MenuButton, this, "menu", tqshape_);
case OnAllDesktopsButton:
- return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", shape_);
+ return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", tqshape_);
case HelpButton:
- return new WebButton(HelpButton, this, "help", shape_);
+ return new WebButton(HelpButton, this, "help", tqshape_);
case MinButton:
- return new WebButton(MinButton, this, "minimize", shape_);
+ return new WebButton(MinButton, this, "minimize", tqshape_);
case MaxButton:
- return new WebButton(MaxButton, this, "maximize", shape_);
+ return new WebButton(MaxButton, this, "maximize", tqshape_);
case CloseButton:
- return new WebButton(CloseButton, this, "close", shape_);
+ return new WebButton(CloseButton, this, "close", tqshape_);
case AboveButton:
- return new WebButton(AboveButton, this, "above", shape_);
+ return new WebButton(AboveButton, this, "above", tqshape_);
case BelowButton:
- return new WebButton(BelowButton, this, "below", shape_);
+ return new WebButton(BelowButton, this, "below", tqshape_);
case ShadeButton:
- return new WebButton(ShadeButton, this, "shade", shape_);
+ return new WebButton(ShadeButton, this, "shade", tqshape_);
default:
return 0;
@@ -185,7 +185,7 @@ WebClient::init()
KConfig c("twinwebrc");
c.setGroup("General");
- shape_ = c.readBoolEntry("Shape", true);
+ tqshape_ = c.readBoolEntry("Shape", true);
KCommonDecoration::init();
}
@@ -195,8 +195,8 @@ WebClient::reset( unsigned long changed )
{
if (changed & SettingColors)
{
- // repaint the whole thing
- widget()->repaint(false);
+ // tqrepaint the whole thing
+ widget()->tqrepaint(false);
} else if (changed & SettingFont) {
// font has changed -- update title height
// title height
@@ -206,7 +206,7 @@ WebClient::reset( unsigned long changed )
if (0 != titleHeight_ % 2)
titleHeight_ += 1;
- widget()->repaint(false);
+ widget()->tqrepaint(false);
}
KCommonDecoration::reset(changed);
@@ -231,7 +231,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
TQPainter p(widget());
p.setPen(Qt::black);
- p.setBrush(options()->colorGroup(ColorFrame, isActive()).background());
+ p.setBrush(options()->tqcolorGroup(ColorFrame, isActive()).background());
p.setClipRegion(pe->region() - titleRect);
@@ -241,7 +241,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
p.fillRect(titleRect, options()->color(ColorTitleBar, isActive()));
- if (shape_)
+ if (tqshape_)
{
int r(width());
int b(height());
@@ -288,7 +288,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
void WebClient::updateWindowShape()
{
- if (!shape_)
+ if (!tqshape_)
return;
TQRegion mask(0, 0, width(), height());
diff --git a/twin/clients/web/Web.h b/twin/clients/web/Web.h
index ec1b08dc..c2c18b0b 100644
--- a/twin/clients/web/Web.h
+++ b/twin/clients/web/Web.h
@@ -62,7 +62,7 @@ namespace Web
int titleHeight_, borderSize_;
- bool shape_;
+ bool tqshape_;
TQBitmap _buttonBitmap(ButtonType t) const;
};
diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp
index 785abe69..bf1f54af 100644
--- a/twin/clients/web/WebButton.cpp
+++ b/twin/clients/web/WebButton.cpp
@@ -69,10 +69,10 @@ namespace Web {
0xff, 0x81, 0x81, 0xff, 0x81, 0xff, 0x81, 0xff
};
-WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool shape)
+WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape)
: KCommonDecorationButton (type, parent, name),
mouseOver_ (false),
- shape_ (shape),
+ tqshape_ (tqshape),
deco_ (parent)
{
setBackgroundMode(NoBackground);
@@ -127,7 +127,7 @@ void WebButton::reset(unsigned long changed)
WebButton::enterEvent(TQEvent * e)
{
mouseOver_ = true;
- repaint();
+ tqrepaint();
TQButton::enterEvent(e);
}
@@ -135,7 +135,7 @@ WebButton::enterEvent(TQEvent * e)
WebButton::leaveEvent(TQEvent * e)
{
mouseOver_ = false;
- repaint();
+ tqrepaint();
TQButton::leaveEvent(e);
}
@@ -145,17 +145,17 @@ WebButton::drawButton(TQPainter *p)
TQPen highlightPen;
if (isDown() )
- highlightPen = TQPen(colorGroup().light());
+ highlightPen = TQPen(tqcolorGroup().light());
else
{
if (mouseOver_)
- highlightPen = TQPen(colorGroup().highlight());
+ highlightPen = TQPen(tqcolorGroup().highlight());
else
highlightPen = TQPen(NoPen);
}
- p->fillRect(rect(), colorGroup().background());
+ p->fillRect(rect(), tqcolorGroup().background());
Position position_;
if (0 == mapToParent(rect().topLeft() ).x() )
@@ -174,7 +174,7 @@ WebButton::drawButton(TQPainter *p)
p->drawLine(0, 0, width(), 0);
p->drawLine(0, 1, 0, height() - 1);
- if (shape_)
+ if (tqshape_)
{
p->drawPoint(3, 1);
p->drawPoint(4, 1);
@@ -187,11 +187,11 @@ WebButton::drawButton(TQPainter *p)
p->setBrush(NoBrush);
p->setPen(highlightPen);
- if (shape_)
+ if (tqshape_)
p->setClipRegion(TQRegion(rect()) - TQRect(0, 0, 6, 6));
p->drawRect(2, 2, width() - 4, height() - 4);
- if (shape_)
+ if (tqshape_)
{
p->setClipRect(rect());
p->drawPoint(4, 3);
@@ -210,7 +210,7 @@ WebButton::drawButton(TQPainter *p)
p->setPen(Qt::black);
p->drawLine(0, 0, width(), 0);
p->drawLine(width() - 1, 1, width() - 1, height() - 1);
- if (shape_)
+ if (tqshape_)
{
p->drawPoint(width() - 5, 1);
p->drawPoint(width() - 4, 1);
@@ -223,11 +223,11 @@ WebButton::drawButton(TQPainter *p)
p->setBrush(NoBrush);
p->setPen(highlightPen);
- if (shape_)
+ if (tqshape_)
p->setClipRegion(TQRegion(rect()) - TQRect(width() - 6, 0, 6, 6));
p->drawRect(2, 2, width() - 4, height() - 4);
- if (shape_)
+ if (tqshape_)
{
p->setClipRect(rect());
p->drawPoint(width() - 5, 3);
diff --git a/twin/clients/web/WebButton.h b/twin/clients/web/WebButton.h
index d86db6cc..108aa2a5 100644
--- a/twin/clients/web/WebButton.h
+++ b/twin/clients/web/WebButton.h
@@ -41,7 +41,7 @@ namespace Web
Left, Mid, Right
};
- WebButton(ButtonType type, WebClient *parent, const char *name, bool shape);
+ WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape);
virtual ~WebButton();
@@ -59,7 +59,7 @@ namespace Web
bool mouseOver_;
- bool shape_;
+ bool tqshape_;
WebClient* deco_;
};
}
diff --git a/twin/events.cpp b/twin/events.cpp
index 72047bff..fc6b7798 100644
--- a/twin/events.cpp
+++ b/twin/events.cpp
@@ -626,9 +626,9 @@ bool Client::windowEvent( XEvent* e )
default:
if( e->xany.window == window())
{
- if( e->type == Shape::shapeEvent() )
+ if( e->type == Shape::tqshapeEvent() )
{
- is_shape = Shape::hasShape( window()); // workaround for #19644
+ is_tqshape = Shape::hasShape( window()); // workaround for #19644
updateShape();
}
}
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index ab731155..2e0b205c 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -1120,7 +1120,7 @@ TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool nofra
TQSize max_size = maxSize();
if( decoration != NULL )
{
- TQSize decominsize = decoration->minimumSize();
+ TQSize decominsize = decoration->tqminimumSize();
TQSize border_size( border_left + border_right, border_top + border_bottom );
if( border_size.width() > decominsize.width()) // just in case
decominsize.setWidth( border_size.width());
@@ -2637,7 +2637,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
( isResize() ? options->resizeMode : options->moveMode ) == Options::Transparent )
{
clearbound(); // it's necessary to move the geometry tip when there's no outline
- positionGeometryTip(); // shown, otherwise it would cause repaint problems in case
+ positionGeometryTip(); // shown, otherwise it would cause tqrepaint problems in case
drawbound( moveResizeGeom ); // they overlap; the paint event will come after this,
} // so the geometry tip will be painted above the outline
}
diff --git a/twin/geometrytip.cpp b/twin/geometrytip.cpp
index e196135a..83598d47 100644
--- a/twin/geometrytip.cpp
+++ b/twin/geometrytip.cpp
@@ -20,7 +20,7 @@ GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ):
setIndent(0);
setLineWidth(1);
setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel );
- setAlignment( AlignCenter | AlignTop );
+ tqsetAlignment( AlignCenter | AlignTop );
sizeHints = xSizeHints;
if( save_under )
{
diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index a96ee76d..2c450aed 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -31,7 +31,7 @@
#include <tqheader.h>
#include <tqpainter.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqstyle.h>
#include <kdebug.h>
@@ -54,7 +54,7 @@ ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name)
TQDataStream stream(data, IO_WriteOnly);
stream << btn.name;
stream << btn.icon;
- stream << btn.type.unicode();
+ stream << btn.type.tqunicode();
stream << (int) btn.duplicate;
stream << (int) btn.supported;
setEncodedData( data );
@@ -123,7 +123,7 @@ TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color)
ButtonSource::ButtonSource(TQWidget *parent, const char* name)
: KListView(parent, name)
{
- setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
setResizeMode(TQListView::AllColumns);
setDragEnabled(true);
@@ -140,19 +140,19 @@ ButtonSource::~ButtonSource()
{
}
-TQSize ButtonSource::sizeHint() const
+TQSize ButtonSource::tqsizeHint() const
{
- // make the sizeHint height a bit smaller than the one of TQListView...
+ // make the tqsizeHint height a bit smaller than the one of TQListView...
if ( cachedSizeHint().isValid() )
return cachedSizeHint();
constPolish();
- TQSize s( header()->sizeHint() );
+ TQSize s( header()->tqsizeHint() );
if ( verticalScrollBar()->isVisible() )
- s.setWidth( s.width() + tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent) );
+ s.setWidth( s.width() + tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) );
s += TQSize(frameWidth()*2,frameWidth()*2);
// size hint: 4 lines of text...
@@ -167,7 +167,7 @@ void ButtonSource::hideAllButtons()
{
TQListViewItemIterator it(this);
while (it.current() ) {
- it.current()->setVisible(false);
+ it.current()->tqsetVisible(false);
++it;
}
}
@@ -176,7 +176,7 @@ void ButtonSource::showAllButtons()
{
TQListViewItemIterator it(this);
while (it.current() ) {
- it.current()->setVisible(true);
+ it.current()->tqsetVisible(true);
++it;
}
}
@@ -187,7 +187,7 @@ void ButtonSource::showButton( TQChar btn )
while (it.current() ) {
ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() );
if (item && item->button().type == btn) {
- it.current()->setVisible(true);
+ it.current()->tqsetVisible(true);
return;
}
++it;
@@ -200,7 +200,7 @@ void ButtonSource::hideButton( TQChar btn )
while (it.current() ) {
ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() );
if (item && item->button().type == btn && !item->button().duplicate) {
- it.current()->setVisible(false);
+ it.current()->tqsetVisible(false);
return;
}
++it;
@@ -218,7 +218,7 @@ TQDragObject *ButtonSource::dragObject()
if (i) {
ButtonDrag *bd = new ButtonDrag(i->button(), viewport(), "button_drag");
- bd->setPixmap(bitmapPixmap(i->button().icon, colorGroup().foreground() ));
+ bd->setPixmap(bitmapPixmap(i->button().icon, tqcolorGroup().foreground() ));
return bd;
}
@@ -487,7 +487,7 @@ void ButtonDropSite::mousePressEvent( TQMouseEvent* e )
m_selected = buttonAt(e->pos() );
if (m_selected) {
ButtonDrag *bd = new ButtonDrag(m_selected->button(), this);
- bd->setPixmap(bitmapPixmap(m_selected->button().icon, colorGroup().foreground() ) );
+ bd->setPixmap(bitmapPixmap(m_selected->button().icon, tqcolorGroup().foreground() ) );
bd->dragMove();
}
}
@@ -572,7 +572,7 @@ bool ButtonDropSite::removeSelectedButton()
delete m_selected;
m_selected = 0;
recalcItemGeometry();
- update(); // repaint...
+ update(); // tqrepaint...
}
return succ;
@@ -581,9 +581,9 @@ bool ButtonDropSite::removeSelectedButton()
void ButtonDropSite::drawButtonList(TQPainter *p, const ButtonList& btns, int offset)
{
for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) {
- TQRect itemRect = (*it)->rect;
- if (itemRect.isValid() ) {
- (*it)->draw(p, colorGroup(), itemRect);
+ TQRect tqitemRect = (*it)->rect;
+ if (tqitemRect.isValid() ) {
+ (*it)->draw(p, tqcolorGroup(), tqitemRect);
}
offset += (*it)->width();
}
@@ -675,11 +675,11 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name)
m_factory(0)
{
TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
- setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
+ tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
TQLabel* label = new TQLabel( this );
m_dropSite = new ButtonDropSite( this );
- label->setAlignment( int( TQLabel::WordBreak ) );
+ label->tqsetAlignment( int( TQLabel::WordBreak ) );
label->setText( i18n( "To add or remove titlebar buttons, simply <i>drag</i> items "
"between the available item list and the titlebar preview. Similarly, "
"drag items within the titlebar preview to re-position them.") );
diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h
index e1dbbc81..088d3414 100644
--- a/twin/kcmtwin/twindecoration/buttons.h
+++ b/twin/kcmtwin/twindecoration/buttons.h
@@ -117,7 +117,7 @@ class ButtonSource : public KListView
ButtonSource(TQWidget *parent = 0, const char* name = 0);
virtual ~ButtonSource();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void hideAllButtons();
void showAllButtons();
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index 573971f2..ee8c59c7 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -49,7 +49,7 @@ KDecorationPreview::KDecorationPreview( TQWidget* parent, const char* name )
"Most probably there\n"
"was a problem loading the plugin." ), this );
- no_preview->setAlignment( AlignCenter );
+ no_preview->tqsetAlignment( AlignCenter );
setMinimumSize( 100, 100 );
no_preview->resize( size());
@@ -127,15 +127,15 @@ void KDecorationPreview::positionPreviews()
// Resize the active window
size = TQSize( width() - xoffset, height() - titleBarHeight )
- .expandedTo( deco[Active]->minimumSize() );
+ .expandedTo( deco[Active]->tqminimumSize() );
geometry = TQRect( TQPoint( 0, titleBarHeight ), size );
- deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) );
+ deco[Active]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) );
// Resize the inactive window
size = TQSize( width() - xoffset, height() - titleBarHeight )
- .expandedTo( deco[Inactive]->minimumSize() );
+ .expandedTo( deco[Inactive]->tqminimumSize() );
geometry = TQRect( TQPoint( xoffset, 0 ), size );
- deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) );
+ deco[Inactive]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) );
}
void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active )
@@ -150,7 +150,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act
}
else
{
- TQMemArray< TQRect > rects = reg.rects();
+ TQMemArray< TQRect > rects = reg.tqrects();
XRectangle* xrects = new XRectangle[ rects.count() ];
for( unsigned int i = 0;
i < rects.count();
@@ -166,7 +166,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act
delete[] xrects;
}
if( active )
- mask = reg; // keep shape of the active window for unobscuredRegion()
+ mask = reg; // keep tqshape of the active window for unobscuredRegion()
}
TQRect KDecorationPreview::windowGeometry( bool active ) const
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index e48f4e23..4ef509e5 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -32,7 +32,7 @@
#include <tqdir.h>
#include <tqfileinfo.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwhatsthis.h>
#include <tqgroupbox.h>
#include <tqcheckbox.h>
@@ -112,13 +112,13 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." ));
lBorder->hide();
cBorder->hide();
- TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() );
+ TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->tqlayout() );
borderSizeLayout->addWidget(lBorder);
borderSizeLayout->addWidget(cBorder);
borderSizeLayout->addStretch();
pluginConfigWidget = new TQVBox(pluginSettingsGrp);
- pluginSettingsGrp->layout()->add( pluginConfigWidget );
+ pluginSettingsGrp->tqlayout()->add( pluginConfigWidget );
// Page 2 (Button Selector)
TQWidget* buttonPage = new TQWidget( tabWidget );
@@ -154,8 +154,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
preview = new KDecorationPreview( this );
previewLayout->addWidget(preview);
- preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
- tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
+ preview->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ tabWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
// Page 3 (Window Shadows)
TQHBox *inactiveShadowColourHBox, *shadowColourHBox;
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index a7ddf273..a10269ec 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <dcopclient.h>
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index bab6deab..30692d87 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqwhatsthis.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvgroupbox.h>
#include <tqgrid.h>
#include <tqsizepolicy.h>
@@ -163,7 +163,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
combo->insertItem(i18n("Lower"));
combo->insertItem(i18n("On All Desktops"));
combo->insertItem(i18n("Nothing"));
- combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+ combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
hlayout->addWidget(combo);
coTiDbl = combo;
@@ -188,7 +188,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
comboW->insertItem(i18n("Move to Previous/Next Desktop"));
comboW->insertItem(i18n("Change Opacity"));
comboW->insertItem(i18n("Nothing"));
- comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+ comboW->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
hlayoutW->addWidget(comboW);
coTiAct4 = comboW;
@@ -235,7 +235,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
label = new TQLabel(i18n("Active"), grid);
- label->setAlignment(AlignCenter);
+ label->tqsetAlignment(AlignCenter);
TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
" or the frame of an active window.") );
@@ -292,7 +292,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3);
label = new TQLabel(i18n("Inactive"), grid);
- label->setAlignment(AlignCenter);
+ label->tqsetAlignment(AlignCenter);
TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
" or the frame of an inactive window.") );
@@ -356,14 +356,14 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
TQLabel * label = new TQLabel(strMouseButton[b], box);
TQWhatsThis::add( label, txtButton[b] );
- label ->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
+ label ->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
coMax[b] = new ToolTipComboBox(box, tbl_Max);
for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]);
connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed()));
TQWhatsThis::add( coMax[b], txtButton[b] );
- coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
+ coMax[b]->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
}
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 4f213384..80185a42 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -24,7 +24,7 @@
#include <config.h>
#include <tqdir.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqslider.h>
#include <tqwhatsthis.h>
#include <tqvbuttongroup.h>
@@ -110,7 +110,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
//iTLabel = new TQLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
// plcBox);
- //iTLabel->setAlignment(AlignTop|AlignHCenter);
+ //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
//pLay->addWidget(iTLabel,1,1);
//interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
@@ -124,7 +124,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
fcsBox = new TQButtonGroup(i18n("Focus"),this);
fcsBox->setColumnLayout( 0, Qt::Horizontal );
- TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(),
+ TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->tqlayout(),
KDialog::spacingHint());
TQBoxLayout *cLay = new TQHBoxLayout(fLay);
@@ -192,8 +192,8 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool)));
fLay->addWidget(clickRaiseOn);
-// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(),
-// clickRaiseOn->sizeHint().width()) + 15);
+// fLay->addColSpacing(0,QMAX(autoRaiseOn->tqsizeHint().width(),
+// clickRaiseOn->tqsizeHint().width()) + 15);
TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically"
" come to the front when the mouse pointer has been over it for some time.") );
@@ -236,7 +236,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
kbdBox = new TQButtonGroup(i18n("Navigation"), this);
kbdBox->setColumnLayout( 0, Qt::Horizontal );
- TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint());
+ TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->tqlayout(), KDialog::spacingHint());
altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox );
kLay->addWidget( altTabPopup );
@@ -573,7 +573,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget *
//iTLabel = new TQLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
// plcBox);
- //iTLabel->setAlignment(AlignTop|AlignHCenter);
+ //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
//pLay->addWidget(iTLabel,1,1);
//interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
@@ -831,7 +831,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
windowsBox = new TQButtonGroup(i18n("Windows"), this);
windowsBox->setColumnLayout( 0, Qt::Horizontal );
- TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint());
+ TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->tqlayout(), KDialog::spacingHint());
TQBoxLayout *bLay = new TQVBoxLayout;
wLay->addLayout(bLay);
@@ -877,11 +877,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int)));
minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox);
- minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft);
+ minimizeAnimSlowLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignLeft);
rLay->addWidget(minimizeAnimSlowLabel,1,1);
minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox);
- minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight);
+ minimizeAnimFastLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignRight);
rLay->addWidget(minimizeAnimFastLabel,1,2);
wtstr = i18n("Here you can set the speed of the animation shown when windows are"
@@ -940,7 +940,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
//iTLabel = new TQLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
// plcBox);
- //iTLabel->setAlignment(AlignTop|AlignHCenter);
+ //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
//pLay->addWidget(iTLabel,1,1);
//interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
diff --git a/twin/kcmtwin/twinrules/detectwidgetbase.ui b/twin/kcmtwin/twinrules/detectwidgetbase.ui
index b13e7948..af4ca967 100644
--- a/twin/kcmtwin/twinrules/detectwidgetbase.ui
+++ b/twin/kcmtwin/twinrules/detectwidgetbase.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/twin/kcmtwin/twinrules/editshortcutbase.ui b/twin/kcmtwin/twinrules/editshortcutbase.ui
index 70281626..af704c0a 100644
--- a/twin/kcmtwin/twinrules/editshortcutbase.ui
+++ b/twin/kcmtwin/twinrules/editshortcutbase.ui
@@ -66,7 +66,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -91,7 +91,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -116,7 +116,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index 45b09cfe..c7cdc758 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -19,7 +19,7 @@
#include "kcm.h"
#include <kglobal.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <kapplication.h>
#include <dcopclient.h>
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index b589d500..db3a9fc4 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -151,7 +151,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who
Rules* ret = new Rules;
if( whole_app )
{
- ret->description = i18n( "Application settings for %1" ).arg( static_cast<const char *>(wmclass_class) );
+ ret->description = i18n( "Application settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) );
// TODO maybe exclude some types? If yes, then also exclude them above
// when searching.
ret->types = NET::AllTypesMask;
@@ -175,7 +175,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who
}
return ret;
}
- ret->description = i18n( "Window settings for %1" ).arg( static_cast<const char *>(wmclass_class) );
+ ret->description = i18n( "Window settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) );
if( type == NET::Unknown )
ret->types = NET::NormalMask;
else
diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui
index 8ab21412..5fc5fd6e 100644
--- a/twin/kcmtwin/twinrules/ruleslistbase.ui
+++ b/twin/kcmtwin/twinrules/ruleslistbase.ui
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>294</height>
diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp
index 8680018d..cfe96458 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.cpp
+++ b/twin/kcmtwin/twinrules/ruleswidget.cpp
@@ -661,7 +661,7 @@ bool RulesWidget::finalCheck()
all_types = false;
if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types )
{
- if( KMessageBox::warningContinueCancel( topLevelWidget(),
+ if( KMessageBox::warningContinueCancel( tqtopLevelWidget(),
i18n( "You have specified the window class as unimportant.\n"
"This means the settings will possibly apply to windows from all applications. "
"If you really want to create a generic setting, it is recommended you at least "
@@ -680,7 +680,7 @@ void RulesWidget::prepareWindowSpecific( WId window )
void RulesWidget::shortcutEditClicked()
{
- EditShortcutDialog dlg( topLevelWidget());
+ EditShortcutDialog dlg( tqtopLevelWidget());
dlg.setShortcut( shortcut->text());
if( dlg.exec() == TQDialog::Accepted )
shortcut->setText( dlg.shortcut());
@@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name )
void EditShortcut::editShortcut()
{
- ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget());
+ ShortcutDialog dlg( KShortcut( shortcut->text()), tqtopLevelWidget());
if( dlg.exec() == TQDialog::Accepted )
shortcut->setText( dlg.shortcut().toString());
}
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index c83bbef9..5a5640ca 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>212</width>
<height>20</height>
@@ -157,7 +157,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>211</width>
<height>20</height>
@@ -199,7 +199,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>212</width>
<height>20</height>
@@ -230,7 +230,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>211</width>
<height>20</height>
@@ -271,7 +271,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>270</width>
<height>20</height>
@@ -296,7 +296,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>269</width>
<height>20</height>
@@ -470,7 +470,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -501,7 +501,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -543,7 +543,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -574,7 +574,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -616,7 +616,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -647,7 +647,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -1181,7 +1181,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -1347,7 +1347,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>171</width>
<height>20</height>
@@ -1364,7 +1364,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1381,7 +1381,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1398,7 +1398,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1415,7 +1415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1432,7 +1432,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1449,7 +1449,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1466,7 +1466,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1796,7 +1796,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>80</height>
@@ -1847,7 +1847,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>181</width>
<height>20</height>
@@ -2278,7 +2278,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>160</height>
diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp
index ebd4fea9..716b829c 100644
--- a/twin/killer/killer.cpp
+++ b/twin/killer/killer.cpp
@@ -55,7 +55,7 @@ int main( int argc, char* argv[] )
bool pid_ok = false;
pid_t pid = args->getOption( "pid" ).toULong( &pid_ok );
TQString caption = TQString::fromUtf8( args->getOption( "windowname" ));
- TQString appname = TQString::fromLatin1( args->getOption( "applicationname" ));
+ TQString appname = TQString::tqfromLatin1( args->getOption( "applicationname" ));
bool id_ok = false;
Window id = args->getOption( "wid" ).toULong( &id_ok );
bool time_ok = false;
@@ -71,7 +71,7 @@ int main( int argc, char* argv[] )
"<qt>Window with title \"<b>%2</b>\" is not responding. "
"This window belongs to application <b>%1</b> (PID=%3, hostname=%4).<p>"
"Do you wish to terminate this application? (All unsaved data in this application will be lost.)</qt>" )
- .arg( appname ).arg( caption ).arg( pid ).arg( static_cast<const char *>(hostname) );
+ .tqarg( appname ).tqarg( caption ).tqarg( pid ).tqarg( static_cast<const char *>(hostname) );
app.updateUserTimestamp( timestamp );
if( KMessageBox::warningYesNoWId( id, question, TQString::null, i18n("Terminate"), i18n("Keep Running") ) == KMessageBox::Yes )
{
diff --git a/twin/layers.cpp b/twin/layers.cpp
index 794d0663..773ea2d5 100644
--- a/twin/layers.cpp
+++ b/twin/layers.cpp
@@ -87,7 +87,7 @@ void Workspace::updateClientLayer( Client* c )
if( c->layer() == c->belongsToLayer())
return;
StackingUpdatesBlocker blocker( this );
- c->invalidateLayer(); // invalidate, will be updated when doing restacking
+ c->invalidateLayer(); // tqinvalidate, will be updated when doing restacking
for( ClientList::ConstIterator it = c->transients().begin();
it != c->transients().end();
++it )
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index bd33e979..4a667c7b 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -522,7 +522,7 @@ void KCommonDecoration::resize( const TQSize& s )
widget()->resize( s );
}
-TQSize KCommonDecoration::minimumSize() const
+TQSize KCommonDecoration::tqminimumSize() const
{
const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft))
+QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight))
@@ -684,7 +684,7 @@ void KCommonDecoration::resizeEvent(TQResizeEvent */*e*/)
updateWindowShape();
// FIXME: don't update() here! this would result in two paintEvent()s
- // because there is already "something" else triggering the repaint...
+ // because there is already "something" else triggering the tqrepaint...
// widget()->update();
}
@@ -946,7 +946,7 @@ void KCommonDecorationButton::setSize(const TQSize &s)
}
}
-TQSize KCommonDecorationButton::sizeHint() const
+TQSize KCommonDecorationButton::tqsizeHint() const
{
return m_size;
}
diff --git a/twin/lib/kcommondecoration.h b/twin/lib/kcommondecoration.h
index bd55ffa0..93427b24 100644
--- a/twin/lib/kcommondecoration.h
+++ b/twin/lib/kcommondecoration.h
@@ -178,7 +178,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
/**
* This updates the window mask using the information provided by
* cornerShape(). Edges which are aligned to screen corners are not
- * shaped for better usability (remember to paint these areas in paintEvent(), too).
+ * tqshaped for better usability (remember to paint these areas in paintEvent(), too).
* You normally don't want/need to reimplement updateWindowShape().
* @see cornerShape()
*/
@@ -234,7 +234,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
virtual void borders( int& left, int& right, int& top, int& bottom ) const;
virtual void show();
virtual void resize(const TQSize& s);
- virtual TQSize minimumSize() const;
+ virtual TQSize tqminimumSize() const;
virtual void maximizeChange();
virtual void desktopChange();
virtual void shadeChange();
@@ -348,7 +348,7 @@ class KWIN_EXPORT KCommonDecorationButton : public TQButton
*/
ButtonState lastMousePress() const { return m_lastMouse; }
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
protected:
void setToggleButton(bool toggle);
diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp
index c9888ff9..ee8eb866 100644
--- a/twin/lib/kdecoration.cpp
+++ b/twin/lib/kdecoration.cpp
@@ -388,14 +388,14 @@ const TQFont& KDecorationOptions::font(bool active, bool small) const
return(active ? d->activeFont : d->inactiveFont);
}
-const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const
+const TQColorGroup& KDecorationOptions::tqcolorGroup(ColorType type, bool active) const
{
int idx = type + (active ? 0 : NUM_COLORS);
if(d->cg[idx])
return(*d->cg[idx]);
d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150),
d->colors[idx].dark(), d->colors[idx].dark(120),
- Qt::black, TQApplication::palette().active().
+ Qt::black, TQApplication::tqpalette().active().
base());
return(*d->cg[idx]);
}
diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h
index 19fe494e..30da5bc5 100644
--- a/twin/lib/kdecoration.h
+++ b/twin/lib/kdecoration.h
@@ -205,7 +205,7 @@ public:
* @param type The requested color type.
* @param active Whether to return the color for active or inactive windows.
*/
- const TQColorGroup& colorGroup(ColorType type, bool active=true) const;
+ const TQColorGroup& tqcolorGroup(ColorType type, bool active=true) const;
/**
* Returns the active or inactive decoration font.
* The changed flags for this setting is SettingFont.
@@ -481,15 +481,15 @@ class KWIN_EXPORT KDecoration
void performWindowOperation( WindowOperation op );
/**
* If the decoration is non-rectangular, this function needs to be called
- * to set the shape of the decoration.
+ * to set the tqshape of the decoration.
*
- * @param reg The shape of the decoration.
+ * @param reg The tqshape of the decoration.
* @param mode The X11 values Unsorted, YSorted, YXSorted and YXBanded that specify
* the sorting of the rectangles, default value is Unsorted.
*/
void setMask( const TQRegion& reg, int mode = 0 );
/**
- * This convenience function resets the shape mask.
+ * This convenience function resets the tqshape mask.
*/
void clearMask(); // convenience
/**
@@ -594,7 +594,7 @@ class KWIN_EXPORT KDecoration
* Note that the returned size shouldn't be too large, because it will be
* used to keep the decorated window at least as large.
*/
- virtual TQSize minimumSize() const = 0;
+ virtual TQSize tqminimumSize() const = 0;
/**
* This function is called whenever the window either becomes or stops being active.
* Use isActive() to find out the current state.
diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp
index 3561d63e..1e063d09 100644
--- a/twin/lib/kdecoration_p.cpp
+++ b/twin/lib/kdecoration_p.cpp
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
#include <kconfig.h>
#include <kglobalsettings.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqapplication.h>
#include <assert.h>
diff --git a/twin/lib/kdecorationfactory.h b/twin/lib/kdecorationfactory.h
index 7396ad98..fb560c49 100644
--- a/twin/lib/kdecorationfactory.h
+++ b/twin/lib/kdecorationfactory.h
@@ -56,7 +56,7 @@ class KWIN_EXPORT KDecorationFactory
* The argument specifies what has changed, using the SettingXXX masks.
* It should be determined whether the decorations need to be completely
* remade, in which case true should be returned, or whether only e.g.
- * a repaint will be sufficient, in which case false should be returned,
+ * a tqrepaint will be sufficient, in which case false should be returned,
* and resetDecorations() can be called to reset all decoration objects.
* Note that true should be returned only when really necessary.
*/
diff --git a/twin/manage.cpp b/twin/manage.cpp
index 2c677715..85ba9adc 100644
--- a/twin/manage.cpp
+++ b/twin/manage.cpp
@@ -264,7 +264,7 @@ bool Client::manage( Window w, bool isMapped )
usePosition = true;
if( !rules()->checkIgnoreGeometry( !usePosition ))
{
- bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::fromLatin1(resourceClass())));
+ bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::tqfromLatin1(resourceClass())));
if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) ||
(xSizeHint.flags & USPosition) )
@@ -319,7 +319,7 @@ bool Client::manage( Window w, bool isMapped )
keepInArea( area, partial_keep_in_area );
XShapeSelectInput( qt_xdisplay(), window(), ShapeNotifyMask );
- is_shape = Shape::hasShape( window());
+ is_tqshape = Shape::hasShape( window());
updateShape();
//CT extra check for stupid jdk 1.3.1. But should make sense in general
diff --git a/twin/options.cpp b/twin/options.cpp
index a5c22c9b..4f51bc1c 100644
--- a/twin/options.cpp
+++ b/twin/options.cpp
@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KCMRULES
-#include <palette.h>
+#include <tqpalette.h>
#include <tqpixmap.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -383,7 +383,7 @@ int Options::electricBorderDelay()
bool Options::checkIgnoreFocusStealing( const Client* c )
{
- return ignoreFocusStealingClasses.contains(TQString::fromLatin1(c->resourceClass()));
+ return ignoreFocusStealingClasses.contains(TQString::tqfromLatin1(c->resourceClass()));
}
Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta )
diff --git a/twin/options.h b/twin/options.h
index 5fdf84fc..2c5341f8 100644
--- a/twin/options.h
+++ b/twin/options.h
@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <tqobject.h>
#include <tqfont.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqstringlist.h>
#include <kdecoration_p.h>
diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp
index 455e6aa7..f2367b93 100644
--- a/twin/popupinfo.cpp
+++ b/twin/popupinfo.cpp
@@ -76,7 +76,7 @@ void PopupInfo::paintEvent( TQPaintEvent* )
{
TQPainter p( this );
tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ),
- colorGroup(), TQStyle::Style_Default );
+ tqcolorGroup(), TQStyle::Style_Default );
paintContents();
}
@@ -90,7 +90,7 @@ void PopupInfo::paintContents()
TQPainter p( this );
TQRect r( 6, 6, width()-12, height()-12 );
- p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
+ p.fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) );
/*
p.setPen(Qt::white);
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index 943ba6dc..4ca33a04 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -373,7 +373,7 @@ void TabBox::drawContents( TQPainter * )
pix.fill(this, 0, 0);
TQPainter p;
- p.begin(&pix, this);
+ p.tqbegin(&pix, this);
TQPixmap* menu_pix = twin_get_menu_pix_hack();
@@ -400,7 +400,7 @@ void TabBox::drawContents( TQPainter * )
{
// draw highlight background
if ( (*it) == current_client )
- p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight());
+ p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight());
// draw icon
TQPixmap icon;
@@ -437,11 +437,11 @@ void TabBox::drawContents( TQPainter * )
// draw text
if ( (*it) == current_client )
- p.setPen(colorGroup().highlightedText());
+ p.setPen(tqcolorGroup().highlightedText());
else if( (*it)->isMinimized())
{
- TQColor c1 = colorGroup().text();
- TQColor c2 = colorGroup().background();
+ TQColor c1 = tqcolorGroup().text();
+ TQColor c2 = tqcolorGroup().background();
// from kicker's TaskContainer::blendColors()
int r1, g1, b1;
int r2, g2, b2;
@@ -456,7 +456,7 @@ void TabBox::drawContents( TQPainter * )
p.setPen(TQColor( r1, g1, b1 ));
}
else
- p.setPen(colorGroup().text());
+ p.setPen(tqcolorGroup().text());
p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight,
Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, s);
@@ -494,13 +494,13 @@ void TabBox::drawContents( TQPainter * )
{
// draw highlight background
if ( iDesktop == desk ) // current desktop
- p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight());
+ p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight());
p.save();
// draw "icon" (here: number of desktop)
- p.fillRect(x+5, y+2, iconWidth, iconHeight, colorGroup().base());
- p.setPen(colorGroup().text());
+ p.fillRect(x+5, y+2, iconWidth, iconHeight, tqcolorGroup().base());
+ p.setPen(tqcolorGroup().text());
p.drawRect(x+5, y+2, iconWidth, iconHeight);
// draw desktop-number
@@ -512,9 +512,9 @@ void TabBox::drawContents( TQPainter * )
// draw desktop name text
if ( iDesktop == desk )
- p.setPen(colorGroup().highlightedText());
+ p.setPen(tqcolorGroup().highlightedText());
else
- p.setPen(colorGroup().text());
+ p.setPen(tqcolorGroup().text());
p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight,
Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine,
@@ -696,7 +696,7 @@ void TabBox::handleMouseEvent( XEvent* e )
if( e->type != ButtonPress )
return;
TQPoint pos( e->xbutton.x_root, e->xbutton.y_root );
- if( !geometry().contains( pos ))
+ if( !tqgeometry().contains( pos ))
{
workspace()->closeTabBox(); // click outside closes tab
return;
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index d89f773d..59a6e676 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -40,7 +40,7 @@
static KCmdLineOptions options[] =
{
{ "+decoration", "Decoration library to use, such as twin3_plastik.", 0 },
- { "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 },
+ { "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 },
{ "+repetitions", "Number of test repetitions.", 0 },
{ 0, 0, 0 }
};
@@ -117,7 +117,7 @@ int main(int argc, char** argv)
Tests test;
if (t == "all")
test = AllTests;
- else if (t == "repaint")
+ else if (t == "tqrepaint")
test = RepaintTest;
else if (t == "caption")
test = CaptionTest;
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index 8154612e..ec870abe 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -66,7 +66,7 @@ void KDecorationPreview::performRepaintTest(int n)
deco->captionChange();
positionPreviews(0);
for (int i = 0; i < n; ++i) {
- deco->widget()->repaint();
+ deco->widget()->tqrepaint();
kapp->processEvents();
}
}
@@ -79,7 +79,7 @@ void KDecorationPreview::performCaptionTest(int n)
for (int i = 0; i < n; ++i) {
bridge->setCaption(caption.arg(i) );
deco->captionChange();
- deco->widget()->repaint();
+ deco->widget()->tqrepaint();
kapp->processEvents();
}
}
@@ -127,7 +127,7 @@ void KDecorationPreview::positionPreviews(int shrink)
if ( !deco )
return;
- TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->minimumSize()*/;
+ TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->tqminimumSize()*/;
TQRect geometry(TQPoint(10, 10), size);
deco->widget()->setGeometry(geometry);
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index a265a178..7f713672 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -293,7 +293,7 @@ void Workspace::setupWindowShortcut( Client* c )
client_keys_client = c;
connect( client_keys_dialog, TQT_SIGNAL( dialogDone( bool )), TQT_SLOT( setupWindowShortcutDone( bool )));
TQRect r = clientArea( ScreenArea, c );
- TQSize size = client_keys_dialog->sizeHint();
+ TQSize size = client_keys_dialog->tqsizeHint();
TQPoint pos = c->pos() + c->clientPos();
if( pos.x() + size.width() >= r.right())
pos.setX( r.right() - size.width());
@@ -1045,8 +1045,8 @@ void Workspace::showWindowMenu( const TQRect &pos, Client* cl )
else
{
TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop());
- clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/
- int popupHeight = p->sizeHint().height();
+ clientPopupAboutToShow(); // needed for tqsizeHint() to be correct :-/
+ int popupHeight = p->tqsizeHint().height();
if (y + popupHeight < area.height())
p->exec( TQPoint( x, y ) );
else
diff --git a/twin/utils.cpp b/twin/utils.cpp
index d476c893..608b4bed 100644
--- a/twin/utils.cpp
+++ b/twin/utils.cpp
@@ -46,11 +46,11 @@ namespace KWinInternal
// used to store the return values of
// XShapeQueryExtension.
-// Necessary since shaped window are an extension to X
-int Shape::twin_shape_version = 0;
-int Shape::twin_shape_event = 0;
+// Necessary since tqshaped window are an extension to X
+int Shape::twin_tqshape_version = 0;
+int Shape::twin_tqshape_event = 0;
-// does the window w need a shape combine mask around it?
+// does the window w need a tqshape combine mask around it?
bool Shape::hasShape( WId w)
{
int xws, yws, xbs, ybs;
@@ -64,21 +64,21 @@ bool Shape::hasShape( WId w)
return boundingShaped != 0;
}
-int Shape::shapeEvent()
+int Shape::tqshapeEvent()
{
- return twin_shape_event;
+ return twin_tqshape_event;
}
void Shape::init()
{
- twin_shape_version = 0;
+ twin_tqshape_version = 0;
int dummy;
- if( !XShapeQueryExtension(qt_xdisplay(), &twin_shape_event, &dummy))
+ if( !XShapeQueryExtension(qt_xdisplay(), &twin_tqshape_event, &dummy))
return;
int major, minor;
if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor ))
return;
- twin_shape_version = major * 0x10 + minor;
+ twin_tqshape_version = major * 0x10 + minor;
}
void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move,
diff --git a/twin/utils.h b/twin/utils.h
index 538a7c6b..e8271e17 100644
--- a/twin/utils.h
+++ b/twin/utils.h
@@ -111,14 +111,14 @@ enum ShadeMode
class Shape
{
public:
- static bool available() { return twin_shape_version > 0; }
- static int version() { return twin_shape_version; } // as 16*major+minor, i.e. two hex digits
+ static bool available() { return twin_tqshape_version > 0; }
+ static int version() { return twin_tqshape_version; } // as 16*major+minor, i.e. two hex digits
static bool hasShape( WId w);
- static int shapeEvent();
+ static int tqshapeEvent();
static void init();
private:
- static int twin_shape_version;
- static int twin_shape_event;
+ static int twin_tqshape_version;
+ static int twin_tqshape_event;
};
// compile with XShape older than 1.0
diff --git a/twin/wm-spec/x351.html b/twin/wm-spec/x351.html
index 882f63fb..2e827fbc 100644
--- a/twin/wm-spec/x351.html
+++ b/twin/wm-spec/x351.html
@@ -97,10 +97,10 @@ NAME="AEN356"
></H2
><P
>This spec suggests implementing the file manager desktop by mapping a
-desktop-sized window (no shape) to all desktops, with
+desktop-sized window (no tqshape) to all desktops, with
_NET_WM_WINDOW_TYPE_DESKTOP. This makes the desktop focusable and greatly
simplifies implementation of the file manager. It is also faster than
-managing lots of small shaped windows. The file manager draws the background
+managing lots of small tqshaped windows. The file manager draws the background
on this window. There should be a root property with a window handle for use
in applications that want to draw the background (xearth).
</P
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index a46e3bbc..44045838 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -23,7 +23,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <tqregexp.h>
#include <tqpainter.h>
#include <tqbitmap.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <kmenubar.h>
#include <kprocess.h>
#include <kglobalaccel.h>
@@ -1056,7 +1056,7 @@ void Workspace::slotReconfigure()
topmenu_selection->release();
lostTopMenuSelection();
}
- topmenu_height = 0; // invalidate used menu height
+ topmenu_height = 0; // tqinvalidate used menu height
if( managingTopMenus())
{
updateTopMenuGeometry();
@@ -1938,7 +1938,7 @@ void Workspace::slotGrabWindow()
int count, order;
XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), active_client->frameId(),
ShapeBounding, &count, &order);
- //The ShapeBounding region is the outermost shape of the window;
+ //The ShapeBounding region is the outermost tqshape of the window;
//ShapeBounding - ShapeClipping is defined to be the border.
//Since the border area is part of the window, we use bounding
// to limit our work region
@@ -1956,7 +1956,7 @@ void Workspace::slotGrabWindow()
//Get the masked away area.
TQRegion maskedAway = bbox - contents;
- TQMemArray<TQRect> maskedAwayRects = maskedAway.rects();
+ TQMemArray<TQRect> maskedAwayRects = maskedAway.tqrects();
//Construct a bitmap mask from the rectangles
TQBitmap mask( snapshot.width(), snapshot.height());
@@ -1969,7 +1969,7 @@ void Workspace::slotGrabWindow()
}
}
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
cb->setPixmap( snapshot );
}
else
@@ -1982,7 +1982,7 @@ void Workspace::slotGrabWindow()
void Workspace::slotGrabDesktop()
{
TQPixmap p = TQPixmap::grabWindow( qt_xrootwin() );
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
cb->setPixmap( p );
}
@@ -2606,7 +2606,7 @@ int Workspace::topMenuHeight() const
{ // simply create a dummy menubar and use its preffered height as the menu height
KMenuBar tmpmenu;
tmpmenu.insertItem( "dummy" );
- topmenu_height = tmpmenu.sizeHint().height();
+ topmenu_height = tmpmenu.tqsizeHint().height();
}
return topmenu_height;
}