diff options
Diffstat (limited to 'kwin')
110 files changed, 1420 insertions, 1420 deletions
diff --git a/kwin/COMPLIANCE b/kwin/COMPLIANCE index 39cb70607..e63455e4f 100644 --- a/kwin/COMPLIANCE +++ b/kwin/COMPLIANCE @@ -53,7 +53,7 @@ version 1.2 are listed here. CHECKME : check it's complete / 3.2. - The spec requires that _NET_CLIENT_LIST tqcontains the windows in their + The spec requires that _NET_CLIENT_LIST contains the windows in their initial mapping order, which is currently not true for NET::Desktop windows. Note that xprop lists only first element in WINDOW type properties. @@ -70,7 +70,7 @@ version 1.2 + 3.7. + 3.8. KWin currently extends the message a bit, with data.l[0] being 1 or 2, - meaning 'from application'/'from pager', and data.l[1] tqcontains + meaning 'from application'/'from pager', and data.l[1] contains timestamp. This is used for focus stealing prevention purposes, and will be proposed for next version of the spec. + 3.9. @@ -138,14 +138,14 @@ version 1.2 - 5.13. Property is not used in KWin, KWin never provides icons for iconified windows. Kicker or its taskbar don't set it either. However, the property is flawed, - and should be tqreplaced by manager selection or similar mechanism. + and should be replaced by manager selection or similar mechanism. + 6.1. + 6. (rest) + 7.4. The urgency hint is mapped to the _NET_WM_DEMANDS_ATTENTION flag. * 7.5. Qt often sets maximum size smaller than minimum size. This seems to be caused - by delayed tqlayout calculations. + by delayed layout calculations. * 7.6. Kicker should be checked. ? 7.7. @@ -176,7 +176,7 @@ version 2.0 ? 4.1.2.3 ? - PSize, PPosition, USize, UPosition ? - clients - Qt simply sets both -+ - PWinGravity - window tqgeometry constraints have higher priority than gravity ++ - PWinGravity - window geometry constraints have higher priority than gravity / - PBaseSize - PMinSize is not used as a fallback for size increments + - (the rest) / 4.1.2.4 diff --git a/kwin/HACKING b/kwin/HACKING index 82d588916..1665aea56 100644 --- a/kwin/HACKING +++ b/kwin/HACKING @@ -36,7 +36,7 @@ Restarting KWin: ================ Since KWin takes care of focus handling, first killing KWin and then launching new instance -can cause focus trouble. Therefore it's possible to run 'kwin --tqreplace', which will start +can cause focus trouble. Therefore it's possible to run 'kwin --replace', which will start new KWin instance and tell the old one to quit. @@ -46,11 +46,11 @@ Handling the case when KWin crashes: Again, without KWin running there may be focus problems. The simplest way to solve them is to add the 'Run Command' applet to Kicker - it can receive focus even without KWin running. If you can't add the applet or can reach it for some reason, switch to text console, and run -'DISPLAY=:0 kwin --tqreplace' (and then you can run 'kwin --tqreplace' again from X). +'DISPLAY=:0 kwin --replace' (and then you can run 'kwin --replace' again from X). If KWin is temporarily unusable because of some change and e.g. crashes during startup, it is possible to run another window manager, for example Metacity, OpenBox or FVWM (the command -is similar to restarting KWin, i.e. 'metacity --tqreplace', 'openbox --tqreplace' or 'fvwm -tqreplace'). +is similar to restarting KWin, i.e. 'metacity --replace', 'openbox --replace' or 'fvwm -replace'). Debugging KWin: @@ -85,7 +85,7 @@ of their source files these some functionality is in separate .cpp file grouped - client.* - core of class Client - activation.cpp - focus handling and window activation - events.cpp - event handling is in events.cpp -- tqgeometry.cpp - tqgeometry-related code +- geometry.cpp - geometry-related code - layers.cpp - stacking-related code - manage.cpp - code dealing with new windows - placement.cpp - window placements algorithms @@ -97,7 +97,7 @@ The rest of the files contain additional helper classes: - atoms.* - so-called atoms (symbolic names for constants in X) - bridge.* - communication with the decoration plugin -- tqgeometrytip.* - window displaying window tqgeometry while moving/resizing +- geometrytip.* - window displaying window geometry while moving/resizing - group.* - grouping related windows together (warning! This is currently really messy and scary code that should be rewritten). - killwindow.* - handling of the Ctrl+Esc feature diff --git a/kwin/activation.cpp b/kwin/activation.cpp index d6ffad437..c0f578634 100644 --- a/kwin/activation.cpp +++ b/kwin/activation.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to window activation and focus + This file contains things relevant to window activation and focus stealing prevention. */ @@ -82,7 +82,7 @@ namespace KWinInternal the new mapped window (done in Client::readUserTimeMapTimestamp()) : - the window may have the _NET_WM_USER_TIME property. This way the application may either explicitly request that the window is not - activated (by using 0 timestamp), or the property tqcontains the time + activated (by using 0 timestamp), or the property contains the time of last user action in the application. - KWin itself tries to detect time of last user action in every window, by watching KeyPress and ButtonPress events on windows. This way some @@ -287,7 +287,7 @@ void Workspace::activateClient( Client* c, bool force ) if( c->isMinimized()) c->unminimize(); -// TODO force should perhaps allow this only if the window already tqcontains the mouse +// TODO force should perhaps allow this only if the window already contains the mouse if( options->focusPolicyIsReasonable() || force ) requestFocus( c, force ); @@ -433,7 +433,7 @@ bool Workspace::activateNextClient( Client* c ) if( c == NULL && !(*it)->isOnScreen( activeScreen())) continue; } - if( mainwindows.tqcontains( *it )) + if( mainwindows.contains( *it )) { get_focus = *it; break; @@ -486,7 +486,7 @@ void Workspace::setCurrentScreen( int new_screen ) void Workspace::gotFocusIn( const Client* c ) { - if( should_get_focus.tqcontains( const_cast< Client* >( c ))) + if( should_get_focus.contains( const_cast< Client* >( c ))) { // remove also all sooner elements that should have got FocusIn, // but didn't for some reason (and also won't anymore, because they were sooner) while( should_get_focus.first() != c ) @@ -523,7 +523,7 @@ bool Workspace::allowClientActivation( const Client* c, Time time, bool focus_in Client* ac = mostRecentlyActivatedClient(); if( focus_in ) { - if( should_get_focus.tqcontains( const_cast< Client* >( c ))) + if( should_get_focus.contains( const_cast< Client* >( c ))) return true; // FocusIn was result of KWin's action // Before getting FocusIn, the active Client already // got FocusOut, and therefore got deactivated. @@ -712,7 +712,7 @@ void Client::demandAttention( bool set ) { // Demand attention flag is often set right from manage(), when focus stealing prevention // steps in. At that time the window has no taskbar entry yet, so KNotify cannot place - // e.g. the passive popup next to it. So wait up to 1 second for the icon tqgeometry + // e.g. the passive popup next to it. So wait up to 1 second for the icon geometry // to be set. // Delayed call to KNotify also solves the problem of having X server grab in manage(), // which may deadlock when KNotify (or KLauncher when launching KNotify) need to access X. @@ -755,7 +755,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar { Time time = info->userTime(); // kdDebug( 1212 ) << "User timestamp, initial:" << time << endl; - // newer ASN timestamp always tqreplaces user timestamp, unless user timestamp is 0 + // newer ASN timestamp always replaces user timestamp, unless user timestamp is 0 // helps e.g. with konqy reusing if( asn_data != NULL && time != 0 ) { @@ -935,7 +935,7 @@ void Client::startupIdChanged() bool asn_valid = workspace()->checkStartupNotification( window(), asn_id, asn_data ); if( !asn_valid ) return; - // If the ASN tqcontains desktop, move it to the desktop, otherwise move it to the current + // If the ASN contains desktop, move it to the desktop, otherwise move it to the current // desktop (since the new ASN should make the window act like if it's a new application // launched). However don't affect the window's desktop if it's set to be on all desktops. int desktop = workspace()->currentDesktop(); diff --git a/kwin/bridge.cpp b/kwin/bridge.cpp index df610dd53..49840e248 100644 --- a/kwin/bridge.cpp +++ b/kwin/bridge.cpp @@ -43,7 +43,7 @@ BRIDGE_HELPER( bool, isMovable,,, const ) BRIDGE_HELPER( bool, isResizable,,, const ) BRIDGE_HELPER( TQString, caption,,, const ) BRIDGE_HELPER( void, processMousePressEvent, TQMouseEvent* e, e, ) -BRIDGE_HELPER( TQRect, tqgeometry,,, const ) +BRIDGE_HELPER( TQRect, geometry,,, const ) BRIDGE_HELPER( void, closeWindow,,, ) BRIDGE_HELPER( void, maximize, MaximizeMode m, m, ) BRIDGE_HELPER( void, minimize,,, ) @@ -178,12 +178,12 @@ TQRegion Bridge::unobscuredRegion( const TQRegion& r ) const if( !(*it)->isOnDesktop( c->desktop())) continue; } - /* the clients all have their tqmask-regions in local coords + /* the clients all have their mask-regions in local coords so we have to translate them to a shared coord system we choose ours */ int dx = (*it)->x() - c->x(); int dy = (*it)->y() - c->y(); - TQRegion creg = (*it)->tqmask(); + TQRegion creg = (*it)->mask(); creg.translate(dx, dy); reg -= creg; if (reg.isEmpty()) diff --git a/kwin/bridge.h b/kwin/bridge.h index acb0f095f..0989a64b5 100644 --- a/kwin/bridge.h +++ b/kwin/bridge.h @@ -46,7 +46,7 @@ class Bridge : public KDecorationBridge virtual void performWindowOperation( WindowOperation ); virtual void setMask( const TQRegion&, int ); virtual bool isPreview() const; - virtual TQRect tqgeometry() const; + virtual TQRect geometry() const; virtual TQRect iconGeometry() const; virtual TQRegion unobscuredRegion( const TQRegion& r ) const; virtual TQWidget* workspaceWidget() const; diff --git a/kwin/client.cpp b/kwin/client.cpp index aef8500ae..0d2c5cfbf 100644 --- a/kwin/client.cpp +++ b/kwin/client.cpp @@ -105,9 +105,9 @@ Client::Client( Workspace *ws ) process_killer( NULL ), user_time( CurrentTime ), // not known yet allowed_actions( 0 ), - postpone_tqgeometry_updates( 0 ), - pending_tqgeometry_update( false ), - shade_tqgeometry_change( false ), + postpone_geometry_updates( 0 ), + pending_geometry_update( false ), + shade_geometry_change( false ), border_left( 0 ), border_right( 0 ), border_top( 0 ), @@ -141,7 +141,7 @@ Client::Client( Workspace *ws ) deleting = false; keep_above = FALSE; keep_below = FALSE; - is_tqshape = FALSE; + is_shape = FALSE; motif_noborder = false; motif_may_move = TRUE; motif_may_resize = TRUE; @@ -172,7 +172,7 @@ Client::Client( Workspace *ws ) cmap = None; - frame_tqgeometry = TQRect( 0, 0, 100, 100 ); // so that decorations don't start with size being (0,0) + frame_geometry = TQRect( 0, 0, 100, 100 ); // so that decorations don't start with size being (0,0) client_size = TQSize( 100, 100 ); custom_opacity = false; rule_opacity_active = 0;; //translucency rules @@ -190,7 +190,7 @@ Client::~Client() assert( client == None ); assert( frame == None && wrapper == None ); assert( decoration == NULL ); - assert( postpone_tqgeometry_updates == 0 ); + assert( postpone_geometry_updates == 0 ); assert( !check_active_modal ); delete info; delete bridge; @@ -217,7 +217,7 @@ void Client::releaseWindow( bool on_shutdown ) removeShadow(); drawIntersectingShadows(); finishWindowRules(); - ++postpone_tqgeometry_updates; + ++postpone_geometry_updates; // grab X during the release to make removing of properties, setting to withdrawn state // and repareting to root an atomic operation (http://lists.kde.org/?l=kde-devel&m=116448102901184&w=2) grabXServer(); @@ -260,7 +260,7 @@ void Client::releaseWindow( bool on_shutdown ) wrapper = None; XDestroyWindow( qt_xdisplay(), frame ); frame = None; - --postpone_tqgeometry_updates; // don't use GeometryUpdatesBlocker, it would now set the tqgeometry + --postpone_geometry_updates; // don't use GeometryUpdatesBlocker, it would now set the geometry checkNonExistentClients(); deleteClient( this, Allowed ); ungrabXServer(); @@ -279,19 +279,19 @@ void Client::destroyClient() removeShadow(); drawIntersectingShadows(); finishWindowRules(); - ++postpone_tqgeometry_updates; + ++postpone_geometry_updates; setModal( false ); hidden = true; // so that it's not considered visible anymore workspace()->clientHidden( this ); destroyDecoration(); cleanGrouping(); workspace()->removeClient( this, Allowed ); - client = None; // tqinvalidate + client = None; // invalidate XDestroyWindow( qt_xdisplay(), wrapper ); wrapper = None; XDestroyWindow( qt_xdisplay(), frame ); frame = None; - --postpone_tqgeometry_updates; // don't use GeometryUpdatesBlocker, it would now set the tqgeometry + --postpone_geometry_updates; // don't use GeometryUpdatesBlocker, it would now set the geometry checkNonExistentClients(); deleteClient( this, Allowed ); } @@ -307,7 +307,7 @@ void Client::updateDecoration( bool check_workspace_pos, bool force ) destroyDecoration(); if( !noBorder()) { - setMask( TQRegion()); // reset tqshape tqmask + setMask( TQRegion()); // reset shape mask decoration = workspace()->createDecoration( bridge ); // TODO check decoration's minimum size? decoration->init(); @@ -345,7 +345,7 @@ void Client::destroyDecoration() decoration = NULL; TQPoint grav = calculateGravitation( true ); border_left = border_right = border_top = border_bottom = 0; - setMask( TQRegion()); // reset tqshape tqmask + setMask( TQRegion()); // reset shape mask int save_workarea_diff_x = workarea_diff_x; int save_workarea_diff_y = workarea_diff_y; plainResize( sizeForClientSize( clientSize()), ForceGeometrySet ); @@ -451,7 +451,7 @@ void Client::updateFrameExtents() // Resizes the decoration, and makes sure the decoration widget gets resize event // even if the size hasn't changed. This is needed to make sure the decoration -// re-tqlayouts (e.g. when options()->moveResizeMaximizedWindows() changes, +// re-layouts (e.g. when options()->moveResizeMaximizedWindows() changes, // the decoration may turn on/off some borders, but the actual size // of the decoration stays the same). void Client::resizeDecoration( const TQSize& s ) @@ -502,32 +502,32 @@ void Client::setUserNoBorder( bool set ) void Client::updateShape() { - // workaround for #19644 - tqshaped windows shouldn't have decoration - if( tqshape() && !noBorder()) + // workaround for #19644 - shaped windows shouldn't have decoration + if( shape() && !noBorder()) { noborder = true; updateDecoration( true ); } updateOpacityCache(); - if ( tqshape() ) + if ( shape() ) { XShapeCombineShape(qt_xdisplay(), frameId(), ShapeBounding, clientPos().x(), clientPos().y(), window(), ShapeBounding, ShapeSet); setShapable(TRUE); } - // !tqshape() tqmask setting is done in setMask() when the decoration + // !shape() 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 tqshape support + if( Shape::version() >= 0x11 ) // 1.1, has input shape support { // There appears to be no way to find out if a window has input - // 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 + // 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 // the window lose focus (which is a problem with mouse focus policies) static Window helper_window = None; if( helper_window == None ) @@ -549,7 +549,7 @@ void Client::updateShape() void Client::setMask( const TQRegion& reg, int mode ) { - _tqmask = reg; + _mask = reg; if( reg.isNull()) XShapeCombineMask( qt_xdisplay(), frameId(), ShapeBounding, 0, 0, None, ShapeSet ); @@ -576,11 +576,11 @@ void Client::setMask( const TQRegion& reg, int mode ) updateShape(); } -TQRegion Client::tqmask() const +TQRegion Client::mask() const { - if( _tqmask.isEmpty()) + if( _mask.isEmpty()) return TQRegion( 0, 0, width(), height()); - return _tqmask; + return _mask; } void Client::setShapable(bool b) @@ -838,7 +838,7 @@ void Client::setShade( ShadeMode mode ) XChangeProperty(qt_xdisplay(), frameId(), atoms->net_wm_window_shade, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &_shade, 1L); // shade int h = height(); - shade_tqgeometry_change = true; + shade_geometry_change = true; TQSize s( sizeForClientSize( TQSize( clientSize()))); s.setHeight( border_top + border_bottom ); XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify @@ -847,7 +847,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 tqrepaint( FALSE ); +// FRAME repaint( FALSE ); // bool wasStaticContents = testWFlags( WStaticContents ); // setWFlags( WStaticContents ); int step = QMAX( 4, QABS( h - s.height() ) / as )+1; @@ -861,7 +861,7 @@ void Client::setShade( ShadeMode mode ) // if ( !wasStaticContents ) // clearWFlags( WStaticContents ); plainResize( s ); - shade_tqgeometry_change = false; + shade_geometry_change = false; if( isActive()) { if( was_shade_mode == ShadeHover ) @@ -876,7 +876,7 @@ void Client::setShade( ShadeMode mode ) else { int h = height(); - shade_tqgeometry_change = true; + shade_geometry_change = true; TQSize s( sizeForClientSize( clientSize())); // FRAME bool wasStaticContents = testWFlags( WStaticContents ); // setWFlags( WStaticContents ); @@ -888,12 +888,12 @@ 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 tqrepaint( 0, h - step-5, width(), step+5, TRUE); +// FRAME repaint( 0, h - step-5, width(), step+5, TRUE); TQApplication::syncX(); } while ( h < s.height() - step ); // if ( !wasStaticContents ) // clearWFlags( WStaticContents ); - shade_tqgeometry_change = false; + shade_geometry_change = false; plainResize( s ); if( shade_mode == ShadeHover || shade_mode == ShadeActivated ) setActive( TRUE ); @@ -1051,7 +1051,7 @@ void Client::drawIntersectingShadows() { // active window has a shadow. return; - region = tqshapeBoundingRegion; + region = shapeBoundingRegion; // Generate list of Clients whose shadows need to be redrawn. That is, // those that are currently intersecting or intersected by other windows or @@ -1089,7 +1089,7 @@ void Client::drawOverlappingShadows(bool waitForMe) // active window has a shadow. return; - region = tqshapeBoundingRegion; + region = shapeBoundingRegion; stacking_order = workspace()->stackingOrder(); for (it = stacking_order.fromLast(); it != stacking_order.end(); --it) { @@ -1140,7 +1140,7 @@ void Client::drawOverlappingShadows(bool waitForMe) /*! Draw shadow after some time has elapsed, to give recently exposed windows a - chance to tqrepaint before a shadow gradient is drawn over them. + chance to repaint before a shadow gradient is drawn over them. */ void Client::drawDelayedShadow() { @@ -1163,7 +1163,7 @@ void Client::drawShadowAfter(Client *after) void Client::drawShadow() { Window shadows[2]; - XRectangle *tqshapes; + XRectangle *shapes; int i, count, ordering; // If we are waiting for another Client's shadow to be drawn, stop waiting now @@ -1179,31 +1179,31 @@ void Client::drawShadow() * this type of window. Otherwise, drawIntersectingShadows() won't update * properly when this window is moved/resized/hidden/closed. */ - tqshapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, + shapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, &count, &ordering); - if (!tqshapes) + if (!shapes) // XShape extension not supported - tqshapeBoundingRegion = TQRegion(x(), y(), width(), height()); + shapeBoundingRegion = TQRegion(x(), y(), width(), height()); else { - tqshapeBoundingRegion = TQRegion(); + shapeBoundingRegion = TQRegion(); for (i = 0; i < count; i++) { // Translate XShaped window into a TQRegion - TQRegion tqshapeRectangle(tqshapes[i].x, tqshapes[i].y, tqshapes[i].width, - tqshapes[i].height); - tqshapeBoundingRegion += tqshapeRectangle; + TQRegion shapeRectangle(shapes[i].x, shapes[i].y, shapes[i].width, + shapes[i].height); + shapeBoundingRegion += shapeRectangle; } if (isShade()) // Since XResize() doesn't change a window's XShape regions, ensure that - // tqshapeBoundingRegion is not taller than the window's shaded height, + // shapeBoundingRegion is not taller than the window's shaded height, // or the bottom shadow will appear to be missing - tqshapeBoundingRegion &= TQRegion(0, 0, width(), height()); - tqshapeBoundingRegion.translate(x(), y()); + shapeBoundingRegion &= TQRegion(0, 0, width(), height()); + shapeBoundingRegion.translate(x(), y()); } if (!isShadowed() || hidden || isMinimized() || maximizeMode() == MaximizeFull || !options->shadowWindowType(windowType())) { - XFree(tqshapes); + XFree(shapes); // 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. @@ -1237,9 +1237,9 @@ void Client::drawShadow() ButtonPressMask | ButtonReleaseMask | StructureNotifyMask); shadowWidget->installEventFilter(this); - if (!tqshapes) { + if (!shapes) { // XShape extension not supported - exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1247,7 +1247,7 @@ void Client::drawShadow() shadowRegions.append(shadowRegion); if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, + imposeRegionShadow(shadowPixmap, shapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else @@ -1258,7 +1258,7 @@ void Client::drawShadow() TQMemArray<TQRect>::Iterator it, itEnd; XRectangle *shadowShapes; - exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1284,14 +1284,14 @@ void Client::drawShadow() delete [] shadowShapes; if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, + imposeRegionShadow(shadowPixmap, shapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else imposeCachedShadow(shadowPixmap, exposedRegion); } - XFree(tqshapes); + XFree(shapes); // Set the background pixmap //shadowPixmap.convertFromImage(shadowImage); @@ -1367,9 +1367,9 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w, occludedRects = occludedRegion.rects(); itEnd = occludedRects.end(); for (it = occludedRects.begin(); it != itEnd; ++it) { - // Expand each of the occluded region's tqshape rectangles to contain + // Expand each of the occluded region's shape rectangles to contain // where a shadow of the specified thickness will be drawn. Create - // a new TQRegion that tqcontains the expanded occluded region + // a new TQRegion that contains the expanded occluded region it->setTop(it->top() - thickness + yOffset); it->setLeft(it->left() - thickness + xOffset); it->setRight(it->right() + thickness + xOffset); @@ -1423,11 +1423,11 @@ void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed) for (y = 0; y < subH; y++) { opacity = (*(opacityCache))[(zeroY + y) * w + zeroX + x]; pixel = image.pixel(x, y); - pixelRed = tqRed(pixel); - pixelGreen = tqGreen(pixel); - pixelBlue = tqBlue(pixel); + pixelRed = qRed(pixel); + pixelGreen = qGreen(pixel); + pixelBlue = qBlue(pixel); image.setPixel(x, y, - tqRgb((int)(pixelRed + (red - pixelRed) * opacity), + qRgb((int)(pixelRed + (red - pixelRed) * opacity), (int)(pixelGreen + (green - pixelGreen) * opacity), (int)(pixelBlue + (blue - pixelBlue) * opacity))); } @@ -1515,7 +1515,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, // irTop is not necessarily larger than irBottom and // yIncrement isn't necessarily positive for (i = irLeft; i <= irRight; i++) { - if (occluded.tqcontains(TQPoint(i, j))) + if (occluded.contains(TQPoint(i, j))) intersectCount++; } } @@ -1525,7 +1525,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, intersectCount = 0; for (i = irLeft; i <= irRight; i++) { - if (occluded.tqcontains(TQPoint(i, irBottom))) + if (occluded.contains(TQPoint(i, irBottom))) intersectCount++; } } @@ -1535,16 +1535,16 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, (*(opacityCache))[(zeroY + y) * w + zeroX + x] = opacity; pixel = image.pixel(x, y); - pixelRed = tqRed(pixel); - pixelGreen = tqGreen(pixel); - pixelBlue = tqBlue(pixel); + pixelRed = qRed(pixel); + pixelGreen = qGreen(pixel); + pixelBlue = qBlue(pixel); image.setPixel(x, y, - tqRgb((int)(pixelRed + (red - pixelRed) * opacity), + qRgb((int)(pixelRed + (red - pixelRed) * opacity), (int)(pixelGreen + (green - pixelGreen) * opacity), (int)(pixelBlue + (blue - pixelBlue) * opacity))); for (i = irLeft; i <= irRight; i++) { - if (occluded.tqcontains(TQPoint(i, irTop))) + if (occluded.contains(TQPoint(i, irTop))) intersectCount--; } @@ -1554,12 +1554,12 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, irTop += yIncrement; for (j = irTop; j != irBottom; j += yIncrement) { - if (occluded.tqcontains(TQPoint(irLeft, j))) + if (occluded.contains(TQPoint(irLeft, j))) intersectCount--; } irRight++; for (j = irTop; j != irBottom; j += yIncrement) { - if (occluded.tqcontains(TQPoint(irRight, j))) + if (occluded.contains(TQPoint(irRight, j))) intersectCount++; } @@ -1602,7 +1602,7 @@ void Client::setMappingState(int s) XChangeProperty(qt_xdisplay(), window(), qt_wm_state, qt_wm_state, 32, PropModeReplace, (unsigned char *)data, 2); - if( was_unmanaged ) // manage() did postpone_tqgeometry_updates = 1, now it's ok to finally set the tqgeometry + if( was_unmanaged ) // manage() did postpone_geometry_updates = 1, now it's ok to finally set the geometry postponeGeometryUpdates( false ); } @@ -1652,7 +1652,7 @@ void Client::rawHide() void Client::sendClientMessage(Window w, Atom a, Atom protocol, long data1, long data2, long data3) { XEvent ev; - long tqmask; + long mask; memset(&ev, 0, sizeof(ev)); ev.xclient.type = ClientMessage; @@ -1664,10 +1664,10 @@ void Client::sendClientMessage(Window w, Atom a, Atom protocol, long data1, long ev.xclient.data.l[2] = data1; ev.xclient.data.l[3] = data2; ev.xclient.data.l[4] = data3; - tqmask = 0L; + mask = 0L; if (w == qt_xrootwin()) - tqmask = SubstructureRedirectMask; /* magic! */ - XSendEvent(qt_xdisplay(), w, False, tqmask, &ev); + mask = SubstructureRedirectMask; /* magic! */ + XSendEvent(qt_xdisplay(), w, False, mask, &ev); } /* @@ -1894,14 +1894,14 @@ int Client::screen() const { if( !options->xineramaEnabled ) return 0; - return workspace()->screenNumber( tqgeometry().center()); + return workspace()->screenNumber( geometry().center()); } bool Client::isOnScreen( int screen ) const { if( !options->xineramaEnabled ) return screen == 0; - return workspace()->screenGeometry( screen ).intersects( tqgeometry()); + return workspace()->screenGeometry( screen ).intersects( geometry()); } // performs activation and/or raising of the window @@ -2391,7 +2391,7 @@ NET::WindowType Client::windowType( bool direct, int supported_types ) const // TODO change this to rule const char* const oo_prefix = "openoffice.org"; // TQCString has no startsWith() // oo_prefix is lowercase, because resourceClass() is forced to be lowercase - if( tqstrncmp( resourceClass(), oo_prefix, strlen( oo_prefix )) == 0 && wt == NET::Dialog ) + if( qstrncmp( resourceClass(), oo_prefix, strlen( oo_prefix )) == 0 && wt == NET::Dialog ) wt = NET::Normal; // see bug #66065 if( wt == NET::Unknown ) // this is more or less suggested in NETWM spec wt = isTransient() ? NET::Dialog : NET::Normal; @@ -2399,7 +2399,7 @@ NET::WindowType Client::windowType( bool direct, int supported_types ) const } /*! - Sets an appropriate cursor tqshape for the logical mouse position \a m + Sets an appropriate cursor shape for the logical mouse position \a m */ void Client::setCursor( Position m ) diff --git a/kwin/client.h b/kwin/client.h index c36a641fe..1c4d45f51 100644 --- a/kwin/client.h +++ b/kwin/client.h @@ -76,7 +76,7 @@ class Client : public TQObject, public KDecorationDefines void applyWindowRules(); void updateWindowRules(); - TQRect tqgeometry() const; + TQRect geometry() const; TQSize size() const; TQSize minSize() const; TQSize maxSize() const; @@ -86,7 +86,7 @@ class Client : public TQObject, public KDecorationDefines int y() const; int width() const; int height() const; - TQPoint clientPos() const; // inside of tqgeometry() + TQPoint clientPos() const; // inside of geometry() TQSize clientSize() const; bool windowEvent( XEvent* e ); @@ -132,7 +132,7 @@ class Client : public TQObject, public KDecorationDefines bool isMinimized() const; bool isMaximizable() const; - TQRect tqgeometryRestore() const; + TQRect geometryRestore() const; MaximizeMode maximizeModeRestore() const; MaximizeMode maximizeMode() const; bool isMinimizable() const; @@ -142,7 +142,7 @@ class Client : public TQObject, public KDecorationDefines bool isFullScreen() const; bool isFullScreenable( bool fullscreen_hack = false ) const; bool userCanSetFullScreen() const; - TQRect tqgeometryFSRestore() const { return geom_fs_restore; } // only for session saving + TQRect geometryFSRestore() const { return geom_fs_restore; } // only for session saving int fullScreenMode() const { return fullscreen_mode; } // only for session saving bool isUserNoBorder() const; @@ -162,7 +162,7 @@ class Client : public TQObject, public KDecorationDefines void setKeepBelow( bool ); Layer layer() const; Layer belongsToLayer() const; - void tqinvalidateLayer(); + void invalidateLayer(); void setModal( bool modal ); bool isModal() const; @@ -195,7 +195,7 @@ class Client : public TQObject, public KDecorationDefines void demandAttention( bool set = true ); void setMask( const TQRegion& r, int mode = X::Unsorted ); - TQRegion tqmask() const; + TQRegion mask() const; void updateDecoration( bool check_workspace_pos, bool force = false ); void checkBorderSizes(); @@ -213,8 +213,8 @@ class Client : public TQObject, public KDecorationDefines // window to be redrawn. friend void Workspace::updateOverlappingShadows(WId); - // tqshape extensions - bool tqshape() const; + // shape extensions + bool shape() const; void updateShape(); void setGeometry( int x, int y, int w, int h, ForceGeometry_t force = NormalGeometrySet ); @@ -416,7 +416,7 @@ class Client : public TQObject, public KDecorationDefines void updateWorkareaDiffs(); void checkDirection( int new_diff, int old_diff, TQRect& rect, const TQRect& area ); static int computeWorkareaDiff( int left, int right, int a_left, int a_right ); - void configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, int gravity, bool from_tool ); + void configureRequest( int value_mask, int rx, int ry, int rw, int rh, int gravity, bool from_tool ); NETExtendedStrut strut() const; int checkShadeGeometry( int w, int h ); void postponeGeometryUpdates( bool postpone ); @@ -500,7 +500,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_tqshape :1; + uint is_shape :1; uint skip_taskbar :1; uint original_skip_taskbar :1; // unaffected by KWin uint Pdeletewindow :1; // does the window understand the DeleteWindow protocol? @@ -557,11 +557,11 @@ class Client : public TQObject, public KDecorationDefines Time ping_timestamp; Time user_time; unsigned long allowed_actions; - TQRect frame_tqgeometry; + TQRect frame_geometry; TQSize client_size; - int postpone_tqgeometry_updates; // >0 - new tqgeometry is remembered, but not actually set - bool pending_tqgeometry_update; - bool shade_tqgeometry_change; + int postpone_geometry_updates; // >0 - new geometry is remembered, but not actually set + bool pending_geometry_update; + bool shade_geometry_change; int border_left, border_right, border_top, border_bottom; Client* shadowAfterClient; @@ -569,11 +569,11 @@ class Client : public TQObject, public KDecorationDefines TQMemArray<double> activeOpacityCache; TQMemArray<double> inactiveOpacityCache; TQMemArray<double>* opacityCache; - TQRegion tqshapeBoundingRegion; + TQRegion shapeBoundingRegion; TQTimer* shadowDelayTimer; bool shadowMe; - TQRegion _tqmask; + TQRegion _mask; static bool check_active_modal; // see Client::checkActiveModal() KShortcut _shortcut; friend struct FetchNameInternalPredicate; @@ -616,7 +616,7 @@ class WinInfo : public NETWinInfo WinInfo( Client* c, Display * display, Window window, Window rwin, const unsigned long pr[], int pr_size ); virtual void changeDesktop(int desktop); - virtual void changeState( unsigned long state, unsigned long tqmask ); + virtual void changeState( unsigned long state, unsigned long mask ); private: Client * m_client; }; @@ -766,7 +766,7 @@ inline TQPixmap Client::miniIcon() const return miniicon_pix; } -inline TQRect Client::tqgeometryRestore() const +inline TQRect Client::geometryRestore() const { return geom_restore; } @@ -801,9 +801,9 @@ inline bool Client::keepBelow() const return keep_below; } -inline bool Client::tqshape() const +inline bool Client::shape() const { - return is_tqshape; + return is_shape; } @@ -832,7 +832,7 @@ inline pid_t Client::pid() const return info->pid(); } -inline void Client::tqinvalidateLayer() +inline void Client::invalidateLayer() { in_layer = UnknownLayer; } @@ -857,39 +857,39 @@ inline TQCString Client::windowRole() const return window_role; } -inline TQRect Client::tqgeometry() const +inline TQRect Client::geometry() const { - return frame_tqgeometry; + return frame_geometry; } inline TQSize Client::size() const { - return frame_tqgeometry.size(); + return frame_geometry.size(); } inline TQPoint Client::pos() const { - return frame_tqgeometry.topLeft(); + return frame_geometry.topLeft(); } inline int Client::x() const { - return frame_tqgeometry.x(); + return frame_geometry.x(); } inline int Client::y() const { - return frame_tqgeometry.y(); + return frame_geometry.y(); } inline int Client::width() const { - return frame_tqgeometry.width(); + return frame_geometry.width(); } inline int Client::height() const { - return frame_tqgeometry.height(); + return frame_geometry.height(); } inline TQRect Client::rect() const diff --git a/kwin/clients/PORTING b/kwin/clients/PORTING index 3b4259e34..9a5fb9f6b 100644 --- a/kwin/clients/PORTING +++ b/kwin/clients/PORTING @@ -3,7 +3,7 @@ Also, the API is documented in the .h header files. Makefile.am: - Change kwin_ to kwin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES). -- Make sure LDFLAGS tqcontains $(KDE_PLUGIN) and -module . +- Make sure LDFLAGS contains $(KDE_PLUGIN) and -module . - Add -lkdecorations to LIBADD. - Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/kwin/ ). @@ -66,7 +66,7 @@ bool MyClient::eventFilter( QObject* o, QEvent* e ) } } ===== -- In MyClient, 'this' will have to be often tqreplaced with 'widget()', pay special attention +- In MyClient, 'this' will have to be often replaced with 'widget()', pay special attention to cases where this won't cause compile error (e.g. in connect() calls, which take QObject* ). - Also, many calls may need 'widget()->' prepended. - Layout is created in init(), so call createLayout() directly there (if it's implemented). @@ -91,18 +91,18 @@ inline const KDecorationOptions* options() { return KDecoration::options(); } Make sure it doesn't reenter the event loop (no kapp->processEvents()). - Buttons should use explicit setCursor() if they don't want cursor set by mousePosition(). I.e. usually call setCursor( ArrowCursor ) in your MyButton. -- In the part where you insert windowWrapper() into the tqlayout, i.e. something like +- In the part where you insert windowWrapper() into the layout, i.e. something like ===== - tqlayout->addWidget( windowWrapper()); + layout->addWidget( windowWrapper()); ===== - tqreplace it with something like + replace it with something like ===== if( isPreview()) - tqlayout->addWidget( new QLabel( i18n( "<center><b>MyDecoration</b></center>" ), widget())); + layout->addWidget( new QLabel( i18n( "<center><b>MyDecoration</b></center>" ), widget())); else - tqlayout->addItem( new QSpacerItem( 0, 0 )); + layout->addItem( new QSpacerItem( 0, 0 )); ===== -- Implement MyClient::tqminimumSize(). +- Implement MyClient::minimumSize(). - Handling maximization - to change vertical or horizontal maximalization, use e.g. 'maximize( maximizeMode() ^ MaximizeVertical', to change normal maximalization, i.e. after left-clicking on the button, use @@ -120,7 +120,7 @@ inline const KDecorationOptions* options() { return KDecoration::options(); } check values like 'maximizeMode() == MaximizeFull && !options()->moveResizeMaximizedWindows()' to check whether you can disable some borders completely. Note that your painting code must of course match these sizes. -- If your code uses XGrabServer() or XUnGrabServer(), tqreplace them with (un)grabXServer(). +- If your code uses XGrabServer() or XUnGrabServer(), replace them with (un)grabXServer(). - In cases where you call some function from the KDecoration API that can possibly destroy the decoration (e.g. showWindowMenu() or closeWindow()), make sure to use exists() if some more code will follow this call. Refer to showWindowMenu() documentation for an example. @@ -142,10 +142,10 @@ extern "C" ===== - The reset handling has changed: There's no signal resetClients(), and no slotResetAllClientsDelayed(). If your MyClient has some slotReset(), make it - reset( unsigned long ), where the argument is tqmask of things that have changed ( SettingXYZ ). + reset( unsigned long ), where the argument is mask of things that have changed ( SettingXYZ ). If you have some global function that handles resetting, make it MyFactory::reset( unsigned long ). Try to minimize the effects of the changed things, - e.g. if only the color setting has changed, doing a tqrepaint is often enough, and there's no need + e.g. if only the color setting has changed, doing a repaint is often enough, and there's no need to recreate the decorations. If you need to recreate the decorations, return true from MyFactory::reset(), otherwise, you may call resetDecorations() to call reset() in all MyClient instances. diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp index 0bd9a4535..97d049ffb 100644 --- a/kwin/clients/b2/b2client.cpp +++ b/kwin/clients/b2/b2client.cpp @@ -146,7 +146,7 @@ static void drawB2Rect(KPixmap *pix, const TQColor &primary, bool down) TQColor hColor = primary.light(150); TQColor lColor = primary.dark(150); - if (down) tqSwap(hColor, lColor); + if (down) qSwap(hColor, lColor); if (TQPixmap::defaultDepth() > 8) { KPixmapEffect::gradient(*pix, hColor, lColor, @@ -199,40 +199,40 @@ static void create_pixmaps() } // there seems to be no way to load X bitmaps from data properly, so - // we need to create new ones for each tqmask :P - TQBitmap pinupMask(16, 16, pinup_tqmask_bits, true); + // we need to create new ones for each mask :P + TQBitmap pinupMask(16, 16, pinup_mask_bits, true); PIXMAP_A(P_PINUP)->setMask(pinupMask); PIXMAP_I(P_PINUP)->setMask(pinupMask); - TQBitmap pindownMask(16, 16, pindown_tqmask_bits, true); + TQBitmap pindownMask(16, 16, pindown_mask_bits, true); PIXMAP_AD(P_PINUP)->setMask(pindownMask); PIXMAP_ID(P_PINUP)->setMask(pindownMask); - TQBitmap menuMask(16, 16, menu_tqmask_bits, true); + TQBitmap menuMask(16, 16, menu_mask_bits, true); for (i = 0; i < NumStates; i++) pixmap[P_MENU * NumStates + i]->setMask(menuMask); - TQBitmap helpMask(16, 16, help_tqmask_bits, true); + TQBitmap helpMask(16, 16, help_mask_bits, true); for (i = 0; i < NumStates; i++) pixmap[P_HELP * NumStates + i]->setMask(helpMask); TQBitmap normalizeMask(16, 16, true); - // draw normalize icon tqmask - TQPainter tqmask; - tqmask.begin(&normalizeMask); + // draw normalize icon mask + TQPainter mask; + mask.begin(&normalizeMask); TQBrush one(Qt::color1); - tqmask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12, + mask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12, 12, 12, one); - tqmask.fillRect(0, 0, 10, 10, one); - tqmask.end(); + mask.fillRect(0, 0, 10, 10, one); + mask.end(); for (i = 0; i < NumStates; i++) pixmap[P_NORMALIZE * NumStates + i]->setMask(normalizeMask); TQBitmap shadeMask(bsize, bsize, true); - tqmask.begin(&shadeMask); - tqmask.fillRect(0, 0, bsize, 6, one); - tqmask.end(); + mask.begin(&shadeMask); + mask.fillRect(0, 0, bsize, 6, one); + mask.end(); for (i = 0; i < NumStates; i++) pixmap[P_SHADE * NumStates + i]->setMask(shadeMask); @@ -418,7 +418,7 @@ void B2Client::init() titleLayout->addSpacing(3); - TQColor c = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()). + TQColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()). color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) { @@ -537,7 +537,7 @@ bool B2Client::mustDrawHandle() const void B2Client::iconChange() { if (button[BtnMenu]) - button[BtnMenu]->tqrepaint(false); + button[BtnMenu]->repaint(false); } // Gallium: New button show/hide magic for customizable @@ -578,7 +578,7 @@ void B2Client::calcHiddenButtons() void B2Client::resizeEvent(TQResizeEvent * /*e*/) { calcHiddenButtons(); - titlebar->tqlayout()->activate(); + titlebar->layout()->activate(); positionButtons(); /* may be the resize cut off some space occupied by titlebar, which @@ -586,7 +586,7 @@ void B2Client::resizeEvent(TQResizeEvent * /*e*/) titleMoveAbs(bar_x_ofs); doShape(); - widget()->tqrepaint(); // the frame is misrendered without this + widget()->repaint(); // the frame is misrendered without this } void B2Client::captionChange() @@ -595,7 +595,7 @@ void B2Client::captionChange() titleMoveAbs(bar_x_ofs); doShape(); titlebar->recalcBuffer(); - titlebar->tqrepaint(false); + titlebar->repaint(false); } void B2Client::paintEvent(TQPaintEvent* e) @@ -605,7 +605,7 @@ void B2Client::paintEvent(TQPaintEvent* e) KDecoration::ColorType frameColorGroup = colored_frame ? KDecoration::ColorTitleBar : KDecoration::ColorFrame; - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); // Frame height, this is used a lot of times int fHeight = height() - t.height(); @@ -614,7 +614,7 @@ void B2Client::paintEvent(TQPaintEvent* e) int bb = mustDrawHandle() ? 4 : 0; int bDepth = thickness + bb; - TQColorGroup fillColor = options()->tqcolorGroup(frameColorGroup, isActive()); + TQColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive()); TQBrush fillBrush(options()->color(frameColorGroup, isActive())); // outer frame rect @@ -689,7 +689,7 @@ void B2Client::paintEvent(TQPaintEvent* e) visibilitinotify events until its state changes, so we just try */ if (titlebar->isFullyObscured()) { - /* We first see, if our tqrepaint contained the titlebar area */ + /* We first see, if our repaint contained the titlebar area */ TQRegion reg(TQRect(0, 0, width(), buttonSize + 4)); reg = reg.intersect(e->region()); if (!reg.isEmpty()) @@ -699,36 +699,36 @@ void B2Client::paintEvent(TQPaintEvent* e) void B2Client::doShape() { - TQRect t = titlebar->tqgeometry(); - TQRegion tqmask(widget()->rect()); + TQRect t = titlebar->geometry(); + TQRegion mask(widget()->rect()); // top to the tilebar right if (bar_x_ofs) { // left from bar - tqmask -= TQRect(0, 0, bar_x_ofs, t.height() - thickness); + mask -= TQRect(0, 0, bar_x_ofs, t.height() - thickness); // top left point - tqmask -= TQRect(0, t.height() - thickness, 1, 1); + mask -= TQRect(0, t.height() - thickness, 1, 1); } if (t.right() < width() - 1) { - tqmask -= TQRect(width() - 1, + mask -= TQRect(width() - 1, t.height() - thickness, 1, 1); //top right point - tqmask -= TQRect(t.right() + 1, 0, + mask -= TQRect(t.right() + 1, 0, width() - t.right() - 1, t.height() - thickness); } // bottom right point - tqmask -= TQRect(width() - 1, height() - 1, 1, 1); + mask -= TQRect(width() - 1, height() - 1, 1, 1); if (mustDrawHandle()) { // bottom left point - tqmask -= TQRect(0, height() - 5, 1, 1); + mask -= TQRect(0, height() - 5, 1, 1); // handle left point - tqmask -= TQRect(width() - 40, height() - 1, 1, 1); + mask -= TQRect(width() - 40, height() - 1, 1, 1); // bottom left - tqmask -= TQRect(0, height() - 4, width() - 40, 4); + mask -= TQRect(0, height() - 4, width() - 40, 4); } else { // bottom left point - tqmask -= TQRect(0, height() - 1, 1, 1); + mask -= TQRect(0, height() - 1, 1, 1); } - setMask(tqmask); + setMask(mask); } void B2Client::showEvent(TQShowEvent *) @@ -741,7 +741,7 @@ void B2Client::showEvent(TQShowEvent *) KDecoration::Position B2Client::mousePosition(const TQPoint& p) const { const int range = 16; - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); t.setHeight(buttonSize + 4 - thickness); int ly = t.bottom(); int lx = t.right(); @@ -794,8 +794,8 @@ void B2Client::titleMoveAbs(int new_ofs) bar_x_ofs = new_ofs; positionButtons(); doShape(); - widget()->tqrepaint(0, 0, width(), buttonSize + 4, false); - titlebar->tqrepaint(false); + widget()->repaint(0, 0, width(), buttonSize + 4, false); + titlebar->repaint(false); } } @@ -820,7 +820,7 @@ void B2Client::maximizeChange() bool m = maximizeMode() == MaximizeFull; if (button[BtnMax]) { button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX); - button[BtnMax]->tqrepaint(); + button[BtnMax]->repaint(); TQToolTip::remove(button[BtnMax]); TQToolTip::add(button[BtnMax], m ? i18n("Restore") : i18n("Maximize")); @@ -830,21 +830,21 @@ void B2Client::maximizeChange() g->activate(); doShape(); - widget()->tqrepaint(false); + widget()->repaint(false); } void B2Client::activeChange() { - widget()->tqrepaint(false); - titlebar->tqrepaint(false); + widget()->repaint(false); + titlebar->repaint(false); - TQColor c = options()->tqcolorGroup( + TQColor c = options()->colorGroup( KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) if (button[i]) { button[i]->setBg(c); - button[i]->tqrepaint(false); + button[i]->repaint(false); } } @@ -860,7 +860,7 @@ void B2Client::shadeChange() } } -TQSize B2Client::tqminimumSize() const +TQSize B2Client::minimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -918,7 +918,7 @@ void B2Client::unobscureTitlebar() { /* we just noticed, that we got obscured by other windows so we look at all windows above us (stacking_order) merging their - tqmasks, intersecting it with our titlebar area, and see if we can + masks, intersecting it with our titlebar area, and see if we can find a place not covered by any window */ if (in_unobs) { return; @@ -939,8 +939,8 @@ void B2Client::unobscureTitlebar() static void redraw_pixmaps() { int i; - TQColorGroup aGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); - TQColorGroup iGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + TQColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false); // close drawB2Rect(PIXMAP_A(P_CLOSE), aGrp.button(), false); @@ -1096,7 +1096,7 @@ void B2Client::positionButtons() cap = "XXXXX"; // area for dragging the window int textLen = fm.width(cap); - TQRect t = titlebar->captionSpacer->tqgeometry(); + TQRect t = titlebar->captionSpacer->geometry(); int titleWidth = titlebar->width() - t.width() + textLen + 2; if (titleWidth > width()) titleWidth = width(); @@ -1107,7 +1107,7 @@ void B2Client::positionButtons() // Transparent bound stuff. static TQRect *visible_bound; -static TQPointArray bound_tqshape; +static TQPointArray bound_shape; bool B2Client::drawbound(const TQRect& geom, bool clear) { @@ -1117,7 +1117,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) if (!visible_bound) { visible_bound = new TQRect(geom); - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); int frameTop = geom.top() + t.bottom(); int barLeft = geom.left() + bar_x_ofs; int barRight = barLeft + t.width() - 1; @@ -1132,7 +1132,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) barLeft += 2; barRight -= 2; - bound_tqshape.putPoints(0, 8, + bound_shape.putPoints(0, 8, g.left(), frameTop, barLeft, frameTop, barLeft, g.top(), @@ -1147,7 +1147,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) TQPainter p(workspaceWidget()); p.setPen(TQPen(Qt::white, 5)); p.setRasterOp(Qt::XorROP); - p.drawPolygon(bound_tqshape); + p.drawPolygon(bound_shape); if (clear) { delete visible_bound; @@ -1201,7 +1201,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent, } -TQSize B2Button::tqsizeHint() const +TQSize B2Button::sizeHint() const { return TQSize(buttonSize, buttonSize); } @@ -1252,7 +1252,7 @@ void B2Button::setPixmaps(int button_id) for (int i = 0; i < NumStates; i++) { icon[i] = B2::pixmap[button_id + i]; } - tqrepaint(false); + repaint(false); } void B2Button::mousePressEvent(TQMouseEvent * e) @@ -1276,14 +1276,14 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e) void B2Button::enterEvent(TQEvent *e) { hover = true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } void B2Button::leaveEvent(TQEvent *e) { hover = false; - tqrepaint(false); + repaint(false); TQButton::leaveEvent(e); } @@ -1292,7 +1292,7 @@ void B2Button::leaveEvent(TQEvent *e) B2Titlebar::B2Titlebar(B2Client *parent) : TQWidget(parent->widget(), 0, WStyle_Customize | WRepaintNoErase), client(parent), - set_x11tqmask(false), isfullyobscured(false), shift_move(false) + set_x11mask(false), isfullyobscured(false), shift_move(false) { setBackgroundMode(NoBackground); captionSpacer = new TQSpacerItem(buttonSize, buttonSize + 4, @@ -1301,8 +1301,8 @@ B2Titlebar::B2Titlebar(B2Client *parent) bool B2Titlebar::x11Event(XEvent *e) { - if (!set_x11tqmask) { - set_x11tqmask = true; + if (!set_x11mask) { + set_x11mask = true; XSelectInput(qt_xdisplay(), winId(), KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | @@ -1342,7 +1342,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state) // titlebar fill const TQColorGroup cg = - options()->tqcolorGroup(KDecoration::ColorTitleBar, state); + options()->colorGroup(KDecoration::ColorTitleBar, state); TQBrush brush(cg.background()); if (gradient) brush.setPixmap(*gradient); qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1, @@ -1351,7 +1351,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state) // and the caption p.setPen(options()->color(KDecoration::ColorFont, state)); p.setFont(options()->font(state)); - t = captionSpacer->tqgeometry(); + t = captionSpacer->geometry(); p.drawText(t, AlignLeft | AlignVCenter, client->caption()); } @@ -1367,7 +1367,7 @@ void B2Titlebar::recalcBuffer() void B2Titlebar::resizeEvent(TQResizeEvent *) { recalcBuffer(); - tqrepaint(false); + repaint(false); } @@ -1391,7 +1391,7 @@ void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e) void B2Titlebar::wheelEvent(TQWheelEvent *e) { - if (client->isSetShade() || rect().tqcontains(e->pos())) + if (client->isSetShade() || rect().contains(e->pos())) client->titlebarMouseWheelOperation( e->delta()); } diff --git a/kwin/clients/b2/b2client.h b/kwin/clients/b2/b2client.h index 4439bf1a1..198dfbb9b 100644 --- a/kwin/clients/b2/b2client.h +++ b/kwin/clients/b2/b2client.h @@ -38,7 +38,7 @@ public: void setToggle(){setToggleType(Toggle);} void setActive(bool on){setOn(on);} void setUseMiniIcon(){useMiniIcon = true;} - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSizePolicy sizePolicy() const; protected: virtual void drawButton(TQPainter *p); @@ -86,7 +86,7 @@ private: TQString oldTitle; KPixmap titleBuffer; TQPoint moveOffset; - bool set_x11tqmask; + bool set_x11mask; bool isfullyobscured; bool shift_move; }; @@ -119,7 +119,7 @@ protected: Position mousePosition( const TQPoint& p ) const; void resize(const TQSize&); void borders(int &, int &, int &, int &) const; - TQSize tqminimumSize() const; + TQSize minimumSize() const; bool eventFilter(TQObject *, TQEvent *); private slots: void menuButtonPressed(); diff --git a/kwin/clients/b2/bitmaps.h b/kwin/clients/b2/bitmaps.h index f521de292..2f610f4b2 100644 --- a/kwin/clients/b2/bitmaps.h +++ b/kwin/clients/b2/bitmaps.h @@ -28,7 +28,7 @@ static const unsigned char menu_dgray_bits[] = { 0x00, 0x00, 0x00, 0x20, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char menu_tqmask_bits[] = { +static const unsigned char menu_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x04, 0x20, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -48,7 +48,7 @@ static const unsigned char pindown_dgray_bits[] = { 0x48, 0x30, 0xc8, 0x38, 0x08, 0x1f, 0x08, 0x18, 0x10, 0x1c, 0x10, 0x0e, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char pindown_tqmask_bits[] = { +static const unsigned char pindown_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x1f, 0xf0, 0x3f, 0xf0, 0x3f, 0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -68,12 +68,12 @@ static const unsigned char pinup_dgray_bits[] = { 0x40, 0x20, 0x40, 0x20, 0x7f, 0x2a, 0x40, 0x3f, 0xc0, 0x31, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char pinup_tqmask_bits[] = { +static const unsigned char pinup_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xc0, 0x31, 0xc0, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xc0, 0x3f, 0xc0, 0x31, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char help_tqmask_bits[] = { +static const unsigned char help_mask_bits[] = { 0x00,0x00,0x00,0x00,0xe0,0x03,0xf0,0x07,0x70,0x0e,0x60,0x0e,0x00,0x0f,0x80, 0x07,0xc0,0x03,0xc0,0x01,0x80,0x01,0xc0,0x00,0xc0,0x01,0x80,0x01,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x4c,0x0b,0x08,0x58,0x65,0x09,0x08,0x90,0x00,0x00, diff --git a/kwin/clients/b2/config/config.cpp b/kwin/clients/b2/config/config.cpp index 3a42b9eba..ca1dccc65 100644 --- a/kwin/clients/b2/config/config.cpp +++ b/kwin/clients/b2/config/config.cpp @@ -1,5 +1,5 @@ /* - * This file tqcontains the B2 configuration widget + * This file contains the B2 configuration widget * * Copyright (c) 2001 * Karol Szwed <[email protected]> diff --git a/kwin/clients/b2/config/config.h b/kwin/clients/b2/config/config.h index cf8c95736..92c255ae6 100644 --- a/kwin/clients/b2/config/config.h +++ b/kwin/clients/b2/config/config.h @@ -1,5 +1,5 @@ /* - * This file tqcontains the B2 configuration widget + * This file contains the B2 configuration widget * * Copyright (c) 2001 * Karol Szwed <[email protected]> diff --git a/kwin/clients/default/kdedefault.cpp b/kwin/clients/default/kdedefault.cpp index 0feb00725..d91ccf56b 100644 --- a/kwin/clients/default/kdedefault.cpp +++ b/kwin/clients/default/kdedefault.cpp @@ -89,7 +89,7 @@ static const unsigned char pindown_dgray_bits[] = { 0x48, 0x30, 0xc8, 0x38, 0x08, 0x1f, 0x08, 0x18, 0x10, 0x1c, 0x10, 0x0e, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char pindown_tqmask_bits[] = { +static const unsigned char pindown_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x1f, 0xf0, 0x3f, 0xf0, 0x3f, 0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -109,7 +109,7 @@ static const unsigned char pinup_dgray_bits[] = { 0x40, 0x20, 0x40, 0x20, 0x7f, 0x2a, 0x40, 0x3f, 0xc0, 0x31, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char pinup_tqmask_bits[] = { +static const unsigned char pinup_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xc0, 0x31, 0xc0, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xc0, 0x3f, 0xc0, 0x31, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -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 tqrepaint + changed |= SettingColors; // just recreate the pixmaps and repaint } showGrabBar = new_showGrabBar; @@ -263,28 +263,28 @@ void KDEDefaultHandler::createPixmaps() if (showTitleBarStipple) { TQPainter p; - TQPainter tqmaskPainter; + TQPainter maskPainter; int i, x, y; titlePix = new TQPixmap(132, normalTitleHeight+2); - TQBitmap tqmask(132, normalTitleHeight+2); - tqmask.fill(Qt::color0); + TQBitmap mask(132, normalTitleHeight+2); + mask.fill(Qt::color0); p.begin(titlePix); - tqmaskPainter.begin(&tqmask); - tqmaskPainter.setPen(Qt::color1); + maskPainter.begin(&mask); + maskPainter.setPen(Qt::color1); for(i=0, y=2; i < 9; ++i, y+=4) for(x=1; x <= 132; x+=3) { p.setPen(options()->color(ColorTitleBar, true).light(150)); p.drawPoint(x, y); - tqmaskPainter.drawPoint(x, y); + maskPainter.drawPoint(x, y); p.setPen(options()->color(ColorTitleBar, true).dark(150)); p.drawPoint(x+1, y+1); - tqmaskPainter.drawPoint(x+1, y+1); + maskPainter.drawPoint(x+1, y+1); } - tqmaskPainter.end(); + maskPainter.end(); p.end(); - titlePix->setMask(tqmask); + titlePix->setMask(mask); } else titlePix = NULL; @@ -328,14 +328,14 @@ void KDEDefaultHandler::createPixmaps() TQPainter p; // Active pins - g = options()->tqcolorGroup( ColorButtonBg, true ); + g = options()->colorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); p.begin( pinUpPix ); kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits, pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); p.end(); - pinUpPix->setMask( TQBitmap(16, 16, pinup_tqmask_bits, true) ); + pinUpPix->setMask( TQBitmap(16, 16, pinup_mask_bits, true) ); pinDownPix = new KPixmap(); pinDownPix->resize(16, 16); @@ -343,17 +343,17 @@ void KDEDefaultHandler::createPixmaps() kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits, pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL ); p.end(); - pinDownPix->setMask( TQBitmap(16, 16, pindown_tqmask_bits, true) ); + pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) ); // Inactive pins - g = options()->tqcolorGroup( ColorButtonBg, false ); + g = options()->colorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); p.begin( ipinUpPix ); kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits, pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); p.end(); - ipinUpPix->setMask( TQBitmap(16, 16, pinup_tqmask_bits, true) ); + ipinUpPix->setMask( TQBitmap(16, 16, pinup_mask_bits, true) ); ipinDownPix = new KPixmap(); ipinDownPix->resize(16, 16); @@ -361,7 +361,7 @@ void KDEDefaultHandler::createPixmaps() kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits, pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL ); p.end(); - ipinDownPix->setMask( TQBitmap(16, 16, pindown_tqmask_bits, true) ); + ipinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) ); // Create a title buffer for flicker-free painting titleBuffer = new KPixmap(); @@ -404,25 +404,25 @@ void KDEDefaultHandler::createPixmaps() irightBtnDownPix[false]->resize(toolTitleHeight, toolTitleHeight); // Draw the button state pixmaps - g = options()->tqcolorGroup( ColorTitleBar, true ); + g = options()->colorGroup( ColorTitleBar, true ); drawButtonBackground( leftBtnUpPix[true], g, false ); drawButtonBackground( leftBtnDownPix[true], g, true ); drawButtonBackground( leftBtnUpPix[false], g, false ); drawButtonBackground( leftBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorButtonBg, true ); + g = options()->colorGroup( ColorButtonBg, true ); drawButtonBackground( rightBtnUpPix[true], g, false ); drawButtonBackground( rightBtnDownPix[true], g, true ); drawButtonBackground( rightBtnUpPix[false], g, false ); drawButtonBackground( rightBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorTitleBar, false ); + g = options()->colorGroup( ColorTitleBar, false ); drawButtonBackground( ileftBtnUpPix[true], g, false ); drawButtonBackground( ileftBtnDownPix[true], g, true ); drawButtonBackground( ileftBtnUpPix[false], g, false ); drawButtonBackground( ileftBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorButtonBg, false ); + g = options()->colorGroup( ColorButtonBg, false ); drawButtonBackground( irightBtnUpPix[true], g, false ); drawButtonBackground( irightBtnDownPix[true], g, true ); drawButtonBackground( irightBtnUpPix[false], g, false ); @@ -676,7 +676,7 @@ void KDEDefaultButton::drawButton(TQPainter *p) // otherwise we paint a menu button (with mini icon), or a sticky button. if( deco ) { // Select the appropriate button decoration color - bool darkDeco = tqGray( KDecoration::options()->color( + bool darkDeco = qGray( KDecoration::options()->color( isLeft() ? KDecoration::ColorTitleBar : KDecoration::ColorButtonBg, active).rgb() ) > 127; @@ -720,7 +720,7 @@ void KDEDefaultButton::drawButton(TQPainter *p) void KDEDefaultButton::enterEvent(TQEvent *e) { isMouseOver=true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } @@ -728,7 +728,7 @@ void KDEDefaultButton::enterEvent(TQEvent *e) void KDEDefaultButton::leaveEvent(TQEvent *e) { isMouseOver=false; - tqrepaint(false); + repaint(false); TQButton::leaveEvent(e); } @@ -771,7 +771,7 @@ bool KDEDefaultClient::decorationBehaviour(DecorationBehaviour behaviour) const } } -int KDEDefaultClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int KDEDefaultClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { switch (lm) { case LM_BorderLeft: @@ -810,7 +810,7 @@ int KDEDefaultClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, c return borderWidth/2; // fall though default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -856,7 +856,7 @@ void KDEDefaultClient::init() void KDEDefaultClient::reset( unsigned long changed) { - widget()->tqrepaint(); + widget()->repaint(); 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()->tqcolorGroup(ColorTitleBar, isActive()); + g = options()->colorGroup(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()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(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/kwin/clients/default/kdedefault.h b/kwin/clients/default/kdedefault.h index 6dfaf6ac8..70b8847fa 100644 --- a/kwin/clients/default/kdedefault.h +++ b/kwin/clients/default/kdedefault.h @@ -80,7 +80,7 @@ class KDEDefaultClient : public KCommonDecoration virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); virtual TQRegion cornerShape(WindowCorner corner); diff --git a/kwin/clients/keramik/config/keramikconfig.ui b/kwin/clients/keramik/config/keramikconfig.ui index 6f7d84e90..f074a00b8 100644 --- a/kwin/clients/keramik/config/keramikconfig.ui +++ b/kwin/clients/keramik/config/keramikconfig.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KeramikConfigUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -71,6 +71,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kwin/clients/keramik/embedtool.cpp b/kwin/clients/keramik/embedtool.cpp index fe34ffcb4..4f5135a3f 100644 --- a/kwin/clients/keramik/embedtool.cpp +++ b/kwin/clients/keramik/embedtool.cpp @@ -60,7 +60,7 @@ private: KeramikEmbedder::KeramikEmbedder() { - TQDateTime date( TQDateTime::tqcurrentDateTime() ); + TQDateTime date( TQDateTime::currentDateTime() ); TQString datestring( date.toString() ); file = new TQFile( "tiles.h" ); @@ -100,19 +100,19 @@ void KeramikEmbedder::embed( const char *name ) TQString codename( basename ); TQImage image( name ); - codename = codename.tqreplace( TQRegExp("[^a-zA-Z0-9]"), "_" ); + codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" ); stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t"; stream.setf( TQTextStream::hex | TQTextStream::right ); stream.fill( '0' ); int pixels = image.width() * image.height(); - TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( image.bits() ); + Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( image.bits() ); bool hasAlpha = false; for ( int i = 0, j = 0; i < pixels; i++ ) { - if ( tqAlpha( *data ) && tqAlpha( *data ) != 0xff ) + if ( qAlpha( *data ) && qAlpha( *data ) != 0xff ) hasAlpha = true; stream << "0x" << qSetW(8) << *(data++); diff --git a/kwin/clients/keramik/keramik.cpp b/kwin/clients/keramik/keramik.cpp index 64592a3cd..48a187098 100644 --- a/kwin/clients/keramik/keramik.cpp +++ b/kwin/clients/keramik/keramik.cpp @@ -62,7 +62,7 @@ namespace Keramik const int buttonSpacing = 4; // Spacing between the titlebar buttons const int iconSpacing = 5; // Spacing between the icon and the text label - // Default button tqlayout + // Default button layout const char default_left[] = "M"; const char default_right[] = "HIAX"; @@ -201,7 +201,7 @@ KeramikHandler::KeramikHandler() buttonDecos[ ShadeOn ] = new TQBitmap( 17, 17, shade_on_bits, true ); buttonDecos[ ShadeOff ] = new TQBitmap( 17, 17, shade_off_bits, true ); - // Selftqmask the bitmaps + // Selfmask the bitmaps for ( int i = 0; i < NumButtonDecos; i++ ) buttonDecos[i]->setMask( *buttonDecos[i] ); @@ -585,39 +585,39 @@ TQPixmap *KeramikHandler::composite( TQImage *over, TQImage *under ) int width = over->width(), height = over->height(); // Clear the destination image - TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( dest.bits() ); + Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( dest.bits() ); for (int i = 0; i < width * height; i++) *(data++) = 0; // Copy the under image (bottom aligned) to the destination image for (int y1 = height - under->height(), y2 = 0; y1 < height; y1++, y2++ ) { - register TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( dest.scanLine(y1) ); - register TQ_UINT32 *src = reinterpret_cast<TQ_UINT32*>( under->scanLine(y2) ); + register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.scanLine(y1) ); + register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( under->scanLine(y2) ); for ( int x = 0; x < width; x++ ) *(dst++) = *(src++); } // Blend the over image onto the destination - register TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( dest.bits() ); - register TQ_UINT32 *src = reinterpret_cast<TQ_UINT32*>( over->bits() ); + register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.bits() ); + register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( over->bits() ); for ( int i = 0; i < width * height; i++ ) { - int r1 = tqRed( *dst ), g1 = tqGreen( *dst ), b1 = tqBlue( *dst ); - int r2 = tqRed( *src ), g2 = tqGreen( *src ), b2 = tqBlue( *src ); - int a = tqAlpha( *src ); + int r1 = qRed( *dst ), g1 = qGreen( *dst ), b1 = qBlue( *dst ); + int r2 = qRed( *src ), g2 = qGreen( *src ), b2 = qBlue( *src ); + int a = qAlpha( *src ); if ( a == 0xff ) *dst = *src; else if ( a != 0x00 ) - *dst = tqRgba( TQ_UINT8( r1 + (((r2 - r1) * a) >> 8) ), - TQ_UINT8( g1 + (((g2 - g1) * a) >> 8) ), - TQ_UINT8( b1 + (((b2 - b1) * a) >> 8) ), + *dst = qRgba( Q_UINT8( r1 + (((r2 - r1) * a) >> 8) ), + Q_UINT8( g1 + (((g2 - g1) * a) >> 8) ), + Q_UINT8( b1 + (((b2 - b1) * a) >> 8) ), 0xff ); - else if ( tqAlpha(*dst) == 0x00 ) + else if ( qAlpha(*dst) == 0x00 ) *dst = 0; src++; dst++; @@ -783,7 +783,7 @@ void KeramikButton::enterEvent( TQEvent *e ) TQButton::enterEvent( e ); hover = true; - tqrepaint( false ); + repaint( false ); } @@ -792,7 +792,7 @@ void KeramikButton::leaveEvent( TQEvent *e ) TQButton::leaveEvent( e ); hover = false; - tqrepaint( false ); + repaint( false ); } @@ -831,14 +831,14 @@ void KeramikButton::drawButton( TQPainter *p ) if ( isDown() ) { // Pressed - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( 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::tqvisualRect( TQRect(size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(size, 0, size, size), pix->rect() ) ); else // Normal - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(0, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(0, 0, size, size), pix->rect() ) ); // Draw the button deco on the bevel @@ -900,7 +900,7 @@ void KeramikButton::drawButton( TQPainter *p ) KeramikClient::KeramikClient( KDecorationBridge* bridge, KDecorationFactory* factory ) : KDecoration( bridge, factory ), - activeIcon( NULL ), inactiveIcon( NULL ), captionBufferDirty( true ), tqmaskDirty( true ) + activeIcon( NULL ), inactiveIcon( NULL ), captionBufferDirty( true ), maskDirty( true ) { } @@ -987,7 +987,7 @@ void KeramikClient::reset( unsigned long ) largeTitlebar = true; largeCaption = isActive(); - widget()->tqlayout()->activate(); + widget()->layout()->activate(); // Compensate for the titlebar size change @@ -1002,7 +1002,7 @@ void KeramikClient::reset( unsigned long ) topSpacer->changeSize( 10, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); largeTitlebar = largeCaption = false; - widget()->tqlayout()->activate(); + widget()->layout()->activate(); // Compensate for the titlebar size change // FRAME @@ -1011,20 +1011,20 @@ void KeramikClient::reset( unsigned long ) calculateCaptionRect(); - captionBufferDirty = tqmaskDirty = true; + captionBufferDirty = maskDirty = true; - // Only tqrepaint the window if it's visible + // Only repaint the window if it's visible // (i.e. not minimized and on the current desktop) if ( widget()->isVisible() ) { - widget()->tqrepaint( false ); + widget()->repaint( false ); for ( int i = 0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->tqrepaint( false ); + if ( button[i] ) button[i]->repaint( false ); } } -void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) +void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) { for ( uint i=0; i < s.length(); i++ ) { @@ -1035,7 +1035,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[MenuButton] ) { button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), LeftButton|RightButton ); connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) ); - tqlayout->addWidget( button[MenuButton] ); + layout->addWidget( button[MenuButton] ); } break; @@ -1047,7 +1047,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if(isOnAllDesktops()) button[OnAllDesktopsButton]->toggle(); connect( button[OnAllDesktopsButton], TQT_SIGNAL( clicked() ), TQT_SLOT( toggleOnAllDesktops() ) ); - tqlayout->addWidget( button[OnAllDesktopsButton] ); + layout->addWidget( button[OnAllDesktopsButton] ); } break; @@ -1056,7 +1056,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[HelpButton] && providesContextHelp() ) { button[HelpButton] = new KeramikButton( this, "help", HelpButton, i18n("Help") ); connect( button[HelpButton], TQT_SIGNAL( clicked() ), TQT_SLOT( showContextHelp() ) ); - tqlayout->addWidget( button[HelpButton] ); + layout->addWidget( button[HelpButton] ); } break; @@ -1065,7 +1065,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[MinButton] && isMinimizable() ) { button[MinButton] = new KeramikButton( this, "minimize", MinButton, i18n("Minimize") ); connect( button[MinButton], TQT_SIGNAL( clicked() ), TQT_SLOT( minimize() ) ); - tqlayout->addWidget( button[MinButton] ); + layout->addWidget( button[MinButton] ); } break; @@ -1074,7 +1074,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[MaxButton] && isMaximizable() ) { button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), LeftButton|MidButton|RightButton ); connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) ); - tqlayout->addWidget( button[MaxButton] ); + layout->addWidget( button[MaxButton] ); } break; @@ -1083,7 +1083,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[CloseButton] && isCloseable() ) { button[CloseButton] = new KeramikButton( this, "close", CloseButton, i18n("Close") ); connect( button[CloseButton], TQT_SIGNAL( clicked() ), TQT_SLOT( closeWindow() ) ); - tqlayout->addWidget( button[CloseButton] ); + layout->addWidget( button[CloseButton] ); } break; @@ -1092,7 +1092,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[AboveButton]) { button[AboveButton] = new KeramikButton( this, "above", AboveButton, i18n("Keep Above Others") ); connect( button[AboveButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotAbove() ) ); - tqlayout->addWidget( button[AboveButton] ); + layout->addWidget( button[AboveButton] ); } break; @@ -1101,7 +1101,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[BelowButton]) { button[BelowButton] = new KeramikButton( this, "below", BelowButton, i18n("Keep Below Others") ); connect( button[BelowButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotBelow() ) ); - tqlayout->addWidget( button[BelowButton] ); + layout->addWidget( button[BelowButton] ); } break; @@ -1111,13 +1111,13 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) button[ShadeButton] = new KeramikButton( this, "shade", ShadeButton, isSetShade() ? i18n("Unshade") : i18n( "Shade" )); connect( button[ShadeButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotShade() ) ); - tqlayout->addWidget( button[ShadeButton] ); + layout->addWidget( button[ShadeButton] ); } break; // Additional spacing case '_' : - tqlayout->addSpacing( buttonSpacing ); + layout->addSpacing( buttonSpacing ); break; } } @@ -1130,8 +1130,8 @@ void KeramikClient::updateMask() return; // To maximize performance this code uses precalculated bounding rects - // to set the window tqmask. This saves us from having to allocate a 1bpp - // pixmap, paint the tqmask on it and then have the X server iterate + // to set the window mask. This saves us from having to allocate a 1bpp + // pixmap, paint the mask on it and then have the X server iterate // over the pixels to compute the bounding rects from it. TQRegion r; @@ -1206,7 +1206,7 @@ void KeramikClient::updateMask() setMask( r, YXBanded ); - tqmaskDirty = false; + maskDirty = false; } @@ -1260,7 +1260,7 @@ void KeramikClient::updateCaptionBuffer() ( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 ); int xpos = QMAX( (captionRect.width() - tw) / 3, 8 ); - TQRect tr = TQStyle::tqvisualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, + TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, captionRect.height() - 4), captionBuffer.rect() ); //p.setPen( Qt::red ); // debug @@ -1269,7 +1269,7 @@ void KeramikClient::updateCaptionBuffer() // Application icon if ( clientHandler->showAppIcons() ) { - TQRect iconRect = TQStyle::tqvisualRect( TQRect(tr.x(), + TQRect iconRect = TQStyle::visualRect( TQRect(tr.x(), 1 + (captionRect.height() - 4 - 16) / 2, 16, 16), tr ); TQRect r( icon->rect() ); r.moveCenter( iconRect.center() ); @@ -1304,7 +1304,7 @@ void KeramikClient::updateCaptionBuffer() { p.translate( TQApplication::reverseLayout() ? -1 : 1, 1 ); //p.setPen( options()->color(ColorTitleBar, active).dark() ); - if (tqGray(options()->color(ColorFont, active).rgb()) < 100) + if (qGray(options()->color(ColorFont, active).rgb()) < 100) p.setPen( TQColor(200,200,200) ); else p.setPen( black ); @@ -1328,10 +1328,10 @@ void KeramikClient::calculateCaptionRect() if ( clientHandler->showAppIcons() ) cw += 16 + 4; // icon width + space - cw = QMIN( cw, titlebar->tqgeometry().width() ); - captionRect = TQStyle::tqvisualRect( TQRect(titlebar->tqgeometry().x(), (largeCaption ? 0 : titleBaseY), + cw = QMIN( cw, titlebar->geometry().width() ); + captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), cw, clientHandler->titleBarHeight(largeCaption) ), - titlebar->tqgeometry() ); + titlebar->geometry() ); } @@ -1341,11 +1341,11 @@ void KeramikClient::captionChange() calculateCaptionRect(); if ( r.size() != captionRect.size() ) - tqmaskDirty = true; + maskDirty = true; captionBufferDirty = true; - widget()->tqrepaint( r | captionRect, false ); + widget()->repaint( r | captionRect, false ); } @@ -1361,7 +1361,7 @@ void KeramikClient::iconChange() activeIcon = inactiveIcon = NULL; captionBufferDirty = true; - widget()->tqrepaint( captionRect, false ); + widget()->repaint( captionRect, false ); } } @@ -1375,15 +1375,15 @@ void KeramikClient::activeChange() if ( largeTitlebar ) { largeCaption = ( active && !maximizedVertical() ); calculateCaptionRect(); - tqmaskDirty = true; + maskDirty = true; } captionBufferDirty = true; - widget()->tqrepaint( false ); + widget()->repaint( false ); for ( int i=0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->tqrepaint( false ); + if ( button[i] ) button[i]->repaint( false ); } @@ -1397,27 +1397,27 @@ void KeramikClient::maximizeChange() largeCaption = largeTitlebar = false; calculateCaptionRect(); - captionBufferDirty = tqmaskDirty = true; + captionBufferDirty = maskDirty = true; - widget()->tqlayout()->activate(); - widget()->tqrepaint( false ); + widget()->layout()->activate(); + widget()->repaint( 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 ); largeCaption = largeTitlebar = true; calculateCaptionRect(); - captionBufferDirty = tqmaskDirty = true; + captionBufferDirty = maskDirty = true; - widget()->tqlayout()->activate(); - widget()->tqrepaint( false ); + widget()->layout()->activate(); + widget()->repaint( false ); } } if ( button[ MaxButton ] ) { TQToolTip::remove( button[ MaxButton ] ); TQToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") ); - button[ MaxButton ]->tqrepaint(); + button[ MaxButton ]->repaint(); } } @@ -1426,7 +1426,7 @@ void KeramikClient::desktopChange() { if ( button[ OnAllDesktopsButton ] ) { - button[ OnAllDesktopsButton ]->tqrepaint( true ); + button[ OnAllDesktopsButton ]->repaint( true ); TQToolTip::remove( button[ OnAllDesktopsButton ] ); TQToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") ); } @@ -1437,7 +1437,7 @@ void KeramikClient::shadeChange() { if ( button[ ShadeButton ] ) { - button[ ShadeButton ]->tqrepaint( true ); + button[ ShadeButton ]->repaint( true ); TQToolTip::remove( button[ ShadeButton ] ); TQToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") ); } @@ -1447,14 +1447,14 @@ void KeramikClient::shadeChange() void KeramikClient::keepAboveChange( bool ) { if ( button[ AboveButton ] ) - button[ AboveButton ]->tqrepaint( true ); + button[ AboveButton ]->repaint( true ); } void KeramikClient::keepBelowChange( bool ) { if ( button[ BelowButton ] ) - button[ BelowButton ]->tqrepaint( true ); + button[ BelowButton ]->repaint( true ); } @@ -1482,21 +1482,21 @@ void KeramikClient::slotMaximize() void KeramikClient::slotAbove() { setKeepAbove( !keepAbove()); - button[ AboveButton ]->tqrepaint( true ); + button[ AboveButton ]->repaint( true ); } void KeramikClient::slotBelow() { setKeepBelow( !keepBelow()); - button[ BelowButton ]->tqrepaint( true ); + button[ BelowButton ]->repaint( true ); } void KeramikClient::slotShade() { setShade( !isSetShade()); - button[ ShadeButton ]->tqrepaint( true ); + button[ ShadeButton ]->repaint( true ); } @@ -1515,7 +1515,7 @@ void KeramikClient::paintEvent( TQPaintEvent *e ) int leftBorderWidth = clientHandler->tile( BorderLeft, active )->width(); int rightBorderWidth = clientHandler->tile( BorderRight, active )->width(); - if ( tqmaskDirty ) + if ( maskDirty ) updateMask(); // Titlebar @@ -1624,7 +1624,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) if ( r.size() != captionRect.size() ) captionBufferDirty = true; - tqmaskDirty = true; + maskDirty = true; if ( widget()->isVisible() ) { @@ -1644,11 +1644,11 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) if ( dx ) { widget()->update( width() - dx + 1, 0, dx, height() ); - widget()->update( TQRect( TQPoint(4,4), titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) ); - widget()->update( TQRect( titlebar->tqgeometry().topRight(), TQPoint( width() - 4, - titlebar->tqgeometry().bottom() ) ) ); + widget()->update( TQRect( TQPoint(4,4), titlebar->geometry().bottomLeft() - TQPoint(1,0) ) ); + widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4, + titlebar->geometry().bottom() ) ) ); // Titlebar needs no paint event - TQApplication::postEvent( this, new TQPaintEvent( titlebar->tqgeometry(), FALSE ) ); + TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), FALSE ) ); } } } @@ -1657,14 +1657,14 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e ) { if ( e->button() == LeftButton - && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) ) + && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) titlebarDblClickOperation(); } void KeramikClient::wheelEvent( TQWheelEvent *e ) { if (isSetShade() - || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) ) + || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } @@ -1774,9 +1774,9 @@ void KeramikClient::borders( int& left, int& right, int& top, int& bottom ) cons } -TQSize KeramikClient::tqminimumSize() const +TQSize KeramikClient::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } diff --git a/kwin/clients/keramik/keramik.h b/kwin/clients/keramik/keramik.h index 0ff31dbda..c90d3509f 100644 --- a/kwin/clients/keramik/keramik.h +++ b/kwin/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 tqminimumSize() const; + virtual TQSize minimumSize() const; virtual bool eventFilter( TQObject* o, TQEvent* e ); virtual void activeChange(); virtual void captionChange(); @@ -190,7 +190,7 @@ namespace Keramik { TQRect captionRect; TQPixmap captionBuffer; TQPixmap *activeIcon, *inactiveIcon; - bool captionBufferDirty:1, tqmaskDirty:1; + bool captionBufferDirty:1, maskDirty:1; bool largeCaption:1, largeTitlebar:1; }; // class KeramikClient diff --git a/kwin/clients/kwmtheme/cli_installer/main.cpp b/kwin/clients/kwmtheme/cli_installer/main.cpp index 56de8c9fe..abf2bad3d 100644 --- a/kwin/clients/kwmtheme/cli_installer/main.cpp +++ b/kwin/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("tqshapePixmapTop"); + tmpStr = input.readEntry("shapePixmapTop"); if(!tmpStr.isEmpty()){ copy(srcStr+tmpStr, localDirStr+tmpStr); } output->writeEntry("wm_top", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottom"); + tmpStr = input.readEntry("shapePixmapBottom"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottom", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapLeft"); + tmpStr = input.readEntry("shapePixmapLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_left", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapRight"); + tmpStr = input.readEntry("shapePixmapRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_right", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapTopLeft"); + tmpStr = input.readEntry("shapePixmapTopLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topleft", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapTopRight"); + tmpStr = input.readEntry("shapePixmapTopRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topright", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottomLeft"); + tmpStr = input.readEntry("shapePixmapBottomLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomleft", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottomRight"); + tmpStr = input.readEntry("shapePixmapBottomRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomright", tmpStr, true, true); diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp index 23f8b73e2..89dc6a564 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.cpp +++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp @@ -46,9 +46,9 @@ namespace KWMTheme { p.drawTiledPixmap(0, 0, w2, h2, src); p.end(); - srcMask = (TQBitmap*)src.tqmask(); + srcMask = (TQBitmap*)src.mask(); if (srcMask){ - destMask = (TQBitmap*)dest.tqmask(); + destMask = (TQBitmap*)dest.mask(); p.begin(destMask); p.drawTiledPixmap(0, 0, w2, h2, *srcMask); p.end(); @@ -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, tqcolorGroup(), + AlignCenter, colorGroup(), true, pixmap(), TQString::null); } } @@ -247,28 +247,28 @@ void KWMThemeClient::init() widget()->installEventFilter( this ); stickyBtn = maxBtn = mnuBtn = 0; - tqlayout = new TQGridLayout(widget()); - tqlayout->addColSpacing(0, maxExtent); - tqlayout->addColSpacing(2, maxExtent); + layout = new TQGridLayout(widget()); + layout->addColSpacing(0, maxExtent); + layout->addColSpacing(2, maxExtent); - tqlayout->addRowSpacing(0, maxExtent); + layout->addRowSpacing(0, maxExtent); - tqlayout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, + layout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); if( isPreview()) - tqlayout->addWidget( new TQLabel( i18n( "<center><b>KWMTheme</b></center>" ), widget()), 2, 1); + layout->addWidget( new TQLabel( i18n( "<center><b>KWMTheme</b></center>" ), widget()), 2, 1); else - tqlayout->addItem( new TQSpacerItem( 0, 0 ), 2, 1); + layout->addItem( new TQSpacerItem( 0, 0 ), 2, 1); // Without the next line, shading flickers - tqlayout->addItem( new TQSpacerItem(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Expanding) ); - tqlayout->addRowSpacing(3, maxExtent); - tqlayout->setRowStretch(2, 10); - tqlayout->setColStretch(1, 10); + layout->addItem( new TQSpacerItem(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Expanding) ); + layout->addRowSpacing(3, maxExtent); + layout->setRowStretch(2, 10); + layout->setColStretch(1, 10); TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); - tqlayout->addLayout( hb, 1, 1 ); + layout->addLayout( hb, 1, 1 ); KConfig *config = KGlobal::config(); config->setGroup("Buttons"); @@ -352,7 +352,7 @@ void KWMThemeClient::init() void KWMThemeClient::drawTitle(TQPainter &dest) { - TQRect titleRect = titlebar->tqgeometry(); + TQRect titleRect = titlebar->geometry(); TQRect r(0, 0, titleRect.width(), titleRect.height()); TQPixmap buffer; @@ -364,7 +364,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest) p.begin(&buffer); if(titleSunken){ - qDrawShadeRect(&p, r, options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), + qDrawShadeRect(&p, r, options()->colorGroup(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()->tqcolorGroup(KDecorationOptions::ColorTitleBar, isActive()). + p.fillRect(r, options()->colorGroup(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()->tqrepaint(); + widget()->repaint(); } void KWMThemeClient::captionChange() { - widget()->tqrepaint( titlebar->tqgeometry(), false ); + widget()->repaint( titlebar->geometry(), false ); } void KWMThemeClient::paintEvent( TQPaintEvent *) @@ -557,7 +557,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) } drawTitle(p); - TQColor c = widget()->tqcolorGroup().background(); + TQColor c = widget()->colorGroup().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 @@ -568,7 +568,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) // We fill the area behind the wrapped widget to ensure that // shading animation is drawn as smoothly as possible - TQRect r(tqlayout->cellGeometry(2, 1)); + TQRect r(layout->cellGeometry(2, 1)); p.fillRect( r.x(), r.y(), r.width(), r.height(), c); p.end(); } @@ -576,10 +576,10 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) void KWMThemeClient::doShape() { - TQBitmap tqshapetqmask(width(), height()); - tqshapetqmask.fill(color0); + TQBitmap shapemask(width(), height()); + shapemask.fill(color0); TQPainter p; - p.begin(&tqshapetqmask); + p.begin(&shapemask); p.setBrush(color1); p.setPen(color1); int x,y; @@ -588,8 +588,8 @@ void KWMThemeClient::doShape() int h1 = framePixmaps[FrameTopLeft]->height(); if (w1 > width()/2) w1 = width()/2; if (h1 > height()/2) h1 = height()/2; - if (framePixmaps[FrameTopLeft]->tqmask()) - p.drawPixmap(0,0,*framePixmaps[FrameTopLeft]->tqmask(), + if (framePixmaps[FrameTopLeft]->mask()) + p.drawPixmap(0,0,*framePixmaps[FrameTopLeft]->mask(), 0,0,w1, h1); else p.fillRect(0,0,w1,h1,color1); @@ -597,8 +597,8 @@ void KWMThemeClient::doShape() int h2 = framePixmaps[FrameTopRight]->height(); if (w2 > width()/2) w2 = width()/2; if (h2 > height()/2) h2 = height()/2; - if (framePixmaps[FrameTopRight]->tqmask()) - p.drawPixmap(width()-w2,0,*framePixmaps[FrameTopRight]->tqmask(), + if (framePixmaps[FrameTopRight]->mask()) + p.drawPixmap(width()-w2,0,*framePixmaps[FrameTopRight]->mask(), framePixmaps[FrameTopRight]->width()-w2,0,w2, h2); else p.fillRect(width()-w2,0,w2, h2,color1); @@ -607,8 +607,8 @@ void KWMThemeClient::doShape() int h3 = framePixmaps[FrameBottomLeft]->height(); if (w3 > width()/2) w3 = width()/2; if (h3 > height()/2) h3 = height()/2; - if (framePixmaps[FrameBottomLeft]->tqmask()) - p.drawPixmap(0,height()-h3,*framePixmaps[FrameBottomLeft]->tqmask(), + if (framePixmaps[FrameBottomLeft]->mask()) + p.drawPixmap(0,height()-h3,*framePixmaps[FrameBottomLeft]->mask(), 0,framePixmaps[FrameBottomLeft]->height()-h3,w3, h3); else p.fillRect(0,height()-h3,w3,h3,color1); @@ -617,8 +617,8 @@ void KWMThemeClient::doShape() int h4 = framePixmaps[FrameBottomRight]->height(); if (w4 > width()/2) w4 = width()/2; if (h4 > height()/2) h4 = height()/2; - if (framePixmaps[FrameBottomRight]->tqmask()) - p.drawPixmap(width()-w4,height()-h4,*framePixmaps[FrameBottomRight]->tqmask(), + if (framePixmaps[FrameBottomRight]->mask()) + p.drawPixmap(width()-w4,height()-h4,*framePixmaps[FrameBottomRight]->mask(), framePixmaps[FrameBottomRight]->width()-w4, framePixmaps[FrameBottomRight]->height()-h4, w4, h4); @@ -629,9 +629,9 @@ void KWMThemeClient::doShape() TQWMatrix m; int n,s,w; //top - if (framePixmaps[FrameTop]->tqmask()) + if (framePixmaps[FrameTop]->mask()) { - pm = *framePixmaps[FrameTop]->tqmask(); + pm = *framePixmaps[FrameTop]->mask(); s = width()-w2-w1; n = s/pm.width(); @@ -657,9 +657,9 @@ void KWMThemeClient::doShape() } //bottom - if (framePixmaps[FrameBottom]->tqmask()) + if (framePixmaps[FrameBottom]->mask()) { - pm = *framePixmaps[FrameBottom]->tqmask(); + pm = *framePixmaps[FrameBottom]->mask(); s = width()-w4-w3; n = s/pm.width(); @@ -683,9 +683,9 @@ void KWMThemeClient::doShape() } //left - if (framePixmaps[FrameLeft]->tqmask()) + if (framePixmaps[FrameLeft]->mask()) { - pm = *framePixmaps[FrameLeft]->tqmask(); + pm = *framePixmaps[FrameLeft]->mask(); s = height()-h3-h1; n = s/pm.height(); @@ -712,9 +712,9 @@ void KWMThemeClient::doShape() } //right - if (framePixmaps[FrameRight]->tqmask()) + if (framePixmaps[FrameRight]->mask()) { - pm = *framePixmaps[FrameRight]->tqmask(); + pm = *framePixmaps[FrameRight]->mask(); s = height()-h4-h2; n = s/pm.height(); @@ -740,19 +740,19 @@ void KWMThemeClient::doShape() } } p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1); - setMask(tqshapetqmask); + setMask(shapemask); } void KWMThemeClient::showEvent(TQShowEvent *) { doShape(); - widget()->tqrepaint(false); + widget()->repaint(false); } void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if (e->button() == LeftButton && titlebar->tqgeometry().tqcontains( e->pos() ) ) + if (e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } @@ -868,9 +868,9 @@ bool KWMThemeClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize KWMThemeClient::tqminimumSize() const +TQSize KWMThemeClient::minimumSize() const { - return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); } void KWMThemeClient::resize( const TQSize& s ) @@ -903,23 +903,23 @@ KDecoration* KWMThemeFactory::createDecoration( KDecorationBridge* b ) return new KWMThemeClient( b, this ); } -bool KWMThemeFactory::reset( unsigned long tqmask ) +bool KWMThemeFactory::reset( unsigned long mask ) { bool needHardReset = false; TODO // doesn't obey the Border size setting - if( tqmask & ( SettingFont | SettingButtons )) + if( mask & ( SettingFont | SettingButtons )) needHardReset = true; - if( tqmask & ( SettingFont | SettingColors )) { + if( mask & ( SettingFont | SettingColors )) { KWMTheme::delete_pixmaps(); KWMTheme::create_pixmaps(); } if( !needHardReset ) - resetDecorations( tqmask ); + resetDecorations( mask ); return needHardReset; } diff --git a/kwin/clients/kwmtheme/kwmthemeclient.h b/kwin/clients/kwmtheme/kwmthemeclient.h index 704162b6b..13914b2f6 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.h +++ b/kwin/clients/kwmtheme/kwmthemeclient.h @@ -30,7 +30,7 @@ public: ~KWMThemeClient(){;} void init(); void resize( const TQSize& s ); - TQSize tqminimumSize() const; + TQSize minimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; protected: void doShape(); @@ -56,7 +56,7 @@ private: KPixmap *aGradient, *iGradient; MyButton *maxBtn, *stickyBtn, *mnuBtn; TQSpacerItem *titlebar; - TQGridLayout* tqlayout; + TQGridLayout* layout; }; class KWMThemeFactory : public KDecorationFactory @@ -65,7 +65,7 @@ public: KWMThemeFactory(); ~KWMThemeFactory(); KDecoration* createDecoration( KDecorationBridge* b ); - bool reset( unsigned long tqmask ); + bool reset( unsigned long mask ); }; } diff --git a/kwin/clients/laptop/laptopclient.cpp b/kwin/clients/laptop/laptopclient.cpp index 46786c1cf..db91cf15d 100644 --- a/kwin/clients/laptop/laptopclient.cpp +++ b/kwin/clients/laptop/laptopclient.cpp @@ -117,28 +117,28 @@ static void create_pixmaps() // titlebar TQPainter p; - TQPainter tqmaskPainter; + TQPainter maskPainter; int i, x, y; titlePix = new TQPixmap(33, 12); - TQBitmap tqmask(33, 12); - tqmask.fill(Qt::color0); + TQBitmap mask(33, 12); + mask.fill(Qt::color0); p.begin(titlePix); - tqmaskPainter.begin(&tqmask); - tqmaskPainter.setPen(Qt::color1); + maskPainter.begin(&mask); + maskPainter.setPen(Qt::color1); for(i=0, y=2; i < 3; ++i, y+=4){ for(x=1; x <= 33; x+=3){ p.setPen(options()->color(KDecoration::ColorTitleBar, true).light(150)); p.drawPoint(x, y); - tqmaskPainter.drawPoint(x, y); + maskPainter.drawPoint(x, y); p.setPen(options()->color(KDecoration::ColorTitleBar, true).dark(150)); p.drawPoint(x+1, y+1); - tqmaskPainter.drawPoint(x+1, y+1); + maskPainter.drawPoint(x+1, y+1); } } p.end(); - tqmaskPainter.end(); - titlePix->setMask(tqmask); + maskPainter.end(); + titlePix->setMask(mask); if(TQPixmap::defaultDepth() > 8){ aUpperGradient = new KPixmap; @@ -157,7 +157,7 @@ static void create_pixmaps() KPixmapEffect::VerticalGradient); } // buttons (active/inactive, sunken/unsunken, 2 sizes each) - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130), KPixmapEffect::DiagonalGradient); @@ -200,27 +200,27 @@ static void create_pixmaps() btnDownPix1->fill(c.rgb()); btnPix2->fill(c.rgb()); btnDownPix2->fill(c.rgb()); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); iBtnPix2->fill(c.rgb()); iBtnDownPix2->fill(c.rgb()); } - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + g = options()->colorGroup(KDecoration::ColorButtonBg, true); c = g.background(); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(btnPix2, g, false); drawButtonFrame(btnDownPix2, g, true); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iBtnPix2, g, false); drawButtonFrame(iBtnDownPix2, g, true); - if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) + if(qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) btnForeground = Qt::black; else btnForeground = Qt::white; @@ -293,7 +293,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap) deco.fill(Qt::color0); } deco.setMask(deco); - tqrepaint(); + repaint(); } void LaptopButton::drawButton(TQPainter *p) @@ -314,7 +314,7 @@ void LaptopButton::drawButton(TQPainter *p) } } else{ - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); int w = width(); int h = height(); p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button()); @@ -380,7 +380,7 @@ bool LaptopClient::decorationBehaviour(DecorationBehaviour behaviour) const } } -int LaptopClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int LaptopClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { switch (lm) { case LM_TitleEdgeLeft: @@ -425,7 +425,7 @@ int LaptopClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const return 0; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -469,7 +469,7 @@ void LaptopClient::captionChange() void LaptopClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); TQRect r(widget()->rect()); p.setPen(Qt::black); @@ -478,10 +478,10 @@ void LaptopClient::paintEvent( TQPaintEvent* ) // fill mid frame... p.setPen(g.background() ); p.drawLine(r.x()+2, r.y()+2, r.right()-2, r.y()+2); - p.drawLine(r.left()+2, r.y()+3, r.left()+2, r.bottom()-tqlayoutMetric(LM_BorderBottom)+1 ); - p.drawLine(r.right()-2, r.y()+3, r.right()-2, r.bottom()-tqlayoutMetric(LM_BorderBottom)+1 ); - p.drawLine(r.left()+3, r.y()+3, r.left()+3, r.y()+tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight)+tqlayoutMetric(LM_TitleEdgeTop) ); - p.drawLine(r.right()-3, r.y()+3, r.right()-3, r.y()+tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight)+tqlayoutMetric(LM_TitleEdgeTop) ); + p.drawLine(r.left()+2, r.y()+3, r.left()+2, r.bottom()-layoutMetric(LM_BorderBottom)+1 ); + p.drawLine(r.right()-2, r.y()+3, r.right()-2, r.bottom()-layoutMetric(LM_BorderBottom)+1 ); + p.drawLine(r.left()+3, r.y()+3, r.left()+3, r.y()+layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeTop) ); + p.drawLine(r.right()-3, r.y()+3, r.right()-3, r.y()+layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeTop) ); if (!mustDrawHandle() ) p.drawLine(r.left()+1, r.bottom()-2, r.right()-1, r.bottom()-2); @@ -546,7 +546,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) p.setFont(options()->font(false, isToolWindow() )); TQFontMetrics fm(options()->font(false)); - g = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); + g = options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorFrame, true); + g = options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorTitleBar, true); + TQColorGroup g = options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorFrame, true); + g = options()->colorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); diff --git a/kwin/clients/laptop/laptopclient.h b/kwin/clients/laptop/laptopclient.h index 2bdd940fb..3413b490a 100644 --- a/kwin/clients/laptop/laptopclient.h +++ b/kwin/clients/laptop/laptopclient.h @@ -38,7 +38,7 @@ public: virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); virtual TQRegion cornerShape(WindowCorner corner); diff --git a/kwin/clients/modernsystem/buttondata.h b/kwin/clients/modernsystem/buttondata.h index fc01c3840..1af5fb8dd 100644 --- a/kwin/clients/modernsystem/buttondata.h +++ b/kwin/clients/modernsystem/buttondata.h @@ -1,8 +1,8 @@ /* Image bits processed by KPixmap2Bitmaps */ -#define lowcolor_tqmask_width 14 -#define lowcolor_tqmask_height 15 -static const unsigned char lowcolor_tqmask_bits[] = { +#define lowcolor_mask_width 14 +#define lowcolor_mask_height 15 +static const unsigned char lowcolor_mask_bits[] = { 0xf0,0x03,0xf8,0x07,0xfc,0xcf,0xfe,0x1f,0xfe,0x1f,0xff,0xff,0xff,0xff,0xff, 0x3f,0xff,0x3f,0xff,0xbf,0xfe,0xdf,0xfe,0x9f,0xfc,0x0f,0xf8,0x07,0xf0,0x03, 0x00,0x40,0x80,0x00,0x00,0x00,0x29,0x00,0x00,0x00,0x7c,0xfe,0x87,0x40,0x00, diff --git a/kwin/clients/modernsystem/config/config.cpp b/kwin/clients/modernsystem/config/config.cpp index 60ef9a3c7..8a94c1748 100644 --- a/kwin/clients/modernsystem/config/config.cpp +++ b/kwin/clients/modernsystem/config/config.cpp @@ -35,15 +35,15 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par vbox->setMargin(0); handleBox = new TQWidget(mainw); - TQGridLayout* tqlayout = new TQGridLayout(handleBox, 0, KDialog::spacingHint()); + TQGridLayout* layout = new TQGridLayout(handleBox, 0, KDialog::spacingHint()); cbShowHandle = new TQCheckBox(i18n("&Show window resize handle"), handleBox); TQWhatsThis::add(cbShowHandle, i18n("When selected, all windows are drawn with a resize " "handle at the lower right corner. This makes window resizing " - "easier, especially for trackballs and other mouse tqreplacements " + "easier, especially for trackballs and other mouse replacements " "on laptops.")); - tqlayout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1); + layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1); connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged())); sliderBox = new TQVBox(handleBox); @@ -59,18 +59,18 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par bool rtl = kapp->reverseLayout(); label1 = new TQLabel(i18n("Small"), hbox); - label1->tqsetAlignment(rtl ? AlignRight : AlignLeft); + label1->setAlignment(rtl ? AlignRight : AlignLeft); label2 = new TQLabel(i18n("Medium"), hbox); - label2->tqsetAlignment(AlignHCenter); + label2->setAlignment(AlignHCenter); label3 = new TQLabel(i18n("Large"), hbox); - label3->tqsetAlignment(rtl ? AlignLeft : AlignRight); + label3->setAlignment(rtl ? AlignLeft : AlignRight); vbox->addWidget(handleBox); vbox->addStretch(1); -// tqlayout->setColSpacing(0, 30); - tqlayout->addItem(new TQSpacerItem(30, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed), 1, 0); - tqlayout->addWidget(sliderBox, 1, 1); +// layout->setColSpacing(0, 30); + layout->addItem(new TQSpacerItem(30, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed), 1, 0); + layout->addWidget(sliderBox, 1, 1); load(conf); mainw->show(); diff --git a/kwin/clients/modernsystem/modernsys.cpp b/kwin/clients/modernsystem/modernsys.cpp index 1bb9f9815..ce7545cdf 100644 --- a/kwin/clients/modernsystem/modernsys.cpp +++ b/kwin/clients/modernsystem/modernsys.cpp @@ -65,7 +65,7 @@ static unsigned char shade_on_bits[] = { static unsigned char menu_bits[] = { 0xff, 0x81, 0x81, 0xff, 0x81, 0xff, 0x81, 0xff}; -static unsigned char btnhighcolor_tqmask_bits[] = { +static unsigned char btnhighcolor_mask_bits[] = { 0xe0,0x41,0xf8,0x07,0xfc,0x0f,0xfe,0xdf,0xfe,0x1f,0xff,0x3f,0xff,0xff,0xff, 0x3f,0xff,0x3f,0xff,0xff,0xff,0xff,0xfe,0x9f,0xfe,0x1f,0xfc,0x0f,0xf0,0x03, 0x00,0x40,0x80,0x00,0x00,0x00,0x39,0x00,0x00,0x00,0x20,0x99,0x0f,0x08,0xc4, @@ -127,7 +127,7 @@ static void make_button_fx(const TQColorGroup &g, TQPixmap *pix, bool light=fals } else{ - if(!lcDark1->tqmask()){ + if(!lcDark1->mask()){ lcDark1->setMask(*lcDark1); lcDark2->setMask(*lcDark2); lcDark3->setMask(*lcDark3); @@ -171,20 +171,20 @@ static void create_pixmaps() KPixmapEffect::VerticalGradient); } // buttons - TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true)); + TQColorGroup btnColor(options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorButtonBg, false); + btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false); iButtonPix = new TQPixmap(14, 15); make_button_fx(btnColor, iButtonPix); iButtonPixDown = new TQPixmap(14, 15); make_button_fx(btnColor, iButtonPixDown, true); - if(tqGray(btnColor.background().rgb()) < 150) + if(qGray(btnColor.background().rgb()) < 150) buttonFg = new TQColor(Qt::white); else buttonFg = new TQColor(Qt::black); @@ -289,11 +289,11 @@ ModernButton::ModernButton(ButtonType type, ModernSys *parent, const char *name) { setBackgroundMode( NoBackground ); - TQBitmap tqmask(14, 15, TQPixmap::defaultDepth() > 8 ? - btnhighcolor_tqmask_bits : lowcolor_tqmask_bits, true); + TQBitmap mask(14, 15, TQPixmap::defaultDepth() > 8 ? + btnhighcolor_mask_bits : lowcolor_mask_bits, true); resize(14, 15); - setMask(tqmask); + setMask(mask); } void ModernButton::reset(unsigned long changed) @@ -410,7 +410,7 @@ bool ModernSys::decorationBehaviour(DecorationBehaviour behaviour) const } } -int ModernSys::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int ModernSys::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { // bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); @@ -425,9 +425,9 @@ int ModernSys::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KC return border_width + handle_width; case LM_TitleEdgeLeft: - return tqlayoutMetric(LM_BorderLeft,respectWindowState)+3; + return layoutMetric(LM_BorderLeft,respectWindowState)+3; case LM_TitleEdgeRight: - return tqlayoutMetric(LM_BorderRight,respectWindowState)+3; + return layoutMetric(LM_BorderRight,respectWindowState)+3; case LM_TitleEdgeTop: return 2; @@ -454,7 +454,7 @@ int ModernSys::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KC return 3; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -515,10 +515,10 @@ void ModernSys::recalcTitleBuffer() p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient); else p.fillRect(0, 0, width(), title_height+2, - options()->tqcolorGroup(ColorTitleBar, true). + options()->colorGroup(ColorTitleBar, true). brush(TQColorGroup::Button)); - TQRect t = titleRect(); // titlebar->tqgeometry(); + TQRect t = titleRect(); // titlebar->geometry(); t.setTop( 2 ); t.setLeft( t.left() ); t.setRight( t.right() - 2 ); @@ -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()->tqcolorGroup(ColorFrame, isActive()), false); + options()->colorGroup(ColorFrame, isActive()), false); } @@ -568,11 +568,11 @@ void ModernSys::paintEvent( TQPaintEvent* ) int hw = handle_width; TQPainter p( widget() ); - TQRect t = titleRect(); // titlebar->tqgeometry(); + TQRect t = titleRect(); // titlebar->geometry(); - TQBrush fillBrush(widget()->tqcolorGroup().brush(TQColorGroup::Background).pixmap() ? - widget()->tqcolorGroup().brush(TQColorGroup::Background) : - options()->tqcolorGroup(ColorFrame, isActive()). + TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ? + widget()->colorGroup().brush(TQColorGroup::Background) : + options()->colorGroup(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()->tqcolorGroup(ColorTitleBar, isActive()); + TQColorGroup g = options()->colorGroup(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()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(1, title_height+3, 1, h-2); p.setPen(g.dark()); @@ -649,22 +649,22 @@ void ModernSys::updateWindowShape() { int hs = handle_size; int hw = handle_width; - TQRegion tqmask; - tqmask += TQRect(0, 0, width()-hw, height()-hw); + TQRegion mask; + mask += TQRect(0, 0, width()-hw, height()-hw); //single points - tqmask -= TQRect(0, 0, 1, 1); - tqmask -= TQRect(width()-hw-1, 0, 1, 1); - tqmask -= TQRect(0, height()-hw-1, 1, 1); + mask -= TQRect(0, 0, 1, 1); + mask -= TQRect(width()-hw-1, 0, 1, 1); + mask -= TQRect(0, height()-hw-1, 1, 1); if (show_handle) { - tqmask += TQRect(width()-hs, height()-hs, hs-1, hs-1); - tqmask -= TQRect(width()-2, height()-2, 1, 1); - tqmask -= TQRect(width()-2, height()-hs, 1, 1); - tqmask -= TQRect(width()-hs, height()-2, 1, 1); + mask += TQRect(width()-hs, height()-hs, hs-1, hs-1); + mask -= TQRect(width()-2, height()-2, 1, 1); + mask -= TQRect(width()-2, height()-hs, 1, 1); + mask -= TQRect(width()-hs, height()-2, 1, 1); } else - tqmask -= TQRect(width()-1, height()-1, 1, 1); + mask -= TQRect(width()-1, height()-1, 1, 1); - setMask(tqmask); + setMask(mask); } ModernSysFactory::ModernSysFactory() diff --git a/kwin/clients/modernsystem/modernsys.h b/kwin/clients/modernsystem/modernsys.h index 927e1e32e..3e0cf02fd 100644 --- a/kwin/clients/modernsystem/modernsys.h +++ b/kwin/clients/modernsystem/modernsys.h @@ -36,7 +36,7 @@ public: virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); virtual void updateWindowShape(); diff --git a/kwin/clients/plastik/config/configdialog.ui b/kwin/clients/plastik/config/configdialog.ui index 9970bd254..642891b31 100644 --- a/kwin/clients/plastik/config/configdialog.ui +++ b/kwin/clients/plastik/config/configdialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConfigDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -115,5 +115,5 @@ <tabstop>animateButtons</tabstop> <tabstop>titleShadow</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwin/clients/plastik/misc.cpp b/kwin/clients/plastik/misc.cpp index 1b259d383..43786fe46 100644 --- a/kwin/clients/plastik/misc.cpp +++ b/kwin/clients/plastik/misc.cpp @@ -61,9 +61,9 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i if(alpha<0) alpha = 0; int inv_alpha = 255 - alpha; - TQColor result = TQColor( tqRgb(tqRed(rgb_b)*inv_alpha/255 + tqRed(rgb)*alpha/255, - tqGreen(rgb_b)*inv_alpha/255 + tqGreen(rgb)*alpha/255, - tqBlue(rgb_b)*inv_alpha/255 + tqBlue(rgb)*alpha/255) ); + TQColor result = TQColor( qRgb(qRed(rgb_b)*inv_alpha/255 + qRed(rgb)*alpha/255, + qGreen(rgb_b)*inv_alpha/255 + qGreen(rgb)*alpha/255, + qBlue(rgb_b)*inv_alpha/255 + qBlue(rgb)*alpha/255) ); return result; } @@ -73,10 +73,10 @@ TQImage recolorImage(TQImage *img, TQColor color) { destImg.setAlphaBuffer(true); for (int x = 0; x < img->width(); x++) { for (int y = 0; y < img->height(); y++) { - if(img->pixel(x,y) == tqRgb(0,0,255) ) { + if(img->pixel(x,y) == qRgb(0,0,255) ) { destImg.setPixel(x,y,color.rgb() ); // set to the new color } else { - destImg.setPixel(x,y,tqRgba(0,0,0,0) ); // set transparent... + destImg.setPixel(x,y,qRgba(0,0,0,0) ); // set transparent... } } } diff --git a/kwin/clients/plastik/plastik.cpp b/kwin/clients/plastik/plastik.cpp index 8d905e398..a6313cd1c 100644 --- a/kwin/clients/plastik/plastik.cpp +++ b/kwin/clients/plastik/plastik.cpp @@ -87,7 +87,7 @@ bool PlastikHandler::reset(unsigned long changed) m_borderSize = 4; } - // check if we are in reverse tqlayout mode + // check if we are in reverse layout mode m_reverse = TQApplication::reverseLayout(); // read in the configuration @@ -329,7 +329,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.drawLine(2,h-1, w-1,h-1); } - // outside the region normally tqmasked by doShape + // outside the region normally masked by doShape painter.setPen(TQColor(0,0,0) ); painter.drawLine(0, 0, 1, 0 ); painter.drawPoint(0, 1); @@ -361,7 +361,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.drawLine(0,h-1, w-3,h-1); } - // outside the region normally tqmasked by doShape + // outside the region normally masked by doShape painter.setPen(TQColor(0,0,0) ); painter.drawLine(w-2, 0, w-1, 0 ); painter.drawPoint(w-1, 1); diff --git a/kwin/clients/plastik/plastikbutton.cpp b/kwin/clients/plastik/plastikbutton.cpp index 5a3258004..27a3eb127 100644 --- a/kwin/clients/plastik/plastikbutton.cpp +++ b/kwin/clients/plastik/plastikbutton.cpp @@ -140,7 +140,7 @@ void PlastikButton::animate() } } - tqrepaint(false); + repaint(false); } void PlastikButton::enterEvent(TQEvent *e) @@ -269,7 +269,7 @@ void PlastikButton::drawButton(TQPainter *painter) if(!isDown() && Handler()->titleShadow() ) { TQColor shadowColor; - if (tqGray(Handler()->getColor(TitleFont,active).rgb()) < 100) + if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100) shadowColor = TQColor(255, 255, 255); else shadowColor = TQColor(0,0,0); diff --git a/kwin/clients/plastik/plastikclient.cpp b/kwin/clients/plastik/plastikclient.cpp index 4fdfe8e17..604c66641 100644 --- a/kwin/clients/plastik/plastikclient.cpp +++ b/kwin/clients/plastik/plastikclient.cpp @@ -80,7 +80,7 @@ bool PlastikClient::decorationBehaviour(DecorationBehaviour behaviour) const } } -int PlastikClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int PlastikClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); @@ -149,7 +149,7 @@ int PlastikClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, cons return 3; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -204,25 +204,25 @@ TQRegion PlastikClient::cornerShape(WindowCorner corner) switch (corner) { case WC_TopLeft: - if (tqlayoutMetric(LM_TitleEdgeLeft) > 0) + if (layoutMetric(LM_TitleEdgeLeft) > 0) return TQRegion(0, 0, 1, 2) + TQRegion(1, 0, 1, 1); else return TQRegion(); case WC_TopRight: - if (tqlayoutMetric(LM_TitleEdgeRight) > 0) + if (layoutMetric(LM_TitleEdgeRight) > 0) return TQRegion(w-1, 0, 1, 2) + TQRegion(w-2, 0, 1, 1); else return TQRegion(); case WC_BottomLeft: - if (tqlayoutMetric(LM_BorderBottom) > 0) + if (layoutMetric(LM_BorderBottom) > 0) return TQRegion(0, h-1, 1, 1); else return TQRegion(); case WC_BottomRight: - if (tqlayoutMetric(LM_BorderBottom) > 0) + if (layoutMetric(LM_BorderBottom) > 0) return TQRegion(w-1, h-1, 1, 1); else return TQRegion(); @@ -254,14 +254,14 @@ void PlastikClient::paintEvent(TQPaintEvent *e) // int r_h = r.height(); int r_x, r_y, r_x2, r_y2; r.coords(&r_x, &r_y, &r_x2, &r_y2); - const int borderLeft = tqlayoutMetric(LM_BorderLeft); - const int borderRight = tqlayoutMetric(LM_BorderRight); - const int borderBottom = tqlayoutMetric(LM_BorderBottom); - const int titleHeight = tqlayoutMetric(LM_TitleHeight); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight); + const int borderLeft = layoutMetric(LM_BorderLeft); + const int borderRight = layoutMetric(LM_BorderRight); + const int borderBottom = layoutMetric(LM_BorderBottom); + const int titleHeight = layoutMetric(LM_TitleHeight); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); const int borderBottomTop = r_y2-borderBottom+1; const int borderLeftRight = r_x+borderLeft-1; @@ -280,7 +280,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeTop > 0) { tempRect.setRect(r_x+2, r_y, r_w-2*2, titleEdgeTop ); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTileTop, active, toolWindow) ); } } @@ -291,7 +291,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeLeft > 0) { tempRect.setRect(r_x, r_y, borderLeft, titleEdgeTop+titleHeight+titleEdgeBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarLeft, active, toolWindow) ); titleMarginLeft = borderLeft; } @@ -301,7 +301,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeRight > 0) { tempRect.setRect(borderRightLeft, r_y, borderRight, titleEdgeTop+titleHeight+titleEdgeBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarRight, active, toolWindow) ); titleMarginRight = borderRight; } @@ -312,7 +312,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(Rtitle.width() > 0) { m_captionRect = captionRect(); // also update m_captionRect! - if (m_captionRect.isValid() && region.tqcontains(m_captionRect) ) + if (m_captionRect.isValid() && region.contains(m_captionRect) ) { painter.drawTiledPixmap(m_captionRect, caption); } @@ -320,14 +320,14 @@ void PlastikClient::paintEvent(TQPaintEvent *e) // left to the title tempRect.setRect(r_x+titleMarginLeft, m_captionRect.top(), m_captionRect.left() - (r_x+titleMarginLeft), m_captionRect.height() ); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTile, active, toolWindow) ); } // right to the title tempRect.setRect(m_captionRect.right()+1, m_captionRect.top(), (r_x2-titleMarginRight) - m_captionRect.right(), m_captionRect.height() ); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTile, active, toolWindow) ); } @@ -337,7 +337,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(borderLeft > 0 && sideHeight > 0) { tempRect.setCoords(r_x, titleEdgeBottomBottom+1, borderLeftRight, borderBottomTop-1); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderLeftTile, active, toolWindow) ); } } @@ -346,7 +346,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(borderRight > 0 && sideHeight > 0) { tempRect.setCoords(borderRightLeft, titleEdgeBottomBottom+1, r_x2, borderBottomTop-1); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderRightTile, active, toolWindow) ); } } @@ -358,19 +358,19 @@ void PlastikClient::paintEvent(TQPaintEvent *e) int r = r_x2; tempRect.setRect(r_x, borderBottomTop, borderLeft, borderBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomLeft, active, toolWindow) ); l = tempRect.right()+1; } tempRect.setRect(borderRightLeft, borderBottomTop, borderLeft, borderBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomRight, active, toolWindow) ); r = tempRect.left()-1; } tempRect.setCoords(l, borderBottomTop, r, r_y2); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomTile, active, toolWindow) ); } } @@ -381,16 +381,16 @@ TQRect PlastikClient::captionRect() const const TQPixmap &caption = captionPixmap(); TQRect r = widget()->rect(); - const int titleHeight = tqlayoutMetric(LM_TitleHeight); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int marginLeft = tqlayoutMetric(LM_TitleBorderLeft); - const int marginRight = tqlayoutMetric(LM_TitleBorderRight); + const int titleHeight = layoutMetric(LM_TitleHeight); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int marginLeft = layoutMetric(LM_TitleBorderLeft); + const int marginRight = layoutMetric(LM_TitleBorderRight); const int titleLeft = r.left() + titleEdgeLeft + buttonsLeftWidth() + marginLeft; const int titleWidth = r.width() - - titleEdgeLeft - tqlayoutMetric(LM_TitleEdgeRight) - + titleEdgeLeft - layoutMetric(LM_TitleEdgeRight) - buttonsLeftWidth() - buttonsRightWidth() - marginLeft - marginRight; @@ -435,7 +435,7 @@ void PlastikClient::reset( unsigned long changed ) { if (changed & SettingColors) { - // tqrepaint the whole thing + // repaint the whole thing clearCaptionPixmaps(); widget()->update(); updateButtons(); @@ -445,7 +445,7 @@ void PlastikClient::reset( unsigned long changed ) updateLayout(); - // then tqrepaint + // then repaint clearCaptionPixmaps(); widget()->update(); } @@ -479,7 +479,7 @@ const TQPixmap &PlastikClient::captionPixmap() const int captionWidth = fm.width(c); int captionHeight = fm.height(); - const int th = tqlayoutMetric(LM_TitleHeight, false) + tqlayoutMetric(LM_TitleEdgeBottom, false); + const int th = layoutMetric(LM_TitleHeight, false) + layoutMetric(LM_TitleEdgeBottom, false); TQPainter painter; @@ -496,7 +496,7 @@ const TQPixmap &PlastikClient::captionPixmap() const if(Handler()->titleShadow()) { TQColor shadowColor; - if (tqGray(Handler()->getColor(TitleFont,active).rgb()) < 100) + if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100) shadowColor = TQColor(255, 255, 255); else shadowColor = TQColor(0,0,0); diff --git a/kwin/clients/plastik/plastikclient.h b/kwin/clients/plastik/plastikclient.h index 6f96664ea..e83bf75a5 100644 --- a/kwin/clients/plastik/plastikclient.h +++ b/kwin/clients/plastik/plastikclient.h @@ -41,7 +41,7 @@ public: virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual TQRegion cornerShape(WindowCorner corner); virtual KCommonDecorationButton *createButton(ButtonType type); diff --git a/kwin/clients/quartz/config/config.cpp b/kwin/clients/quartz/config/config.cpp index f6b780eeb..d15eb4da1 100644 --- a/kwin/clients/quartz/config/config.cpp +++ b/kwin/clients/quartz/config/config.cpp @@ -1,6 +1,6 @@ /* * - * This file tqcontains the quartz configuration widget + * This file contains the quartz configuration widget * * Copyright (c) 2001 * Karol Szwed <[email protected]> diff --git a/kwin/clients/quartz/config/config.h b/kwin/clients/quartz/config/config.h index d22313ab7..0a952c4e9 100644 --- a/kwin/clients/quartz/config/config.h +++ b/kwin/clients/quartz/config/config.h @@ -1,6 +1,6 @@ /* * - * This file tqcontains the quartz configuration widget + * This file contains the quartz configuration widget * * Copyright (c) 2001 * Karol Szwed <[email protected]> diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp index 489ccd081..82caabb45 100644 --- a/kwin/clients/quartz/quartz.cpp +++ b/kwin/clients/quartz/quartz.cpp @@ -207,7 +207,7 @@ void QuartzHandler::readConfig() extraSlim = conf.readBoolEntry( "UseQuartzExtraSlim", false ); // A small hack to make the on all desktops button look nicer - onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().tqcontains( 'S' ); + onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().contains( 'S' ); if ( TQApplication::reverseLayout() ) onAllDesktopsButtonOnLeft = !onAllDesktopsButtonOnLeft; switch(options()->preferredBorderSize(this)) { @@ -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()->tqcolorGroup(ColorTitleBlend, true); + TQColorGroup g2 = options()->colorGroup(ColorTitleBlend, true); TQColor c2 = g2.background(); - g2 = options()->tqcolorGroup(ColorTitleBar, true ); + g2 = options()->colorGroup(ColorTitleBar, true ); TQColor c = g2.background().light(130); titleBlocks = new KPixmap(); titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight ); drawBlocks( titleBlocks, *titleBlocks, c, c2 ); - g2 = options()->tqcolorGroup(ColorTitleBlend, false); + g2 = options()->colorGroup(ColorTitleBlend, false); c2 = g2.background(); - g2 = options()->tqcolorGroup(ColorTitleBar, false ); + g2 = options()->colorGroup(ColorTitleBar, false ); c = g2.background().light(130); ititleBlocks = new KPixmap(); @@ -313,9 +313,9 @@ void QuartzHandler::createPixmaps() TQColorGroup g; TQPainter p; - g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); + g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background(); - g2 = options()->tqcolorGroup( ColorButtonBg, true ); + g2 = options()->colorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); @@ -335,9 +335,9 @@ void QuartzHandler::createPixmaps() // Inactive pins - g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); + g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background(); - g2 = options()->tqcolorGroup( ColorButtonBg, false ); + g2 = options()->colorGroup( 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 ); - tqrepaint( false ); + repaint( false ); } } @@ -540,7 +540,7 @@ bool QuartzClient::decorationBehaviour(DecorationBehaviour behaviour) const } } -int QuartzClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int QuartzClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); @@ -582,7 +582,7 @@ int QuartzClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const return 3; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -643,8 +643,8 @@ void QuartzClient::reset( unsigned long changed ) { if (changed & SettingColors || changed & SettingFont) { - // tqrepaint the whole thing - widget()->tqrepaint(false); + // repaint the whole thing + widget()->repaint(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()->tqcolorGroup(ColorTitleBar, isActive()); + g = options()->colorGroup(ColorTitleBar, isActive()); else - g = options()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); // Draw outer highlights and lowlights p.setPen( g.light().light(120) ); @@ -724,11 +724,11 @@ void QuartzClient::paintEvent( TQPaintEvent* ) // =================== int r_x, r_y, r_x2, r_y2; widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int ttlHeight = tqlayoutMetric(LM_TitleHeight); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int ttlHeight = layoutMetric(LM_TitleHeight); const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1; r = TQRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop, r_x2-titleEdgeRight-buttonsRightWidth()-(r_x+titleEdgeLeft+buttonsLeftWidth()), diff --git a/kwin/clients/quartz/quartz.h b/kwin/clients/quartz/quartz.h index 8f357d209..ddb68ced3 100644 --- a/kwin/clients/quartz/quartz.h +++ b/kwin/clients/quartz/quartz.h @@ -74,7 +74,7 @@ class QuartzClient : public KCommonDecoration virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); virtual void init(); diff --git a/kwin/clients/redmond/redmond.cpp b/kwin/clients/redmond/redmond.cpp index aacbd3812..7f74479ed 100644 --- a/kwin/clients/redmond/redmond.cpp +++ b/kwin/clients/redmond/redmond.cpp @@ -149,7 +149,7 @@ static void create_pixmaps () defaultMenuPix = new TQPixmap(kdelogo); // buttons (active/inactive, sunken/unsunken) - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); @@ -196,20 +196,20 @@ static void create_pixmaps () iMiniBtnDownPix1->fill(c.rgb()); } - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + g = options()->colorGroup(KDecoration::ColorButtonBg, true); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(miniBtnPix1, g, false); drawButtonFrame(miniBtnDownPix1, g, true); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iMiniBtnPix1, g, false); drawButtonFrame(iMiniBtnDownPix1, g, true); // Make sure button pixmaps contrast with the current colour scheme. - if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127) + if (qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127) btnForeground = new TQColor(Qt::black); else btnForeground = new TQColor(Qt::white); @@ -294,7 +294,7 @@ void RedmondButton::setPixmap( const TQPixmap &p ) deco.resize(0, 0); pix = p; - tqrepaint(false); + repaint(false); } @@ -380,7 +380,7 @@ bool RedmondDeco::decorationBehaviour(DecorationBehaviour behaviour) const } } -int RedmondDeco::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int RedmondDeco::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { bool border = !(maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows()); @@ -423,7 +423,7 @@ int RedmondDeco::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const return 2; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -485,7 +485,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* ) // Draw part of the frame that is the frame color // ============================================== - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); p.setPen( g.background() ); p.drawLine( x, y, x2-1, y ); p.drawLine( x, y, x, y2-1 ); diff --git a/kwin/clients/redmond/redmond.h b/kwin/clients/redmond/redmond.h index e827ecfbf..fdc5047bc 100644 --- a/kwin/clients/redmond/redmond.h +++ b/kwin/clients/redmond/redmond.h @@ -56,7 +56,7 @@ public: virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); void init(); diff --git a/kwin/clients/test/test.cpp b/kwin/clients/test/test.cpp index 3bb759349..a04437067 100644 --- a/kwin/clients/test/test.cpp +++ b/kwin/clients/test/test.cpp @@ -93,7 +93,7 @@ void Decoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize Decoration::tqminimumSize() const +TQSize Decoration::minimumSize() const { return TQSize( 100, 50 ); } @@ -144,7 +144,7 @@ bool Decoration::animateMinimize(bool iconify) // Go away quick. helperShowHide( false ); - tqApp->syncX(); + qApp->syncX(); TQRect r = iconGeometry(); @@ -153,8 +153,8 @@ bool Decoration::animateMinimize(bool iconify) // Algorithm taken from Window Maker (http://www.windowmaker.org) - int sx = tqgeometry().x(); - int sy = tqgeometry().y(); + int sx = geometry().x(); + int sy = geometry().y(); int sw = width(); int sh = height(); int dx = r.x(); @@ -213,7 +213,7 @@ bool Decoration::animateMinimize(bool iconify) ungrabXServer(); -// FRAME tqApp->processEvents(); // FRAME ??? +// FRAME qApp->processEvents(); // FRAME ??? cx += xstep; cy += ystep; @@ -236,11 +236,11 @@ bool Decoration::animateMinimize(bool iconify) // Go away quick. helperShowHide( false ); - tqApp->syncX(); + qApp->syncX(); int stepCount = 12; - TQRect r(tqgeometry()); + TQRect r(geometry()); int dx = r.width() / (stepCount * 2); int dy = r.height() / (stepCount * 2); @@ -263,7 +263,7 @@ bool Decoration::animateMinimize(bool iconify) ungrabXServer(); -// FRAME tqApp->processEvents(); +// FRAME qApp->processEvents(); } } break; @@ -276,7 +276,7 @@ bool Decoration::animateMinimize(bool iconify) if (!icongeom.isValid()) return true; - TQRect wingeom = tqgeometry(); + TQRect wingeom = geometry(); TQPainter p( workspaceWidget()); @@ -298,7 +298,7 @@ bool Decoration::animateMinimize(bool iconify) p.flush(); - tqApp->syncX(); + qApp->syncX(); usleep(30000); diff --git a/kwin/clients/test/test.h b/kwin/clients/test/test.h index e1d3d51a6..bfe36fa7c 100644 --- a/kwin/clients/test/test.h +++ b/kwin/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 tqminimumSize() const; + virtual TQSize minimumSize() const; virtual void activeChange() {}; virtual void captionChange() {}; virtual void maximizeChange() {}; diff --git a/kwin/clients/web/Web.cpp b/kwin/clients/web/Web.cpp index 1954b960f..43d1b9f42 100644 --- a/kwin/clients/web/Web.cpp +++ b/kwin/clients/web/Web.cpp @@ -80,7 +80,7 @@ bool WebClient::decorationBehaviour(DecorationBehaviour behaviour) const } } -int WebClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int WebClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { // bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); @@ -112,7 +112,7 @@ int WebClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KC return 0; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -120,31 +120,31 @@ KCommonDecorationButton *WebClient::createButton(ButtonType type) { switch (type) { case MenuButton: - return new WebButton(MenuButton, this, "menu", tqshape_); + return new WebButton(MenuButton, this, "menu", shape_); case OnAllDesktopsButton: - return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", tqshape_); + return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", shape_); case HelpButton: - return new WebButton(HelpButton, this, "help", tqshape_); + return new WebButton(HelpButton, this, "help", shape_); case MinButton: - return new WebButton(MinButton, this, "minimize", tqshape_); + return new WebButton(MinButton, this, "minimize", shape_); case MaxButton: - return new WebButton(MaxButton, this, "maximize", tqshape_); + return new WebButton(MaxButton, this, "maximize", shape_); case CloseButton: - return new WebButton(CloseButton, this, "close", tqshape_); + return new WebButton(CloseButton, this, "close", shape_); case AboveButton: - return new WebButton(AboveButton, this, "above", tqshape_); + return new WebButton(AboveButton, this, "above", shape_); case BelowButton: - return new WebButton(BelowButton, this, "below", tqshape_); + return new WebButton(BelowButton, this, "below", shape_); case ShadeButton: - return new WebButton(ShadeButton, this, "shade", tqshape_); + return new WebButton(ShadeButton, this, "shade", shape_); default: return 0; @@ -185,7 +185,7 @@ WebClient::init() KConfig c("kwinwebrc"); c.setGroup("General"); - tqshape_ = c.readBoolEntry("Shape", true); + shape_ = c.readBoolEntry("Shape", true); KCommonDecoration::init(); } @@ -195,8 +195,8 @@ WebClient::reset( unsigned long changed ) { if (changed & SettingColors) { - // tqrepaint the whole thing - widget()->tqrepaint(false); + // repaint the whole thing + widget()->repaint(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()->tqrepaint(false); + widget()->repaint(false); } KCommonDecoration::reset(changed); @@ -217,11 +217,11 @@ WebClient::paintEvent(TQPaintEvent * pe) { int r_x, r_y, r_x2, r_y2; widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int ttlHeight = tqlayoutMetric(LM_TitleHeight); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int ttlHeight = layoutMetric(LM_TitleHeight); const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1; TQRect titleRect = TQRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop, r_x2-titleEdgeRight-buttonsRightWidth()-(r_x+titleEdgeLeft+buttonsLeftWidth()), @@ -231,7 +231,7 @@ WebClient::paintEvent(TQPaintEvent * pe) TQPainter p(widget()); p.setPen(Qt::black); - p.setBrush(options()->tqcolorGroup(ColorFrame, isActive()).background()); + p.setBrush(options()->colorGroup(ColorFrame, isActive()).background()); p.setClipRegion(pe->region() - titleRect); @@ -241,12 +241,12 @@ WebClient::paintEvent(TQPaintEvent * pe) p.fillRect(titleRect, options()->color(ColorTitleBar, isActive())); - if (tqshape_) + if (shape_) { int r(width()); int b(height()); - // Draw edge of top-left corner inside the area removed by the tqmask. + // Draw edge of top-left corner inside the area removed by the mask. p.drawPoint(3, 1); p.drawPoint(4, 1); @@ -254,7 +254,7 @@ WebClient::paintEvent(TQPaintEvent * pe) p.drawPoint(1, 3); p.drawPoint(1, 4); - // Draw edge of top-right corner inside the area removed by the tqmask. + // Draw edge of top-right corner inside the area removed by the mask. p.drawPoint(r - 5, 1); p.drawPoint(r - 4, 1); @@ -262,7 +262,7 @@ WebClient::paintEvent(TQPaintEvent * pe) p.drawPoint(r - 2, 3); p.drawPoint(r - 2, 4); - // Draw edge of bottom-left corner inside the area removed by the tqmask. + // Draw edge of bottom-left corner inside the area removed by the mask. p.drawPoint(1, b - 5); p.drawPoint(1, b - 4); @@ -270,7 +270,7 @@ WebClient::paintEvent(TQPaintEvent * pe) p.drawPoint(3, b - 2); p.drawPoint(4, b - 2); - // Draw edge of bottom-right corner inside the area removed by the tqmask. + // Draw edge of bottom-right corner inside the area removed by the mask. p.drawPoint(r - 2, b - 5); p.drawPoint(r - 2, b - 4); @@ -288,43 +288,43 @@ WebClient::paintEvent(TQPaintEvent * pe) void WebClient::updateWindowShape() { - if (!tqshape_) + if (!shape_) return; - TQRegion tqmask(0, 0, width(), height()); + TQRegion mask(0, 0, width(), height()); int r(width()); int b(height()); // Remove top-left corner. - tqmask -= TQRegion(0, 0, 5, 1); - tqmask -= TQRegion(0, 1, 3, 1); - tqmask -= TQRegion(0, 2, 2, 1); - tqmask -= TQRegion(0, 3, 1, 2); + mask -= TQRegion(0, 0, 5, 1); + mask -= TQRegion(0, 1, 3, 1); + mask -= TQRegion(0, 2, 2, 1); + mask -= TQRegion(0, 3, 1, 2); // Remove top-right corner. - tqmask -= TQRegion(r - 5, 0, 5, 1); - tqmask -= TQRegion(r - 3, 1, 3, 1); - tqmask -= TQRegion(r - 2, 2, 2, 1); - tqmask -= TQRegion(r - 1, 3, 1, 2); + mask -= TQRegion(r - 5, 0, 5, 1); + mask -= TQRegion(r - 3, 1, 3, 1); + mask -= TQRegion(r - 2, 2, 2, 1); + mask -= TQRegion(r - 1, 3, 1, 2); // Remove bottom-left corner. - tqmask -= TQRegion(0, b - 5, 1, 3); - tqmask -= TQRegion(0, b - 3, 2, 1); - tqmask -= TQRegion(0, b - 2, 3, 1); - tqmask -= TQRegion(0, b - 1, 5, 1); + mask -= TQRegion(0, b - 5, 1, 3); + mask -= TQRegion(0, b - 3, 2, 1); + mask -= TQRegion(0, b - 2, 3, 1); + mask -= TQRegion(0, b - 1, 5, 1); // Remove bottom-right corner. - tqmask -= TQRegion(r - 5, b - 1, 5, 1); - tqmask -= TQRegion(r - 3, b - 2, 3, 1); - tqmask -= TQRegion(r - 2, b - 3, 2, 1); - tqmask -= TQRegion(r - 1, b - 5, 1, 2); + mask -= TQRegion(r - 5, b - 1, 5, 1); + mask -= TQRegion(r - 3, b - 2, 3, 1); + mask -= TQRegion(r - 2, b - 3, 2, 1); + mask -= TQRegion(r - 1, b - 5, 1, 2); - setMask(tqmask); + setMask(mask); } KDecoration* WebFactory::createDecoration( KDecorationBridge* b ) @@ -382,4 +382,4 @@ TQValueList< WebFactory::BorderSize > WebFactory::borderSizes() const #include "Web.moc" // vim:ts=2:sw=2:tw=78:set et: -// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on; +// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on; diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h index 4b24d0da6..c8a8fa2db 100644 --- a/kwin/clients/web/Web.h +++ b/kwin/clients/web/Web.h @@ -46,7 +46,7 @@ namespace Web virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); virtual void updateWindowShape(); @@ -62,7 +62,7 @@ namespace Web int titleHeight_, borderSize_; - bool tqshape_; + bool shape_; TQBitmap _buttonBitmap(ButtonType t) const; }; @@ -84,4 +84,4 @@ namespace Web #endif // vim:ts=2:sw=2:tw=78:set et: -// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on; +// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on; diff --git a/kwin/clients/web/WebButton.cpp b/kwin/clients/web/WebButton.cpp index b12d7bd84..61811accc 100644 --- a/kwin/clients/web/WebButton.cpp +++ b/kwin/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 tqshape) +WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool shape) : KCommonDecorationButton (type, parent, name), mouseOver_ (false), - tqshape_ (tqshape), + shape_ (shape), deco_ (parent) { setBackgroundMode(NoBackground); @@ -127,7 +127,7 @@ void WebButton::reset(unsigned long changed) WebButton::enterEvent(TQEvent * e) { mouseOver_ = true; - tqrepaint(); + repaint(); TQButton::enterEvent(e); } @@ -135,7 +135,7 @@ WebButton::enterEvent(TQEvent * e) WebButton::leaveEvent(TQEvent * e) { mouseOver_ = false; - tqrepaint(); + repaint(); TQButton::leaveEvent(e); } @@ -145,17 +145,17 @@ WebButton::drawButton(TQPainter *p) TQPen highlightPen; if (isDown() ) - highlightPen = TQPen(tqcolorGroup().light()); + highlightPen = TQPen(colorGroup().light()); else { if (mouseOver_) - highlightPen = TQPen(tqcolorGroup().highlight()); + highlightPen = TQPen(colorGroup().highlight()); else highlightPen = TQPen(NoPen); } - p->fillRect(rect(), tqcolorGroup().background()); + p->fillRect(rect(), colorGroup().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 (tqshape_) + if (shape_) { p->drawPoint(3, 1); p->drawPoint(4, 1); @@ -187,11 +187,11 @@ WebButton::drawButton(TQPainter *p) p->setBrush(NoBrush); p->setPen(highlightPen); - if (tqshape_) + if (shape_) p->setClipRegion(TQRegion(rect()) - TQRect(0, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (tqshape_) + if (shape_) { 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 (tqshape_) + if (shape_) { 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 (tqshape_) + if (shape_) p->setClipRegion(TQRegion(rect()) - TQRect(width() - 6, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (tqshape_) + if (shape_) { p->setClipRect(rect()); p->drawPoint(width() - 5, 3); @@ -284,4 +284,4 @@ WebButton::setBitmap(const unsigned char *bitmap) } // vim:ts=2:sw=2:tw=78:set et: -// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on; +// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on; diff --git a/kwin/clients/web/WebButton.h b/kwin/clients/web/WebButton.h index 2e6a54ef1..da94ea3f7 100644 --- a/kwin/clients/web/WebButton.h +++ b/kwin/clients/web/WebButton.h @@ -41,7 +41,7 @@ namespace Web Left, Mid, Right }; - WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape); + WebButton(ButtonType type, WebClient *parent, const char *name, bool shape); virtual ~WebButton(); @@ -59,7 +59,7 @@ namespace Web bool mouseOver_; - bool tqshape_; + bool shape_; WebClient* deco_; }; } @@ -67,4 +67,4 @@ namespace Web #endif // vim:ts=2:sw=2:tw=78:set et: -// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on; +// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on; diff --git a/kwin/data/update_window_settings.cpp b/kwin/data/update_window_settings.cpp index ce4a40a59..0a39850d7 100644 --- a/kwin/data/update_window_settings.cpp +++ b/kwin/data/update_window_settings.cpp @@ -24,7 +24,7 @@ struct SessionInfo TQCString resourceName; TQCString resourceClass; - TQRect tqgeometry; + TQRect geometry; TQRect restore; TQRect fsrestore; int maximized; @@ -76,7 +76,7 @@ void loadFakeSessionInfo( KConfig* config ) info->resourceName = config->readEntry( TQString("resourceName")+n ).latin1(); info->resourceClass = config->readEntry( TQString("resourceClass")+n ).lower().latin1(); info->wmClientMachine = config->readEntry( TQString("clientMachine")+n ).latin1(); - info->tqgeometry = config->readRectEntry( TQString("tqgeometry")+n ); + info->geometry = config->readRectEntry( TQString("geometry")+n ); info->restore = config->readRectEntry( TQString("restore")+n ); info->fsrestore = config->readRectEntry( TQString("fsrestore")+n ); info->maximized = config->readNumEntry( TQString("maximize")+n, 0 ); @@ -122,9 +122,9 @@ void writeRules( KConfig& cfg ) cfg.writeEntry( "types", NET::NormalMask ); else cfg.writeEntry( "types", 1 << info->windowType ); - cfg.writeEntry( "position", info->tqgeometry.topLeft()); + cfg.writeEntry( "position", info->geometry.topLeft()); cfg.writeEntry( "positionrule", 4 ); // 4 == remember - cfg.writeEntry( "size", info->tqgeometry.size()); + cfg.writeEntry( "size", info->geometry.size()); cfg.writeEntry( "sizerule", 4 ); cfg.writeEntry( "maximizevert", info->maximized & NET::MaxVert ); cfg.writeEntry( "maximizevertrule", 4 ); diff --git a/kwin/events.cpp b/kwin/events.cpp index dba2e5a47..a30e915e1 100644 --- a/kwin/events.cpp +++ b/kwin/events.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to handling incoming events. + This file contains things relevant to handling incoming events. */ @@ -51,37 +51,37 @@ void WinInfo::changeDesktop(int desktop) m_client->workspace()->sendClientToDesktop( m_client, desktop, true ); } -void WinInfo::changeState( unsigned long state, unsigned long tqmask ) +void WinInfo::changeState( unsigned long state, unsigned long mask ) { - tqmask &= ~NET::Sticky; // KWin doesn't support large desktops, ignore - tqmask &= ~NET::Hidden; // clients are not allowed to change this directly - state &= tqmask; // for safety, clear all other bits + mask &= ~NET::Sticky; // KWin doesn't support large desktops, ignore + mask &= ~NET::Hidden; // clients are not allowed to change this directly + state &= mask; // for safety, clear all other bits - if(( tqmask & NET::FullScreen ) != 0 && ( state & NET::FullScreen ) == 0 ) + if(( mask & NET::FullScreen ) != 0 && ( state & NET::FullScreen ) == 0 ) m_client->setFullScreen( false, false ); - if ( (tqmask & NET::Max) == NET::Max ) + if ( (mask & NET::Max) == NET::Max ) m_client->setMaximize( state & NET::MaxVert, state & NET::MaxHoriz ); - else if ( tqmask & NET::MaxVert ) + else if ( mask & NET::MaxVert ) m_client->setMaximize( state & NET::MaxVert, m_client->maximizeMode() & Client::MaximizeHorizontal ); - else if ( tqmask & NET::MaxHoriz ) + else if ( mask & NET::MaxHoriz ) m_client->setMaximize( m_client->maximizeMode() & Client::MaximizeVertical, state & NET::MaxHoriz ); - if ( tqmask & NET::Shaded ) + if ( mask & NET::Shaded ) m_client->setShade( state & NET::Shaded ? ShadeNormal : ShadeNone ); - if ( tqmask & NET::KeepAbove) + if ( mask & NET::KeepAbove) m_client->setKeepAbove( (state & NET::KeepAbove) != 0 ); - if ( tqmask & NET::KeepBelow) + if ( mask & NET::KeepBelow) m_client->setKeepBelow( (state & NET::KeepBelow) != 0 ); - if( tqmask & NET::SkipTaskbar ) + if( mask & NET::SkipTaskbar ) m_client->setSkipTaskbar( ( state & NET::SkipTaskbar ) != 0, true ); - if( tqmask & NET::SkipPager ) + if( mask & NET::SkipPager ) m_client->setSkipPager( ( state & NET::SkipPager ) != 0 ); - if( tqmask & NET::DemandsAttention ) + if( mask & NET::DemandsAttention ) m_client->demandAttention(( state & NET::DemandsAttention ) != 0 ); - if( tqmask & NET::Modal ) + if( mask & NET::Modal ) m_client->setModal( ( state & NET::Modal ) != 0 ); // unsetting fullscreen first, setting it last (because e.g. maximize works only for !isFullScreen() ) - if(( tqmask & NET::FullScreen ) != 0 && ( state & NET::FullScreen ) != 0 ) + if(( mask & NET::FullScreen ) != 0 && ( state & NET::FullScreen ) != 0 ) m_client->setFullScreen( true, false ); } @@ -625,9 +625,9 @@ bool Client::windowEvent( XEvent* e ) default: if( e->xany.window == window()) { - if( e->type == Shape::tqshapeEvent() ) + if( e->type == Shape::shapeEvent() ) { - is_tqshape = Shape::hasShape( window()); // workaround for #19644 + is_shape = Shape::hasShape( window()); // workaround for #19644 updateShape(); } } @@ -925,7 +925,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e ) mode = PositionCenter; setCursor( arrowCursor ); } - bool lostMouse = !rect().tqcontains( TQPoint( e->x, e->y ) ); + bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) ); // 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations // (i.e. the LeaveNotify event comes before leaving the rect and no LeaveNotify event // comes after leaving the rect) - so lets check if the pointer is really outside the window @@ -1083,7 +1083,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) if (e->type() == TQEvent::MouseButtonRelease) { int buttonMask, buttonPressed, x, y, x_root, y_root; - unsigned int tqmask; + unsigned int mask; TQMouseEvent *qe = (TQMouseEvent *)e; Window inner_window, parent_window, pointer_window, root_window; XButtonEvent xe; @@ -1109,7 +1109,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // simulated events root_window = qt_xrootwin(); XQueryPointer(qt_xdisplay(), root_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); if (pointer_window != None) { @@ -1119,7 +1119,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // which causes KWin to refocus windows properly parent_window = pointer_window; XQueryPointer(qt_xdisplay(), parent_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); inner_window = pointer_window; while (pointer_window != None) @@ -1130,7 +1130,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // found the child that will receive the simulated event parent_window = pointer_window; XQueryPointer(qt_xdisplay(), parent_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); } pointer_window = parent_window; } @@ -1190,7 +1190,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) else if (e->type() == TQEvent::Wheel) { int x, y, x_root, y_root; - unsigned int buttonMask, buttonPressed, tqmask; + unsigned int buttonMask, buttonPressed, mask; TQWheelEvent *wheelEvent = (TQWheelEvent *)e; Window inner_window, parent_window, pointer_window, root_window; @@ -1207,7 +1207,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // simulated events root_window = qt_xrootwin(); XQueryPointer(qt_xdisplay(), root_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); if (pointer_window != None) { @@ -1217,7 +1217,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // which causes KWin to refocus windows properly parent_window = pointer_window; XQueryPointer(qt_xdisplay(), parent_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); inner_window = pointer_window; while (pointer_window != None) @@ -1228,7 +1228,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // found the child that will receive the simulated event parent_window = pointer_window; XQueryPointer(qt_xdisplay(), parent_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); } pointer_window = parent_window; } @@ -1615,7 +1615,7 @@ void Client::focusInEvent( XFocusInEvent* e ) // from it to its transient, the fullscreen would be kept in the Active layer // at the beginning and at the end, but not in the middle, when the active // client would be temporarily none (see Client::belongToLayer() ). -// Therefore, the events queue is checked, whether it tqcontains the matching +// Therefore, the events queue is checked, whether it contains the matching // FocusIn event, and if yes, deactivation of the previous client will // be skipped, as activation of the new one will automatically deactivate // previously active client. @@ -1711,13 +1711,13 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction ) } else if( direction == NET::KeyboardMove ) { // ignore mouse coordinates given in the message, mouse position is used by the moving algorithm - TQCursor::setPos( tqgeometry().center() ); - performMouseCommand( Options::MouseUnrestrictedMove, tqgeometry().center()); + TQCursor::setPos( geometry().center() ); + performMouseCommand( Options::MouseUnrestrictedMove, geometry().center()); } else if( direction == NET::KeyboardSize ) { // ignore mouse coordinates given in the message, mouse position is used by the resizing algorithm - TQCursor::setPos( tqgeometry().bottomRight()); - performMouseCommand( Options::MouseUnrestrictedResize, tqgeometry().bottomRight()); + TQCursor::setPos( geometry().bottomRight()); + performMouseCommand( Options::MouseUnrestrictedResize, geometry().bottomRight()); } } diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp index 2db1a1853..3fd278360 100644 --- a/kwin/geometry.cpp +++ b/kwin/geometry.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to tqgeometry, i.e. workspace size, + This file contains things relevant to geometry, i.e. workspace size, window positions and window sizes. */ @@ -44,11 +44,11 @@ namespace KWinInternal void Workspace::desktopResized() { //printf("Workspace::desktopResized()\n\r"); - TQRect geom = KApplication::desktop()->tqgeometry(); - NETSize desktop_tqgeometry; - desktop_tqgeometry.width = geom.width(); - desktop_tqgeometry.height = geom.height(); - rootInfo->setDesktopGeometry( -1, desktop_tqgeometry ); + TQRect geom = KApplication::desktop()->geometry(); + NETSize desktop_geometry; + desktop_geometry.width = geom.width(); + desktop_geometry.height = geom.height(); + rootInfo->setDesktopGeometry( -1, desktop_geometry ); updateClientArea( true ); checkElectricBorders( true ); @@ -60,11 +60,11 @@ void Workspace::desktopResized() void Workspace::kDestopResized() { //printf("Workspace::kDesktopResized()\n\r"); - TQRect geom = KApplication::desktop()->tqgeometry(); - NETSize desktop_tqgeometry; - desktop_tqgeometry.width = geom.width(); - desktop_tqgeometry.height = geom.height(); - rootInfo->setDesktopGeometry( -1, desktop_tqgeometry ); + TQRect geom = KApplication::desktop()->geometry(); + NETSize desktop_geometry; + desktop_geometry.width = geom.width(); + desktop_geometry.height = geom.height(); + rootInfo->setDesktopGeometry( -1, desktop_geometry ); updateClientArea( true ); checkElectricBorders( true ); @@ -90,7 +90,7 @@ void Workspace::updateClientArea( bool force ) TQRect* new_wareas = new QRect[ numberOfDesktops() + 1 ]; TQRect** new_sareas = new TQRect*[ numberOfDesktops() + 1]; TQRect* screens = new TQRect [ nscreens ]; - TQRect desktopArea = desktopwidget -> tqgeometry (); + TQRect desktopArea = desktopwidget -> geometry (); for( int iS = 0; iS < nscreens; iS ++ ) @@ -223,10 +223,10 @@ void Workspace::updateClientArea() /*! returns the area available for clients. This is the desktop - tqgeometry minus windows on the dock. Placement algorithms should - refer to this rather than tqgeometry(). + geometry minus windows on the dock. Placement algorithms should + refer to this rather than geometry(). - \sa tqgeometry() + \sa geometry() */ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) const { @@ -237,7 +237,7 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co ? screenarea[ desktop ][ screen ] : desktopwidget->screenGeometry( screen ); TQRect warea = workarea[ desktop ].isNull() - ? kapp->desktop()->tqgeometry() + ? kapp->desktop()->geometry() : workarea[ desktop ]; switch (opt) { @@ -252,19 +252,19 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co case MaximizeFullArea: if (options->xineramaMaximizeEnabled) if (desktopwidget->numScreens() < 2) - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); else return desktopwidget->screenGeometry( screen ); else - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); case FullScreenArea: if (options->xineramaFullscreenEnabled) if (desktopwidget->numScreens() < 2) - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); else return desktopwidget->screenGeometry( screen ); else - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); case PlacementArea: if (options->xineramaPlacementEnabled) if (desktopwidget->numScreens() < 2) @@ -276,18 +276,18 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co case MovementArea: if (options->xineramaMovementEnabled) if (desktopwidget->numScreens() < 2) - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); else return desktopwidget->screenGeometry( screen ); else - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); case WorkArea: return warea; case FullArea: - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); case ScreenArea: if (desktopwidget->numScreens() < 2) - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); else return desktopwidget->screenGeometry( screen ); } @@ -306,7 +306,7 @@ TQRect Workspace::clientArea( clientAreaOption opt, const TQPoint& p, int deskto TQRect Workspace::clientArea( clientAreaOption opt, const Client* c ) const { - return clientArea( opt, c->tqgeometry().center(), c->desktop()); + return clientArea( opt, c->geometry().center(), c->desktop()); } @@ -724,11 +724,11 @@ void Client::keepInArea( TQRect area, bool partial ) area.setRight( QMAX( area.right() + width() - 100, area.right())); area.setBottom( QMAX( area.bottom() + height() - 100, area.bottom())); } - if ( tqgeometry().right() > area.right() && width() < area.width() ) + if ( geometry().right() > area.right() && width() < area.width() ) move( area.right() - width(), y() ); - if ( tqgeometry().bottom() > area.bottom() && height() < area.height() ) + if ( geometry().bottom() > area.bottom() && height() < area.height() ) move( x(), area.bottom() - height() ); - if( !area.tqcontains( tqgeometry().topLeft() )) + if( !area.contains( geometry().topLeft() )) { int tx = x(); int ty = y(); @@ -781,29 +781,29 @@ TQRect Client::adjustedClientArea( const TQRect &desktopArea, const TQRect& area // hack, might cause problems... this tries to guess the start/end of a // non-extended strut; only works on windows that have exact same - // tqgeometry as their strut (ie, if the tqgeometry fits the width - // exactly, we will adjust length of strut to match the tqgeometry as well; + // geometry as their strut (ie, if the geometry fits the width + // exactly, we will adjust length of strut to match the geometry as well; // otherwise we use the full-edge strut) - if (stareaT.top() == tqgeometry().top() && stareaT.bottom() == tqgeometry().bottom()) { - stareaT.setLeft(tqgeometry().left()); - stareaT.setRight(tqgeometry().right()); -// kdDebug () << "Trimming top-strut to tqgeometry() to: " << stareaT << endl; + if (stareaT.top() == geometry().top() && stareaT.bottom() == geometry().bottom()) { + stareaT.setLeft(geometry().left()); + stareaT.setRight(geometry().right()); +// kdDebug () << "Trimming top-strut to geometry() to: " << stareaT << endl; } - if (stareaB.top() == tqgeometry().top() && stareaB.bottom() == tqgeometry().bottom()) { - stareaB.setLeft(tqgeometry().left()); - stareaB.setRight(tqgeometry().right()); -// kdDebug () << "Trimming bottom-strut to tqgeometry(): " << stareaB << endl; + if (stareaB.top() == geometry().top() && stareaB.bottom() == geometry().bottom()) { + stareaB.setLeft(geometry().left()); + stareaB.setRight(geometry().right()); +// kdDebug () << "Trimming bottom-strut to geometry(): " << stareaB << endl; } - if (stareaL.left() == tqgeometry().left() && stareaL.right() == tqgeometry().right()) { - stareaL.setTop(tqgeometry().top()); - stareaL.setBottom(tqgeometry().bottom()); -// kdDebug () << "Trimming left-strut to tqgeometry(): " << stareaL << endl; + if (stareaL.left() == geometry().left() && stareaL.right() == geometry().right()) { + stareaL.setTop(geometry().top()); + stareaL.setBottom(geometry().bottom()); +// kdDebug () << "Trimming left-strut to geometry(): " << stareaL << endl; } - if (stareaR.left() == tqgeometry().left() && stareaR.right() == tqgeometry().right()) { - stareaR.setTop(tqgeometry().top()); - stareaR.setBottom(tqgeometry().bottom()); -// kdDebug () << "Trimming right-strut to tqgeometry(): " << stareaR << endl; + if (stareaR.left() == geometry().left() && stareaR.right() == geometry().right()) { + stareaR.setTop(geometry().top()); + stareaR.setBottom(geometry().bottom()); +// kdDebug () << "Trimming right-strut to geometry(): " << stareaR << endl; } } @@ -811,7 +811,7 @@ TQRect Client::adjustedClientArea( const TQRect &desktopArea, const TQRect& area // HACK: workarea handling is not xinerama aware, so if this strut // reserves place at a xinerama edge that's inside the virtual screen, // ignore the strut for workspace setting. - if( area == kapp->desktop()->tqgeometry()) + if( area == kapp->desktop()->geometry()) { if( stareaL.left() < screenarea.left()) stareaL = TQRect(); @@ -898,7 +898,7 @@ bool Client::hasStrut() const void Client::updateWorkareaDiffs() { TQRect area = workspace()->clientArea( WorkArea, this ); - TQRect geom = tqgeometry(); + TQRect geom = geometry(); workarea_diff_x = computeWorkareaDiff( geom.left(), geom.right(), area.left(), area.right()); workarea_diff_y = computeWorkareaDiff( geom.top(), geom.bottom(), area.top(), area.bottom()); } @@ -934,14 +934,14 @@ void Client::checkWorkspacePosition() if( isDesktop()) { TQRect area = workspace()->clientArea( FullArea, this ); - if( tqgeometry() != area ) + if( geometry() != area ) setGeometry( area ); return; } if( isFullScreen()) { TQRect area = workspace()->clientArea( FullScreenArea, this ); - if( tqgeometry() != area ) + if( geometry() != area ) setGeometry( area ); return; } @@ -983,7 +983,7 @@ void Client::checkWorkspacePosition() return; TQRect area = workspace()->clientArea( WorkArea, this ); - TQRect new_geom = tqgeometry(); + TQRect new_geom = geometry(); TQRect tmp_rect_x( new_geom.left(), 0, new_geom.width(), 0 ); TQRect tmp_area_x( area.left(), 0, area.width(), 0 ); checkDirection( workarea_diff_x, old_diff_x, tmp_rect_x, tmp_area_x ); @@ -1000,7 +1000,7 @@ void Client::checkWorkspacePosition() if( old_diff_y != INT_MAX && old_diff_y > 0 ) final_geom.moveBottom( area.bottom() - ( old_diff_y - 1 )); } - if( final_geom != tqgeometry() ) + if( final_geom != geometry() ) setGeometry( final_geom ); // updateWorkareaDiffs(); done already by setGeometry() } @@ -1122,7 +1122,7 @@ TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool nofra TQSize max_size = maxSize(); if( decoration != NULL ) { - TQSize decominsize = decoration->tqminimumSize(); + TQSize decominsize = decoration->minimumSize(); 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()); @@ -1341,17 +1341,17 @@ void Client::getWmNormalHints() TQSize new_size = adjustedSize(); if( new_size != size() && !isFullScreen()) { - TQRect orig_tqgeometry = tqgeometry(); + TQRect orig_geometry = geometry(); resizeWithChecks( new_size ); if( ( !isSpecialWindow() || isToolbar()) && !isFullScreen()) { // try to keep the window in its xinerama screen if possible, // if that fails at least keep it visible somewhere TQRect area = workspace()->clientArea( MovementArea, this ); - if( area.tqcontains( orig_tqgeometry )) + if( area.contains( orig_geometry )) keepInArea( area ); area = workspace()->clientArea( WorkArea, this ); - if( area.tqcontains( orig_tqgeometry )) + if( area.contains( orig_geometry )) keepInArea( area ); } } @@ -1458,16 +1458,16 @@ const TQPoint Client::calculateGravitation( bool invert, int gravity ) const return TQPoint( x() - dx, y() - dy ); } -void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, int gravity, bool from_tool ) +void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, int gravity, bool from_tool ) { if( gravity == 0 ) // default (nonsense) value for the argument gravity = xSizeHint.win_gravity; - if( value_tqmask & ( CWX | CWY )) + if( value_mask & ( CWX | CWY )) { TQPoint new_pos = calculateGravitation( true, gravity ); // undo gravitation - if ( value_tqmask & CWX ) + if ( value_mask & CWX ) new_pos.setX( rx ); - if ( value_tqmask & CWY ) + if ( value_mask & CWY ) new_pos.setY( ry ); // clever(?) workaround for applications like xv that want to set @@ -1483,9 +1483,9 @@ void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, int nw = clientSize().width(); int nh = clientSize().height(); - if ( value_tqmask & CWWidth ) + if ( value_mask & CWWidth ) nw = rw; - if ( value_tqmask & CWHeight ) + if ( value_mask & CWHeight ) nh = rh; TQSize ns = sizeForClientSize( TQSize( nw, nh ) ); new_pos = rules()->checkPosition( new_pos ); @@ -1494,7 +1494,7 @@ void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, if ( maximizeMode() != MaximizeFull || ns != size()) { - TQRect orig_tqgeometry = tqgeometry(); + TQRect orig_geometry = geometry(); GeometryUpdatesPostponer blocker( this ); move( new_pos ); plainResize( ns ); @@ -1502,7 +1502,7 @@ void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, updateFullScreenHack( TQRect( new_pos, TQSize( nw, nh ))); TQRect area = workspace()->clientArea( WorkArea, this ); if( !from_tool && ( !isSpecialWindow() || isToolbar()) && !isFullScreen() - && area.tqcontains( orig_tqgeometry )) + && area.contains( orig_geometry )) keepInArea( area ); // this is part of the kicker-xinerama-hack... it should be @@ -1514,20 +1514,20 @@ void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, } } - if ( value_tqmask & (CWWidth | CWHeight ) - && ! ( value_tqmask & ( CWX | CWY )) ) // pure resize + if ( value_mask & (CWWidth | CWHeight ) + && ! ( value_mask & ( CWX | CWY )) ) // pure resize { int nw = clientSize().width(); int nh = clientSize().height(); - if ( value_tqmask & CWWidth ) + if ( value_mask & CWWidth ) nw = rw; - if ( value_tqmask & CWHeight ) + if ( value_mask & CWHeight ) nh = rh; TQSize ns = sizeForClientSize( TQSize( nw, nh ) ); if( ns != size()) // don't restore if some app sets its own size again { - TQRect orig_tqgeometry = tqgeometry(); + TQRect orig_geometry = geometry(); GeometryUpdatesPostponer blocker( this ); int save_gravity = xSizeHint.win_gravity; xSizeHint.win_gravity = gravity; @@ -1539,28 +1539,28 @@ void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, // try to keep the window in its xinerama screen if possible, // if that fails at least keep it visible somewhere TQRect area = workspace()->clientArea( MovementArea, this ); - if( area.tqcontains( orig_tqgeometry )) + if( area.contains( orig_geometry )) keepInArea( area ); area = workspace()->clientArea( WorkArea, this ); - if( area.tqcontains( orig_tqgeometry )) + if( area.contains( orig_geometry )) keepInArea( area ); } } } // No need to send synthetic configure notify event here, either it's sent together - // with tqgeometry change, or there's no need to send it. + // with geometry change, or there's no need to send it. // Handling of the real ConfigureRequest event forces sending it, as there it's necessary. } void Client::resizeWithChecks( int w, int h, ForceGeometry_t force ) { - if( shade_tqgeometry_change ) + if( shade_geometry_change ) assert( false ); else if( isShade()) { if( h == border_top + border_bottom ) { - kdWarning() << "Shaded tqgeometry passed for size:" << endl; + kdWarning() << "Shaded geometry passed for size:" << endl; kdWarning() << kdBacktrace() << endl; } } @@ -1637,16 +1637,16 @@ void Client::resizeWithChecks( int w, int h, ForceGeometry_t force ) void Client::NETMoveResizeWindow( int flags, int x, int y, int width, int height ) { int gravity = flags & 0xff; - int value_tqmask = 0; + int value_mask = 0; if( flags & ( 1 << 8 )) - value_tqmask |= CWX; + value_mask |= CWX; if( flags & ( 1 << 9 )) - value_tqmask |= CWY; + value_mask |= CWY; if( flags & ( 1 << 10 )) - value_tqmask |= CWWidth; + value_mask |= CWWidth; if( flags & ( 1 << 11 )) - value_tqmask |= CWHeight; - configureRequest( value_tqmask, x, y, width, height, gravity, true ); + value_mask |= CWHeight; + configureRequest( value_mask, x, y, width, height, gravity, true ); } /*! @@ -1719,23 +1719,23 @@ bool Client::isMaximizable() const void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force ) { // this code is also duplicated in Client::plainResize() - // Ok, the shading tqgeometry stuff. Generally, code doesn't care about shaded tqgeometry, - // simply because there are too many places dealing with tqgeometry. Those places - // ignore shaded state and use normal tqgeometry, which they usually should get - // from adjustedSize(). Such tqgeometry comes here, and if the window is shaded, - // the tqgeometry is used only for client_size, since that one is not used when - // shading. Then the frame tqgeometry is adjusted for the shaded tqgeometry. + // Ok, the shading geometry stuff. Generally, code doesn't care about shaded geometry, + // simply because there are too many places dealing with geometry. Those places + // ignore shaded state and use normal geometry, which they usually should get + // from adjustedSize(). Such geometry comes here, and if the window is shaded, + // the geometry is used only for client_size, since that one is not used when + // shading. Then the frame geometry is adjusted for the shaded geometry. // This gets more complicated in the case the code does only something like - // setGeometry( tqgeometry()) - tqgeometry() will return the shaded frame tqgeometry. + // setGeometry( geometry()) - geometry() will return the shaded frame geometry. // Such code is wrong and should be changed to handle the case when the window is shaded, // for example using Client::clientSize(). - if( shade_tqgeometry_change ) + if( shade_geometry_change ) ; // nothing else if( isShade()) { if( h == border_top + border_bottom ) { - kdDebug() << "Shaded tqgeometry passed for size:" << endl; + kdDebug() << "Shaded geometry passed for size:" << endl; kdDebug() << kdBacktrace() << endl; } else @@ -1748,13 +1748,13 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force ) { client_size = TQSize( w - border_left - border_right, h - border_top - border_bottom ); } - if( force == NormalGeometrySet && frame_tqgeometry == TQRect( x, y, w, h )) + if( force == NormalGeometrySet && frame_geometry == TQRect( x, y, w, h )) return; - frame_tqgeometry = TQRect( x, y, w, h ); + frame_geometry = TQRect( x, y, w, h ); updateWorkareaDiffs(); - if( postpone_tqgeometry_updates != 0 ) + if( postpone_geometry_updates != 0 ) { - pending_tqgeometry_update = true; + pending_geometry_update = true; return; } resizeDecoration( TQSize( w, h )); @@ -1779,13 +1779,13 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force ) void Client::plainResize( int w, int h, ForceGeometry_t force ) { // this code is also duplicated in Client::setGeometry(), and it's also commented there - if( shade_tqgeometry_change ) + if( shade_geometry_change ) ; // nothing else if( isShade()) { if( h == border_top + border_bottom ) { - kdDebug() << "Shaded tqgeometry passed for size:" << endl; + kdDebug() << "Shaded geometry passed for size:" << endl; kdDebug() << kdBacktrace() << endl; } else @@ -1803,13 +1803,13 @@ void Client::plainResize( int w, int h, ForceGeometry_t force ) kdDebug() << "forced size fail:" << TQSize( w,h ) << ":" << rules()->checkSize( TQSize( w, h )) << endl; kdDebug() << kdBacktrace() << endl; } - if( force == NormalGeometrySet && frame_tqgeometry.size() == TQSize( w, h )) + if( force == NormalGeometrySet && frame_geometry.size() == TQSize( w, h )) return; - frame_tqgeometry.setSize( TQSize( w, h )); + frame_geometry.setSize( TQSize( w, h )); updateWorkareaDiffs(); - if( postpone_tqgeometry_updates != 0 ) + if( postpone_geometry_updates != 0 ) { - pending_tqgeometry_update = true; + pending_geometry_update = true; return; } resizeDecoration( TQSize( w, h )); @@ -1835,13 +1835,13 @@ void Client::plainResize( int w, int h, ForceGeometry_t force ) */ void Client::move( int x, int y, ForceGeometry_t force ) { - if( force == NormalGeometrySet && frame_tqgeometry.topLeft() == TQPoint( x, y )) + if( force == NormalGeometrySet && frame_geometry.topLeft() == TQPoint( x, y )) return; - frame_tqgeometry.moveTopLeft( TQPoint( x, y )); + frame_geometry.moveTopLeft( TQPoint( x, y )); updateWorkareaDiffs(); - if( postpone_tqgeometry_updates != 0 ) + if( postpone_geometry_updates != 0 ) { - pending_tqgeometry_update = true; + pending_geometry_update = true; return; } XMoveWindow( qt_xdisplay(), frameId(), x, y ); @@ -1856,21 +1856,21 @@ void Client::postponeGeometryUpdates( bool postpone ) { if( postpone ) { - if( postpone_tqgeometry_updates == 0 ) - pending_tqgeometry_update = false; - ++postpone_tqgeometry_updates; + if( postpone_geometry_updates == 0 ) + pending_geometry_update = false; + ++postpone_geometry_updates; } else { - if( --postpone_tqgeometry_updates == 0 ) + if( --postpone_geometry_updates == 0 ) { - if( pending_tqgeometry_update ) + if( pending_geometry_update ) { if( isShade()) setGeometry( TQRect( pos(), adjustedSize()), ForceGeometrySet ); else - setGeometry( tqgeometry(), ForceGeometrySet ); - pending_tqgeometry_update = false; + setGeometry( geometry(), ForceGeometrySet ); + pending_geometry_update = false; } } } @@ -2003,7 +2003,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust ) case MaximizeRestore: { - TQRect restore = tqgeometry(); + TQRect restore = geometry(); // when only partially maximized, geom_restore may not have the other dimension remembered if( old_mode & MaximizeVertical ) { @@ -2024,7 +2024,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust ) s.setHeight( geom_restore.height()); plainResize( adjustedSize( s )); workspace()->placeSmart( this, clientArea ); - restore = tqgeometry(); + restore = geometry(); if( geom_restore.width() > 0 ) restore.moveLeft( geom_restore.x()); if( geom_restore.height() > 0 ) @@ -2073,7 +2073,7 @@ void Client::resetMaximize() if( isShade()) setGeometry( TQRect( pos(), sizeForClientSize( clientSize())), ForceGeometrySet ); else - setGeometry( tqgeometry(), ForceGeometrySet ); + setGeometry( geometry(), ForceGeometrySet ); if( decoration != NULL ) decoration->maximizeChange(); } @@ -2096,7 +2096,7 @@ void Client::checkMaximizeGeometry() } ++recursion_protection; TQRect max_area = workspace()->clientArea( MaximizeArea, this ); - if( tqgeometry() == max_area ) + if( geometry() == max_area ) { if( max_mode != MaximizeFull ) maximize( MaximizeFull ); @@ -2113,7 +2113,7 @@ void Client::checkMaximizeGeometry() } else if( max_mode != MaximizeRestore ) { - resetMaximize(); // not maximize( MaximizeRestore ), that'd change tqgeometry - this is called from setGeometry() + resetMaximize(); // not maximize( MaximizeRestore ), that'd change geometry - this is called from setGeometry() } --recursion_protection; } @@ -2126,7 +2126,7 @@ bool Client::isFullScreenable( bool fullscreen_hack ) const return isNormalWindow(); if( rules()->checkStrictGeometry( false )) { - // the app wouldn't fit exactly fullscreen tqgeometry due its strict tqgeometry requirements + // the app wouldn't fit exactly fullscreen geometry due its strict geometry requirements TQRect fsarea = workspace()->clientArea( FullScreenArea, this ); if( sizeForClientSize( fsarea.size(), SizemodeAny, true ) != fsarea.size()) return false; @@ -2158,7 +2158,7 @@ void Client::setFullScreen( bool set, bool user ) setShade( ShadeNone ); bool was_fs = isFullScreen(); if( !was_fs ) - geom_fs_restore = tqgeometry(); + geom_fs_restore = geometry(); fullscreen_mode = set ? FullScreenNormal : FullScreenNone; if( was_fs == isFullScreen()) return; @@ -2184,7 +2184,7 @@ void Client::setFullScreen( bool set, bool user ) int Client::checkFullScreenHack( const TQRect& geom ) const { - // if it's noborder window, and has size of one screen or the whole desktop tqgeometry, it's fullscreen hack + // if it's noborder window, and has size of one screen or the whole desktop geometry, it's fullscreen hack if( noBorder() && !isUserNoBorder() && isFullScreenable( true )) { if( geom.size() == workspace()->clientArea( FullArea, geom.center(), desktop()).size()) @@ -2217,14 +2217,14 @@ void Client::updateFullScreenHack( const TQRect& geom ) { fullscreen_mode = FullScreenNone; updateDecoration( false, false ); - // whoever called this must setup correct tqgeometry + // whoever called this must setup correct geometry } StackingUpdatesBlocker blocker( workspace()); workspace()->updateClientLayer( this ); // active fullscreens get different layer } static TQRect* visible_bound = 0; -static GeometryTip* tqgeometryTip = 0; +static GeometryTip* geometryTip = 0; void Client::drawbound( const TQRect& geom ) { @@ -2271,22 +2271,22 @@ void Client::positionGeometryTip() // Position and Size display if (options->showGeometryTip()) { - if( !tqgeometryTip ) + if( !geometryTip ) { // save under is not necessary with opaque, and seem to make things slower bool save_under = ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque ) || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque ); - tqgeometryTip = new GeometryTip( &xSizeHint, save_under ); + geometryTip = new GeometryTip( &xSizeHint, save_under ); } TQRect wgeom( moveResizeGeom ); // position of the frame, size of the window itself wgeom.setWidth( wgeom.width() - ( width() - clientSize().width())); wgeom.setHeight( wgeom.height() - ( height() - clientSize().height())); if( isShade()) wgeom.setHeight( 0 ); - tqgeometryTip->setGeometry( wgeom ); - if( !tqgeometryTip->isVisible()) + geometryTip->setGeometry( wgeom ); + if( !geometryTip->isVisible()) { - tqgeometryTip->show(); - tqgeometryTip->raise(); + geometryTip->show(); + geometryTip->raise(); } } } @@ -2296,7 +2296,7 @@ class EatAllPaintEvents { protected: virtual bool eventFilter( TQObject* o, TQEvent* e ) - { return e->type() == TQEvent::Paint && o != tqgeometryTip; } + { return e->type() == TQEvent::Paint && o != geometryTip; } }; static EatAllPaintEvents* eater = 0; @@ -2334,7 +2334,7 @@ bool Client::startMoveResize() removeShadow(); moveResizeMode = true; workspace()->setClientIsMoving(this); - initialMoveResizeGeom = moveResizeGeom = tqgeometry(); + initialMoveResizeGeom = moveResizeGeom = geometry(); checkUnrestrictedMoveResize(); // rule out non opaque windows from useless translucency settings, maybe resizes? if ((isResize() && options->removeShadowsOnResize) || (isMove() && options->removeShadowsOnMove)) @@ -2352,7 +2352,7 @@ bool Client::startMoveResize() // unfortunately, that's not completely true, Qt may generate // paint events on some widgets due to FocusIn(?) // eat them, otherwise XOR painting will be broken (#58054) - // paint events for the tqgeometrytip need to be allowed, though + // paint events for the geometrytip need to be allowed, though eater = new EatAllPaintEvents; // not needed anymore? kapp->installEventFilter( eater ); } @@ -2380,11 +2380,11 @@ void Client::leaveMoveResize() if ((isResize() && options->removeShadowsOnResize) || (isMove() && options->removeShadowsOnMove)) updateShadowSize(); clearbound(); - if (tqgeometryTip) + if (geometryTip) { - tqgeometryTip->hide(); - delete tqgeometryTip; - tqgeometryTip = NULL; + geometryTip->hide(); + delete geometryTip; + geometryTip = NULL; } if ( ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque ) || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque ) ) @@ -2479,7 +2479,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root ) setShade( ShadeNone ); TQPoint globalPos( x_root, y_root ); - // these two points limit the tqgeometry rectangle, i.e. if bottomleft resizing is done, + // these two points limit the geometry rectangle, i.e. if bottomleft resizing is done, // the bottomleft corner should be at is at (topleft.x(), bottomright().y()) TQPoint topleft = globalPos - moveOffset; TQPoint bottomright = globalPos + invertedMoveOffset; @@ -2636,10 +2636,10 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root ) else if( rules()->checkMoveResizeMode ( isResize() ? options->resizeMode : options->moveMode ) == Options::Transparent ) { - clearbound(); // it's necessary to move the tqgeometry tip when there's no outline - positionGeometryTip(); // shown, otherwise it would cause tqrepaint problems in case + clearbound(); // it's necessary to move the geometry tip when there's no outline + positionGeometryTip(); // shown, otherwise it would cause repaint problems in case drawbound( moveResizeGeom ); // they overlap; the paint event will come after this, - } // so the tqgeometry tip will be painted above the outline + } // so the geometry tip will be painted above the outline } if ( isMove() ) workspace()->clientMoved(globalPos, qt_x_time); diff --git a/kwin/geometrytip.cpp b/kwin/geometrytip.cpp index c2606e3aa..8577abfbc 100644 --- a/kwin/geometrytip.cpp +++ b/kwin/geometrytip.cpp @@ -14,14 +14,14 @@ namespace KWinInternal { GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ): - TQLabel(NULL, "kwintqgeometry" ) + TQLabel(NULL, "kwingeometry" ) { setMargin(1); setIndent(0); setLineWidth(1); setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel ); - tqsetAlignment( AlignCenter | AlignTop ); - tqsizeHints = xSizeHints; + setAlignment( AlignCenter | AlignTop ); + sizeHints = xSizeHints; if( save_under ) { XSetWindowAttributes attr; @@ -39,12 +39,12 @@ void GeometryTip::setGeometry( const TQRect& geom ) int w = geom.width(); int h = geom.height(); - if (tqsizeHints) + if (sizeHints) { - if (tqsizeHints->flags & PResizeInc) + if (sizeHints->flags & PResizeInc) { - w = ( w - tqsizeHints->base_width ) / tqsizeHints->width_inc; - h = ( h - tqsizeHints->base_height ) / tqsizeHints->height_inc; + w = ( w - sizeHints->base_width ) / sizeHints->width_inc; + h = ( h - sizeHints->base_height ) / sizeHints->height_inc; } } diff --git a/kwin/geometrytip.h b/kwin/geometrytip.h index 8a05b53fd..6dac49f2f 100644 --- a/kwin/geometrytip.h +++ b/kwin/geometrytip.h @@ -26,7 +26,7 @@ class GeometryTip: public QLabel void setGeometry( const TQRect& geom ); private: - const XSizeHints* tqsizeHints; + const XSizeHints* sizeHints; }; } // namespace diff --git a/kwin/group.cpp b/kwin/group.cpp index b8fc9acef..0d543dc4a 100644 --- a/kwin/group.cpp +++ b/kwin/group.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to window grouping. + This file contains things relevant to window grouping. */ @@ -64,7 +64,7 @@ bool performTransiencyCheck() kdDebug() << "TC: " << *it1 << " in not in a group" << endl; ret = false; } - else if( !(*it1)->in_group->members().tqcontains( *it1 )) + else if( !(*it1)->in_group->members().contains( *it1 )) { kdDebug() << "TC: " << *it1 << " has a group " << (*it1)->in_group << " but group does not contain it" << endl; ret = false; @@ -85,15 +85,15 @@ bool performTransiencyCheck() ++it2 ) { if( transiencyCheckNonExistent - && !Workspace::self()->clients.tqcontains( *it2 ) - && !Workspace::self()->desktops.tqcontains( *it2 )) + && !Workspace::self()->clients.contains( *it2 ) + && !Workspace::self()->desktops.contains( *it2 )) { kdDebug() << "TC:" << *it1 << " has non-existent main client " << endl; kdDebug() << "TC2:" << *it2 << endl; // this may crash ret = false; continue; } - if( !(*it2)->transients_list.tqcontains( *it1 )) + if( !(*it2)->transients_list.contains( *it1 )) { kdDebug() << "TC:" << *it1 << " has main client " << *it2 << " but main client does not have it as a transient" << endl; ret = false; @@ -106,15 +106,15 @@ bool performTransiencyCheck() ++it2 ) { if( transiencyCheckNonExistent - && !Workspace::self()->clients.tqcontains( *it2 ) - && !Workspace::self()->desktops.tqcontains( *it2 )) + && !Workspace::self()->clients.contains( *it2 ) + && !Workspace::self()->desktops.contains( *it2 )) { kdDebug() << "TC:" << *it1 << " has non-existent transient " << endl; kdDebug() << "TC2:" << *it2 << endl; // this may crash ret = false; continue; } - if( !(*it2)->mainClients().tqcontains( *it1 )) + if( !(*it2)->mainClients().contains( *it1 )) { kdDebug() << "TC:" << *it1 << " has transient " << *it2 << " but transient does not have it as a main client" << endl; ret = false; @@ -133,7 +133,7 @@ bool performTransiencyCheck() { if( (*it2)->in_group != *it1 ) { - kdDebug() << "TC: Group " << *it1 << " tqcontains client " << *it2 << " but client is not in that group" << endl; + kdDebug() << "TC: Group " << *it1 << " contains client " << *it2 << " but client is not in that group" << endl; ret = false; } } @@ -259,7 +259,7 @@ void Group::removeMember( Client* member_P ) TRANSIENCY_CHECK( member_P ); // kdDebug() << "GROUPREMOVE:" << this << ":" << member_P << endl; // kdDebug() << kdBacktrace() << endl; - Q_ASSERT( _members.tqcontains( member_P )); + Q_ASSERT( _members.contains( member_P )); _members.remove( member_P ); // there are cases when automatic deleting of groups must be delayed, // e.g. when removing a member and doing some operation on the possibly @@ -294,7 +294,7 @@ void Group::gotLeader( Client* leader_P ) void Group::lostLeader() { - assert( !_members.tqcontains( leader_client )); + assert( !_members.contains( leader_client )); leader_client = NULL; if( _members.isEmpty()) { @@ -430,8 +430,8 @@ void Workspace::checkTransients( Window w ) bool Client::resourceMatch( const Client* c1, const Client* c2 ) { // xv has "xv" as resource name, and different strings starting with "XV" as resource class - if( tqstrncmp( c1->resourceClass(), "xv", 2 ) == 0 && c1->resourceName() == "xv" ) - return tqstrncmp( c2->resourceClass(), "xv", 2 ) == 0 && c2->resourceName() == "xv"; + if( qstrncmp( c1->resourceClass(), "xv", 2 ) == 0 && c1->resourceName() == "xv" ) + return qstrncmp( c2->resourceClass(), "xv", 2 ) == 0 && c2->resourceName() == "xv"; // Mozilla has "Mozilla" as resource name, and different strings as resource class if( c1->resourceName() == "mozilla" ) return c2->resourceName() == "mozilla"; @@ -835,7 +835,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined ) void Client::addTransient( Client* cl ) { TRANSIENCY_CHECK( this ); - assert( !transients_list.tqcontains( cl )); + assert( !transients_list.contains( cl )); // assert( !cl->hasTransient( this, true )); will be fixed in checkGroupTransients() assert( cl != this ); transients_list.append( cl ); @@ -893,7 +893,7 @@ bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientL return true; if( !indirect ) return false; - if( set.tqcontains( cl )) + if( set.contains( cl )) return false; set.append( cl ); return hasTransientInternal( cl->transientFor(), indirect, set ); @@ -903,11 +903,11 @@ bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientL if( group() != cl->group()) return false; // cl is group transient, search from top - if( transients().tqcontains( const_cast< Client* >( cl ))) + if( transients().contains( const_cast< Client* >( cl ))) return true; if( !indirect ) return false; - if( set.tqcontains( this )) + if( set.contains( this )) return false; set.append( this ); for( ClientList::ConstIterator it = transients().begin(); diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp index 42c618bd2..5d1d96d85 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.cpp +++ b/kwin/kcmkwin/kwindecoration/buttons.cpp @@ -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.tqunicode(); + stream << btn.type.unicode(); 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) { - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); setResizeMode(TQListView::AllColumns); setDragEnabled(true); @@ -140,19 +140,19 @@ ButtonSource::~ButtonSource() { } -TQSize ButtonSource::tqsizeHint() const +TQSize ButtonSource::sizeHint() const { - // make the tqsizeHint height a bit smaller than the one of TQListView... + // make the sizeHint height a bit smaller than the one of TQListView... if ( cachedSizeHint().isValid() ) return cachedSizeHint(); constPolish(); - TQSize s( header()->tqsizeHint() ); + TQSize s( header()->sizeHint() ); if ( verticalScrollBar()->isVisible() ) - s.setWidth( s.width() + style().tqpixelMetric(TQStyle::PM_ScrollBarExtent) ); + s.setWidth( s.width() + style().pixelMetric(TQStyle::PM_ScrollBarExtent) ); s += TQSize(frameWidth()*2,frameWidth()*2); // size hint: 4 lines of text... @@ -218,7 +218,7 @@ TQDragObject *ButtonSource::dragObject() if (i) { ButtonDrag *bd = new ButtonDrag(i->button(), viewport(), "button_drag"); - bd->setPixmap(bitmapPixmap(i->button().icon, tqcolorGroup().foreground() )); + bd->setPixmap(bitmapPixmap(i->button().icon, colorGroup().foreground() )); return bd; } @@ -306,15 +306,15 @@ void ButtonDropSite::clearRight() void ButtonDropSite::dragMoveEvent( TQDragMoveEvent* e ) { TQPoint p = e->pos(); - if (leftDropArea().tqcontains(p) || rightDropArea().tqcontains(p) || buttonAt(p) ) { + if (leftDropArea().contains(p) || rightDropArea().contains(p) || buttonAt(p) ) { e->accept(); // 2 pixel wide drop visualizer... TQRect r = contentsRect(); int x = -1; - if (leftDropArea().tqcontains(p) ) { + if (leftDropArea().contains(p) ) { x = leftDropArea().left(); - } else if (rightDropArea().tqcontains(p) ) { + } else if (rightDropArea().contains(p) ) { x = rightDropArea().right()+1; } else { ButtonDropSiteItem *item = buttonAt(p); @@ -373,10 +373,10 @@ void ButtonDropSite::dropEvent( TQDropEvent* e ) ButtonList *buttonList = 0; ButtonList::iterator buttonPosition; - if (leftDropArea().tqcontains(p) ) { + if (leftDropArea().contains(p) ) { buttonList = &buttonsLeft; buttonPosition = buttonsLeft.end(); - } else if (rightDropArea().tqcontains(p) ) { + } else if (rightDropArea().contains(p) ) { buttonList = &buttonsRight; buttonPosition = buttonsRight.begin(); } else { @@ -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, tqcolorGroup().foreground() ) ); + bd->setPixmap(bitmapPixmap(m_selected->button().icon, colorGroup().foreground() ) ); bd->dragMove(); } } @@ -501,7 +501,7 @@ void ButtonDropSite::recalcItemGeometry() { TQRect r = contentsRect(); - // update the tqgeometry of the items in the left button list + // update the geometry of the items in the left button list int offset = r.left(); for (ButtonList::const_iterator it = buttonsLeft.begin(); it != buttonsLeft.end(); ++it) { int w = (*it)->width(); @@ -521,14 +521,14 @@ void ButtonDropSite::recalcItemGeometry() ButtonDropSiteItem *ButtonDropSite::buttonAt(TQPoint p) { // try to find the item in the left button list for (ButtonList::const_iterator it = buttonsLeft.begin(); it != buttonsLeft.end(); ++it) { - if ( (*it)->rect.tqcontains(p) ) { + if ( (*it)->rect.contains(p) ) { return *it; } } // try to find the item in the right button list for (ButtonList::const_iterator it = buttonsRight.begin(); it != buttonsRight.end(); ++it) { - if ( (*it)->rect.tqcontains(p) ) { + if ( (*it)->rect.contains(p) ) { return *it; } } @@ -572,7 +572,7 @@ bool ButtonDropSite::removeSelectedButton() delete m_selected; m_selected = 0; recalcItemGeometry(); - update(); // tqrepaint... + update(); // repaint... } 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 tqitemRect = (*it)->rect; - if (tqitemRect.isValid() ) { - (*it)->draw(p, tqcolorGroup(), tqitemRect); + TQRect itemRect = (*it)->rect; + if (itemRect.isValid() ) { + (*it)->draw(p, colorGroup(), itemRect); } offset += (*it)->width(); } @@ -610,7 +610,7 @@ void ButtonDropSite::drawContents( TQPainter* p ) p->setFont( TQFont( KGlobalSettings::generalFont().family(), 12, TQFont::Bold) ); p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") ); - offset = tqgeometry().width() - 3 - rightoffset; + offset = geometry().width() - 3 - rightoffset; drawButtonList( p, buttonsRight, offset ); if (m_oldDropVisualizer.isValid() ) @@ -674,20 +674,20 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name) : TQWidget(parent,name), m_factory(0) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); TQLabel* label = new TQLabel( this ); m_dropSite = new ButtonDropSite( this ); - label->tqsetAlignment( int( TQLabel::WordBreak ) ); + label->setAlignment( 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.") ); m_buttonSource = new ButtonSource(this, "button_source"); - tqlayout->addWidget(label); - tqlayout->addWidget(m_dropSite); - tqlayout->addWidget(m_buttonSource); + layout->addWidget(label); + layout->addWidget(m_dropSite); + layout->addWidget(m_buttonSource); connect( m_dropSite, TQT_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQT_SLOT(hideButton(TQChar)) ); connect( m_dropSite, TQT_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQT_SLOT(showButton(TQChar)) ); @@ -761,7 +761,7 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory) ButtonSourceItem *i = dynamic_cast<ButtonSourceItem*>(it.current() ); if (i) { Button b = i->button(); - b.supported = m_supportedButtons.tqcontains(b.type); + b.supported = m_supportedButtons.contains(b.type); i->setButton(b); } ++it; @@ -777,47 +777,47 @@ Button ButtonPositionWidget::getButton(TQChar type, bool& success) { if (type == 'R') { TQBitmap bmp(resize_width, resize_height, resize_bits, true); bmp.setMask(bmp); - return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.tqcontains('R') ); + return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.contains('R') ); } else if (type == 'L') { TQBitmap bmp(shade_width, shade_height, shade_bits, true); bmp.setMask(bmp); - return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.tqcontains('L') ); + return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.contains('L') ); } else if (type == 'B') { TQBitmap bmp(keepbelowothers_width, keepbelowothers_height, keepbelowothers_bits, true); bmp.setMask(bmp); - return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.tqcontains('B') ); + return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.contains('B') ); } else if (type == 'F') { TQBitmap bmp(keepaboveothers_width, keepaboveothers_height, keepaboveothers_bits, true); bmp.setMask(bmp); - return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.tqcontains('F') ); + return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.contains('F') ); } else if (type == 'X') { TQBitmap bmp(close_width, close_height, close_bits, true); bmp.setMask(bmp); - return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.tqcontains('X') ); + return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.contains('X') ); } else if (type == 'A') { TQBitmap bmp(maximize_width, maximize_height, maximize_bits, true); bmp.setMask(bmp); - return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.tqcontains('A') ); + return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.contains('A') ); } else if (type == 'I') { TQBitmap bmp(minimize_width, minimize_height, minimize_bits, true); bmp.setMask(bmp); - return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.tqcontains('I') ); + return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.contains('I') ); } else if (type == 'H') { TQBitmap bmp(help_width, help_height, help_bits, true); bmp.setMask(bmp); - return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.tqcontains('H') ); + return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.contains('H') ); } else if (type == 'S') { TQBitmap bmp(onalldesktops_width, onalldesktops_height, onalldesktops_bits, true); bmp.setMask(bmp); - return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.tqcontains('S') ); + return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.contains('S') ); } else if (type == 'M') { TQBitmap bmp(menu_width, menu_height, menu_bits, true); bmp.setMask(bmp); - return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.tqcontains('M') ); + return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.contains('M') ); } else if (type == '_') { TQBitmap bmp(spacer_width, spacer_height, spacer_bits, true); bmp.setMask(bmp); - return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.tqcontains('_') ); + return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.contains('_') ); } else { success = false; return Button(); diff --git a/kwin/kcmkwin/kwindecoration/buttons.h b/kwin/kcmkwin/kwindecoration/buttons.h index 8786e4e23..0fcbff085 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.h +++ b/kwin/kcmkwin/kwindecoration/buttons.h @@ -117,7 +117,7 @@ class ButtonSource : public KListView ButtonSource(TQWidget *parent = 0, const char* name = 0); virtual ~ButtonSource(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void hideAllButtons(); void showAllButtons(); diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp index 33714ee08..193450086 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp @@ -75,14 +75,14 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c kwinConfig.setGroup("Style"); plugins = new KDecorationPreviewPlugins( &kwinConfig ); - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); // Save this for later... // cbUseMiniWindows = new TQCheckBox( i18n( "Render mini &titlebars for all windows"), checkGroup ); // TQWhatsThis::add( cbUseMiniWindows, i18n( "Note that this option is not available on all styles yet!" ) ); tabWidget = new TQTabWidget( this ); - tqlayout->addWidget( tabWidget ); + layout->addWidget( tabWidget ); // Page 1 (General Options) TQWidget *pluginPage = new TQWidget( tabWidget ); @@ -99,8 +99,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage ); pluginSettingsGrp->setColumnLayout( 0, Vertical ); pluginSettingsGrp->setFlat( true ); - pluginSettingsGrp->tqlayout()->setMargin( 0 ); - pluginSettingsGrp->tqlayout()->setSpacing( KDialog::spacingHint() ); + pluginSettingsGrp->layout()->setMargin( 0 ); + pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() ); pluginLayout->addWidget( pluginSettingsGrp ); pluginLayout->addStretch(); @@ -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->tqlayout() ); + TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() ); borderSizeLayout->addWidget(lBorder); borderSizeLayout->addWidget(cBorder); borderSizeLayout->addStretch(); pluginConfigWidget = new TQVBox(pluginSettingsGrp); - pluginSettingsGrp->tqlayout()->add( pluginConfigWidget ); + pluginSettingsGrp->layout()->add( pluginConfigWidget ); // Page 2 (Button Selector) TQWidget* buttonPage = new TQWidget( tabWidget ); @@ -148,14 +148,14 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c // buttonLayout->addStretch(); // preview - TQVBoxLayout* previewLayout = new TQVBoxLayout(tqlayout, KDialog::spacingHint() ); + TQVBoxLayout* previewLayout = new TQVBoxLayout(layout, KDialog::spacingHint() ); previewLayout->setMargin( KDialog::marginHint() ); preview = new KDecorationPreview( this ); previewLayout->addWidget(preview); - preview->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); - tabWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); // Page 3 (Window Shadows) TQHBox *inactiveShadowColourHBox, *shadowColourHBox; diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop index 9057a6bd4..3c5f12e6f 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop @@ -162,16 +162,16 @@ Comment[zh_CN]=配置窗口标题的观感 Comment[zh_TW]=設定視窗標題列的外觀與感覺 Comment[zu]=Hlanganisela ukubona kanye nokuzwa kwezihloko zama-window -Keywords=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration +Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration Keywords[ar]=kwin,نافذة,مسيير,الحافة,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,kwm,زخرفات Keywords[az]=kwin,pəncərə,idarəçi,kənar,tərz,örtü,görünüş,toxuma,yer,düymə,applet,kənar,kwm,dekorasiya,bəzək -Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration -Keywords[bg]=прозорец, декорация, заглавие, бутони, меню, kwin, window, manager, border, style, theme, look, feel, tqlayout, button, handle, edge, kwm, decoration +Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration +Keywords[bg]=прозорец, декорация, заглавие, бутони, меню, kwin, window, manager, border, style, theme, look, feel, layout, button, handle, edge, kwm, decoration Keywords[ca]=kwin,finestra,gestor,vora,estil,tema,aspecte,comportament,disposició,botó,nansa,marges,kwm,decoració Keywords[cs]=kwin,okno,správce,okraj,styl,motiv,vzhled,rozvržení,tlačítko,úchytka,hrana,kwm,dekorace Keywords[csb]=kwin,òkno,menedżer,zberk,sztél,téma,wëzdrzatk,ùchòwanié,ùstôw,knąpa,ùchwët,rańt,kwm,dekòracëjô Keywords[cy]=kwin,ffenestr,trefnydd,ymyl,arddull,thema,golwg,teimlad,haenlun,botwm,carn,kwm,addurniad -Keywords[da]=kwin,vindue,håndtering,kant,stil,tema,udseende,fornemmelse,tqlayout,knap,håndtag,kant,kwm,dekoration +Keywords[da]=kwin,vindue,håndtering,kant,stil,tema,udseende,fornemmelse,layout,knap,håndtag,kant,kwm,dekoration Keywords[de]=KWin,Kwm,Fenster,Manager,Rahmen,Design,Stile,Themes,Optik,Erscheinungsbild,Layout,Knöpfe,Ränder,Dekorationen Keywords[el]=kwin,παράθυρο,διαχειριστής,περίγραμμα,στυλ,θέμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειρισμός,άκρο,kwm,διακόσμηση Keywords[eo]=kwin,fenestro,administrilo,rando,stilo,etoso,aspekto,konduto,aranĝo,butono,eĝo,kwm,ornamo @@ -181,26 +181,26 @@ Keywords[eu]=kwin,leihoa,kudeatzailea,ertza,estiloa,gaia,itxura,antolaketa,botoi Keywords[fa]=kwin، پنجره، مدیر، لبه، سبک، چهره، ظاهر، احساس، طرحبندی، دکمه، گرداندن، لبه، kwm، تزئین Keywords[fi]=kwin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys Keywords[fr]=kwin,fenêtre,gestionnaire,bordure,style,thème,apparence,ergonomie,disposition,bouton,poignée,bord,kwm,décoration -Keywords[fy]=kwin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,tqlayout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear +Keywords[fy]=kwin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear Keywords[ga]=kwin,fuinneog,bainisteoir,imlíne,stíl,téama,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán Keywords[gl]=kwin,fiestra,xestor,beira,estilo,tema,apariencia,formato,botón,xestión,esquina,kwm,decoración -Keywords[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle, edge,kwm,decoration +Keywords[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, kwin,window,manager,border,style,theme,look,feel,layout,button,handle, edge,kwm,decoration Keywords[hi]=के-विन,विंडो,प्रबंधक,बार्डर,शैली,प्रसंग,रूप,अनुभव,ले-आउट,बटन,हैंडल,किनारा,केडबल्यूएम,सजावट -Keywords[hr]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras +Keywords[hr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras Keywords[hu]=KWin,ablak,kezelő,szegély,stílus,téma,kinézet,megjelenés,elrendezés,nyomógomb,fogantyú,perem,kwm,ablakstílus Keywords[is]=kwin,gluggi,gluggastjóri,gluggar,kantar,rammi,skreyting,þema,stíll,útlit,takki,kwm,skraut Keywords[it]=kwin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione Keywords[ja]=kwin,ウィンドウ,マネージャ,枠,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ハンドル,エッジ,kwm,装飾 Keywords[km]=kwin,បង្អួច,កម្មវិធីគ្រប់គ្រង,ស៊ុម,រចនាប័ទ្ម,ស្បែក,មុខងារ,ប្លង់,ប៊ូតុង,ការប្រើ,គែម,kwm,ការតុបតែង -Keywords[lt]=kwin,window,manager,border,style,theme,look,feel,tqlayout,buttons,handle,edge,kwm,decoration,langas,tvarkyklė,rėmelis,stilius,tema,žiūrėti,jausti,išdėstymas,mygtukai,kraštas,dekoracija +Keywords[lt]=kwin,window,manager,border,style,theme,look,feel,layout,buttons,handle,edge,kwm,decoration,langas,tvarkyklė,rėmelis,stilius,tema,žiūrėti,jausti,išdėstymas,mygtukai,kraštas,dekoracija Keywords[lv]=kwin, logs, menedžeris, rāmis, stils, tēma, skats, gars, izkārtojums, poga, rokturis, stūris, kwm, dekorācija -Keywords[mk]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација +Keywords[mk]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација Keywords[mn]=KWin,Kwm,Цонх,Manager,Хүрээ,Design,Хэлбэр,Загвар, Optik,Харагдалт,Layout,Товч,Өнцөг,Засал -Keywords[mt]=kwin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, tqlayout, tqassim, użu, button, handle, edge, kwm, decoration -Keywords[nb]=kwin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,tqlayout,knapp,kant,kwm,pynt,dekorasjon -Keywords[nds]=kwin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,tqlayout,Knoop,Greep,Rand,kwm,Dekoratschoon +Keywords[mt]=kwin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, layout, tqassim, użu, button, handle, edge, kwm, decoration +Keywords[nb]=kwin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,layout,knapp,kant,kwm,pynt,dekorasjon +Keywords[nds]=kwin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,layout,Knoop,Greep,Rand,kwm,Dekoratschoon Keywords[ne]=के विन,सञ्झ्याल, प्रबन्धक, किनारा, शैली, विषयवस्तु, हेराइ, बुझाइ, सजावट, बटन, ह्यान्डल, छेउ,kwm, सजावट -Keywords[nl]=kwin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, tqlayout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer +Keywords[nl]=kwin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer Keywords[nn]=kwin,vindauge,kant,bord,stil,tema,utsjånad,bunad,knapp,handtak,kwm,dekorasjon Keywords[nso]=kwin,window,molaodi,mollwane,mokgwa,molaetsa,tebelego,maikutlo,peakanyo,setobetswa,moswaro,nthla,kwm,kgabiso Keywords[pa]=kwin,handle,edge,kwm,decoration,ਝਰੋਖਾ,ਮੈਨੇਜਰ,ਹਾਸ਼ੀਆ,ਸ਼ੈਲੀ,ਸਰੂਪ,ਦਿੱਖ,ਖਾਕਾ,ਬਟਨ,ਹੈਂਡਲ,ਸਜਾਵਟ @@ -212,9 +212,9 @@ Keywords[rw]=kwin,idirishya,muyobozi,impera,imisusire,insanganyamatsiko,imboneko Keywords[se]=kwin,láse,gieđahalli,ravda,stiila,fáddá,fárda,dovdu,hápmi,boallu,geavja,ravda,kwm,hearva Keywords[sk]=kwin,okno,správa,okraj,štýl,téma,vzhľad,rozloženie,tlačidlo,hrana,kwm,dekorácia,oblasť Keywords[sl]=kwin,okno,upravitelj,rob,meja,slog,stil,tema,pogled,občutek,gumb,ročaj,rob,kwm,okrasek -Keywords[sr]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,стил,тема,изглед,дугме,хватаљка,декорација -Keywords[sr@Latn]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija -Keywords[sv]=kwin,fönster,hanterare,kant,stil,tema,utseende,känsla,tqlayout,knapp,hantera,kant,kwm,dekoration +Keywords[sr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,стил,тема,изглед,дугме,хватаљка,декорација +Keywords[sr@Latn]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija +Keywords[sv]=kwin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration Keywords[ta]=kwin,சாளரம்,மேலாளர்,விளிம்பு,பாணி,தலைப்பு,பார்வை,உணர்தல்,உருவரை,விசை,கையாள்,முனை,kwm,அலங்கரிப்பு Keywords[th]=kwin,หน้าต่าง,ตัวจัดการ,กรอบ,ลักษณะ,ชุดตกแต่ง,มองเห็น,รู้สึก,การจัดวาง,ปุ่ม,ที่จับ,ขอบ,kwm,การตกแต่ง Keywords[tr]=kwin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleşim,düğme,tutamaç,kenar,kwm,dekorasyon @@ -223,9 +223,9 @@ Keywords[uz]=kwin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koʻrinish Keywords[uz@cyrillic]=kwin,kwm,безак,ойна,бошқарувчи,усул,ташқи кўриниш Keywords[ven]=kwin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza Keywords[vi]=kwin,cửa sổ,quản lý,bờ,kiểu,sắc thái,ngoại hình,cảm nhận,sắp xếp,nút,điều khiển,cạnh,kwm,trang trí -Keywords[wa]=kwin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,tqlayout;loukance,boton,apougnî,costé,kwm,gåliotaedje +Keywords[wa]=kwin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,layout;loukance,boton,apougnî,costé,kwm,gåliotaedje Keywords[xh]=kwin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso -Keywords[zh_CN]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰 -Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾 +Keywords[zh_CN]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰 +Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾 Keywords[zu]=kwin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso Categories=Qt;KDE;X-KDE-settings-looknfeel; diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp index 0993720cf..c9a0174f4 100644 --- a/kwin/kcmkwin/kwindecoration/preview.cpp +++ b/kwin/kcmkwin/kwindecoration/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->tqsetAlignment( AlignCenter ); + no_preview->setAlignment( AlignCenter ); setMinimumSize( 100, 100 ); no_preview->resize( size()); @@ -109,7 +109,7 @@ void KDecorationPreview::positionPreviews() { int titleBarHeight, leftBorder, rightBorder, xoffset, dummy1, dummy2, dummy3; - TQRect tqgeometry; + TQRect geometry; TQSize size; no_preview->resize( this->size() ); @@ -127,15 +127,15 @@ void KDecorationPreview::positionPreviews() // Resize the active window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Active]->tqminimumSize() ); - tqgeometry = TQRect( TQPoint( 0, titleBarHeight ), size ); - deco[Active]->widget()->setGeometry( TQStyle::tqvisualRect( tqgeometry, this ) ); + .expandedTo( deco[Active]->minimumSize() ); + geometry = TQRect( TQPoint( 0, titleBarHeight ), size ); + deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); // Resize the inactive window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Inactive]->tqminimumSize() ); - tqgeometry = TQRect( TQPoint( xoffset, 0 ), size ); - deco[Inactive]->widget()->setGeometry( TQStyle::tqvisualRect( tqgeometry, this ) ); + .expandedTo( deco[Inactive]->minimumSize() ); + geometry = TQRect( TQPoint( xoffset, 0 ), size ); + deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); } void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active ) @@ -166,13 +166,13 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act delete[] xrects; } if( active ) - tqmask = reg; // keep tqshape of the active window for unobscuredRegion() + mask = reg; // keep shape of the active window for unobscuredRegion() } TQRect KDecorationPreview::windowGeometry( bool active ) const { TQWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget(); - return widget->tqgeometry(); + return widget->geometry(); } void KDecorationPreview::setTempBorderSize(KDecorationPlugins* plugin, KDecorationDefines::BorderSize size) @@ -214,7 +214,7 @@ TQRegion KDecorationPreview::unobscuredRegion( bool active, const TQRegion& r ) { // copied from KWin core's code TQRegion ret = r; - TQRegion r2 = tqmask; + TQRegion r2 = mask; if( r2.isEmpty()) r2 = TQRegion( windowGeometry( true )); r2.translate( windowGeometry( true ).x() - windowGeometry( false ).x(), @@ -356,7 +356,7 @@ bool KDecorationPreviewBridge::isPreview() const return true; } -TQRect KDecorationPreviewBridge::tqgeometry() const +TQRect KDecorationPreviewBridge::geometry() const { return preview->windowGeometry( active ); } diff --git a/kwin/kcmkwin/kwindecoration/preview.h b/kwin/kcmkwin/kwindecoration/preview.h index 002ec5de1..5604df587 100644 --- a/kwin/kcmkwin/kwindecoration/preview.h +++ b/kwin/kcmkwin/kwindecoration/preview.h @@ -57,7 +57,7 @@ class KDecorationPreview KDecorationPreviewBridge* bridge[NumWindows]; KDecoration* deco[NumWindows]; TQLabel* no_preview; - TQRegion tqmask; + TQRegion mask; }; class KDecorationPreviewBridge @@ -89,7 +89,7 @@ class KDecorationPreviewBridge virtual void performWindowOperation( WindowOperation ); virtual void setMask( const TQRegion&, int ); virtual bool isPreview() const; - virtual TQRect tqgeometry() const; + virtual TQRect geometry() const; virtual TQRect iconGeometry() const; virtual TQRegion unobscuredRegion( const TQRegion& r ) const; virtual TQWidget* workspaceWidget() const; diff --git a/kwin/kcmkwin/kwinoptions/ChangeLog b/kwin/kcmkwin/kwinoptions/ChangeLog index 612331796..0b923864c 100644 --- a/kwin/kcmkwin/kwinoptions/ChangeLog +++ b/kwin/kcmkwin/kwinoptions/ChangeLog @@ -23,7 +23,7 @@ 1998-11-06 Cristian Tibirna <[email protected]> - * titlebar.[cpp,h] : added title tqalignment config + * titlebar.[cpp,h] : added title alignment config 1998-10-23 Cristian Tibirna <[email protected]> @@ -37,12 +37,12 @@ 1998-10-21 Cristian Tibirna <[email protected]> - * desktop.[cpp,h]: now with consistent tqlayout use + * desktop.[cpp,h]: now with consistent layout use resizeEvent() deleted 1998-10-19 Cristian Tibirna <[email protected]> - * windows.[cpp,h]: now with consistent tqlayout use + * windows.[cpp,h]: now with consistent layout use resizeEvent() deleted 1998-10-18 Cristian Tibirna <[email protected]> diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp index dc8273f25..ac19a5d30 100644 --- a/kwin/kcmkwin/kwinoptions/main.cpp +++ b/kwin/kcmkwin/kwinoptions/main.cpp @@ -88,37 +88,37 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name) { mConfig = new KConfig("kwinrc", false, true); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); mFocus = new KFocusConfig(false, mConfig, this, "KWin Focus Config"); - mFocus->tqlayout()->setMargin( KDialog::marginHint() ); + mFocus->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mFocus, i18n("&Focus")); connect(mFocus, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions"); - mTitleBarActions->tqlayout()->setMargin( KDialog::marginHint() ); + mTitleBarActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions"); - mWindowActions->tqlayout()->setMargin( KDialog::marginHint() ); + mWindowActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mWindowActions, i18n("Window Actio&ns")); connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mMoving = new KMovingConfig(false, mConfig, this, "KWin Moving"); - mMoving->tqlayout()->setMargin( KDialog::marginHint() ); + mMoving->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mMoving, i18n("&Moving")); connect(mMoving, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mAdvanced = new KAdvancedConfig(false, mConfig, this, "KWin Advanced"); - mAdvanced->tqlayout()->setMargin( KDialog::marginHint() ); + mAdvanced->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mAdvanced, i18n("Ad&vanced")); connect(mAdvanced, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mTranslucency = new KTranslucencyConfig(false, mConfig, this, "KWin Translucency"); - mTranslucency->tqlayout()->setMargin( KDialog::marginHint() ); + mTranslucency->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTranslucency, i18n("&Translucency")); connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); @@ -206,17 +206,17 @@ KActionsOptions::KActionsOptions(TQWidget *parent, const char *name) { mConfig = new KConfig("kwinrc", false, true); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions"); - mTitleBarActions->tqlayout()->setMargin( KDialog::marginHint() ); + mTitleBarActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions"); - mWindowActions->tqlayout()->setMargin( KDialog::marginHint() ); + mWindowActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mWindowActions, i18n("Window Actio&ns")); connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); } diff --git a/kwin/kcmkwin/kwinoptions/mouse.cpp b/kwin/kcmkwin/kwinoptions/mouse.cpp index 07acd64cf..6adba1f89 100644 --- a/kwin/kcmkwin/kwinoptions/mouse.cpp +++ b/kwin/kcmkwin/kwinoptions/mouse.cpp @@ -136,7 +136,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQGrid *grid; TQGroupBox *box; TQLabel *label; @@ -147,10 +147,10 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf /** Titlebar doubleclick ************/ - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout); label = new TQLabel(i18n("&Titlebar double-click:"), this); - htqlayout->addWidget(label); + hlayout->addWidget(label); TQWhatsThis::add( label, i18n("Here you can customize mouse click behavior when double clicking on the" " titlebar of a window.") ); @@ -163,19 +163,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf combo->insertItem(i18n("Lower")); combo->insertItem(i18n("On All Desktops")); combo->insertItem(i18n("Nothing")); - combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - htqlayout->addWidget(combo); + hlayout->addWidget(combo); coTiDbl = combo; TQWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar.")); label->setBuddy(combo); /** Mouse Wheel Events **************/ - TQHBoxLayout *htqlayoutW = new TQHBoxLayout(tqlayout); + TQHBoxLayout *hlayoutW = new TQHBoxLayout(layout); strMouseWheel = i18n("Titlebar wheel event:"); label = new TQLabel(strMouseWheel, this); - htqlayoutW->addWidget(label); + hlayoutW->addWidget(label); txtButton4 = i18n("Handle mouse wheel events"); TQWhatsThis::add( label, txtButton4); @@ -188,9 +188,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf comboW->insertItem(i18n("Move to Previous/Next Desktop")); comboW->insertItem(i18n("Change Opacity")); comboW->insertItem(i18n("Nothing")); - comboW->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - htqlayoutW->addWidget(comboW); + hlayoutW->addWidget(comboW); coTiAct4 = comboW; TQWhatsThis::add(comboW, txtButton4); label->setBuddy(comboW); @@ -198,9 +198,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf /** Titlebar and frame **************/ box = new TQVGroupBox( i18n("Titlebar && Frame"), this, "Titlebar and Frame"); - box->tqlayout()->setMargin(KDialog::marginHint()); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + box->layout()->setMargin(KDialog::marginHint()); + box->layout()->setSpacing(KDialog::spacingHint()); + layout->addWidget(box); TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the" " titlebar or the frame of a window.") ); @@ -219,8 +219,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf if ( leftHandedMouse ) { - tqSwap(strMouseButton1, strMouseButton3); - tqSwap(txtButton1, txtButton3); + qSwap(strMouseButton1, strMouseButton3); + qSwap(txtButton1, txtButton3); } label = new TQLabel(strMouseButton1, grid); @@ -235,7 +235,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf label = new TQLabel(i18n("Active"), grid); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an active window.") ); @@ -256,7 +256,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf "<em>active</em> window."); // Be nice to left handed users - if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3); + if ( leftHandedMouse ) qSwap(txtButton1, txtButton3); TQWhatsThis::add(combo, txtButton1); @@ -289,10 +289,10 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf "<em>inactive</em> window."); // Be nice to left handed users - if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3); + if ( leftHandedMouse ) qSwap(txtButton1, txtButton3); label = new TQLabel(i18n("Inactive"), grid); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an inactive window.") ); @@ -327,9 +327,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf /** Maximize Button ******************/ box = new TQHGroupBox(i18n("Maximize Button"), this, "Maximize Button"); - box->tqlayout()->setMargin(KDialog::marginHint()); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + box->layout()->setMargin(KDialog::marginHint()); + box->layout()->setSpacing(KDialog::spacingHint()); + layout->addWidget(box); TQWhatsThis::add( box, i18n("Here you can customize behavior when clicking on the maximize button.") ); @@ -345,8 +345,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf if ( leftHandedMouse ) // Be nice to lefties { - tqSwap(strMouseButton[0], strMouseButton[2]); - tqSwap(txtButton[0], txtButton[2]); + qSwap(strMouseButton[0], strMouseButton[2]); + qSwap(txtButton[0], txtButton[2]); } createMaxButtonPixmaps(); @@ -356,19 +356,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf TQLabel * label = new TQLabel(strMouseButton[b], box); TQWhatsThis::add( label, txtButton[b] ); - label ->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + label ->setSizePolicy( 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]->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); } connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); - tqlayout->addStretch(); + layout->addStretch(); load(); } @@ -588,7 +588,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQGrid *grid; TQGroupBox *box; TQLabel *label; @@ -600,9 +600,9 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, /** Inactive inner window ******************/ box = new TQVGroupBox(i18n("Inactive Inner Window"), this, "Inactive Inner Window"); - box->tqlayout()->setMargin(KDialog::marginHint()); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + box->layout()->setMargin(KDialog::marginHint()); + box->layout()->setSpacing(KDialog::spacingHint()); + layout->addWidget(box); TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive" " inner window ('inner' means: not titlebar, not frame).") ); @@ -618,8 +618,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, if ( leftHandedMouse ) { - tqSwap(strMouseButton1, strMouseButton3); - tqSwap(txtButton1, txtButton3); + qSwap(strMouseButton1, strMouseButton3); + qSwap(txtButton1, txtButton3); } strWin1 = i18n("In this row you can customize left click behavior when clicking into" @@ -629,7 +629,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, " an inactive inner window ('inner' means: not titlebar, not frame)."); // Be nice to lefties - if ( leftHandedMouse ) tqSwap(strWin1, strWin3); + if ( leftHandedMouse ) qSwap(strWin1, strWin3); label = new TQLabel(strMouseButton1, grid); TQWhatsThis::add( label, strWin1 ); @@ -670,9 +670,9 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, /** Inner window, titlebar and frame **************/ box = new TQVGroupBox(i18n("Inner Window, Titlebar && Frame"), this, "Inner Window, Titlebar and Frame"); - box->tqlayout()->setMargin(KDialog::marginHint()); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + box->layout()->setMargin(KDialog::marginHint()); + box->layout()->setSpacing(KDialog::spacingHint()); + layout->addWidget(box); TQWhatsThis::add( box, i18n("Here you can customize KDE's behavior when clicking somewhere into" " a window while pressing a modifier key.")); @@ -696,8 +696,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, if ( leftHandedMouse ) { - tqSwap(strMouseButton1, strMouseButton3); - tqSwap(strAll1, strAll3); + qSwap(strMouseButton1, strMouseButton3); + qSwap(strAll1, strAll3); } label = new TQLabel(strMouseButton1, grid); @@ -764,7 +764,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, coAllW = combo; TQWhatsThis::add( combo, strAllW ); - tqlayout->addStretch(); + layout->addStretch(); load(); } diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp index d7c3893c6..cc8643af9 100644 --- a/kwin/kcmkwin/kwinoptions/windows.cpp +++ b/kwin/kcmkwin/kwinoptions/windows.cpp @@ -110,7 +110,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(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->tqlayout(), + TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(), 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->tqsizeHint().width(), -// clickRaiseOn->tqsizeHint().width()) + 15); +// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(), +// clickRaiseOn->sizeHint().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->tqlayout(), KDialog::spacingHint()); + TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), 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->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(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->tqlayout(), KDialog::spacingHint()); + TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint()); TQBoxLayout *bLay = new TQVBoxLayout; wLay->addLayout(bLay); @@ -848,9 +848,9 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare " while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying" " on slow machines.") ); - tqgeometryTipOn = new TQCheckBox(i18n("Display window &tqgeometry when moving or resizing"), windowsBox); - bLay->addWidget(tqgeometryTipOn); - TQWhatsThis::add(tqgeometryTipOn, i18n("Enable this option if you want a window's tqgeometry to be displayed" + geometryTipOn = new TQCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox); + bLay->addWidget(geometryTipOn); + TQWhatsThis::add(geometryTipOn, i18n("Enable this option if you want a window's geometry to be displayed" " while it is being moved or resized. The window position relative" " to the top-left corner of the screen is displayed together with" " its size.")); @@ -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->tqsetAlignment(Qt::AlignTop|Qt::AlignLeft); + minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft); rLay->addWidget(minimizeAnimSlowLabel,1,1); minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox); - minimizeAnimFastLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignRight); + minimizeAnimFastLabel->setAlignment(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->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -986,7 +986,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare // Any changes goes to slotChanged() connect( opaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); connect( resizeOpaqueOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect( tqgeometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect( geometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); connect( minimizeAnimOn, TQT_SIGNAL(clicked() ), TQT_SLOT(changed())); connect( minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); connect( moveResizeMaximized, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); @@ -1014,12 +1014,12 @@ void KMovingConfig::setMove(int trans) void KMovingConfig::setGeometryTip(bool showGeometryTip) { - tqgeometryTipOn->setChecked(showGeometryTip); + geometryTipOn->setChecked(showGeometryTip); } bool KMovingConfig::getGeometryTip() { - return tqgeometryTipOn->isChecked(); + return geometryTipOn->isChecked(); } // placement policy --- CT 31jan98 --- diff --git a/kwin/kcmkwin/kwinoptions/windows.h b/kwin/kcmkwin/kwinoptions/windows.h index 380a34809..83dc70b66 100644 --- a/kwin/kcmkwin/kwinoptions/windows.h +++ b/kwin/kcmkwin/kwinoptions/windows.h @@ -164,7 +164,7 @@ private: TQButtonGroup *windowsBox; TQCheckBox *opaque; TQCheckBox *resizeOpaqueOn; - TQCheckBox *tqgeometryTipOn; + TQCheckBox *geometryTipOn; TQCheckBox* minimizeAnimOn; TQSlider *minimizeAnimSlider; TQLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel; diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp index 918951b35..1a497c8bc 100644 --- a/kwin/kcmkwin/kwinrules/detectwidget.cpp +++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp @@ -189,7 +189,7 @@ WId DetectDialog::findWindow() { Window root; Window child; - uint tqmask; + uint mask; int rootX, rootY, x, y; Window parent = qt_xrootwin(); Atom wm_state = XInternAtom( qt_xdisplay(), "WM_STATE", False ); @@ -198,7 +198,7 @@ WId DetectDialog::findWindow() ++i ) { XQueryPointer( qt_xdisplay(), parent, &root, &child, - &rootX, &rootY, &x, &y, &tqmask ); + &rootX, &rootY, &x, &y, &mask ); if( child == None ) return 0; Atom type; diff --git a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui index 789594e97..31cae3ef3 100644 --- a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui +++ b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form3</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -213,6 +213,6 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kwin/kcmkwin/kwinrules/editshortcutbase.ui b/kwin/kcmkwin/kwinrules/editshortcutbase.ui index c3a0d7ec6..3813ae589 100644 --- a/kwin/kcmkwin/kwinrules/editshortcutbase.ui +++ b/kwin/kcmkwin/kwinrules/editshortcutbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>EditShortcutBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -50,7 +50,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -66,7 +66,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -91,7 +91,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -116,7 +116,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -159,6 +159,6 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <slot access="protected" specifier="pure virtual">editShortcut()</slot> <slot access="protected" specifier="pure virtual">clearShortcut()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp index 90c7a0cb8..19b714311 100644 --- a/kwin/kcmkwin/kwinrules/kcm.cpp +++ b/kwin/kcmkwin/kwinrules/kcm.cpp @@ -42,9 +42,9 @@ KCMRules::KCMRules( TQWidget *parent, const char *name ) : KCModule( parent, name ) , config( "kwinrulesrc" ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); widget = new KCMRulesList( this ); - tqlayout->addWidget( widget ); + layout->addWidget( widget ); connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ), diff --git a/kwin/kcmkwin/kwinrules/kwinrules.desktop b/kwin/kcmkwin/kwinrules/kwinrules.desktop index 3bd0e0c67..245994a8a 100644 --- a/kwin/kcmkwin/kwinrules/kwinrules.desktop +++ b/kwin/kcmkwin/kwinrules/kwinrules.desktop @@ -154,7 +154,7 @@ Keywords[cs]=velikost,pozice,umístění,stav,chování oken,pravidla Keywords[csb]=miara,pòłożenié,stón,ùchòwanié òknół,òkna,spamiãtanié nastôwów,zapamiãtanié nastôwów,regle Keywords[cy]=maint,lleoliad,cyflwr,ffenestr,ymddygiad,ffenestri,penodol,ffyrdd osgoi,cofio,rheolau Keywords[da]=størrelse,position,tilstand,vinduesopførsel,vinduer,specifik, omgåelse,husk,regler -Keywords[de]=Größe,Position,tqStatus,Fensterverhalten,Fenster,Regeln +Keywords[de]=Größe,Position,Status,Fensterverhalten,Fenster,Regeln Keywords[el]=μέγεθος,θέση,κατάσταση,συμπεριφορά παραθύρου,παράθυρα,ειδικές,λύσεις,αποθήκευση,κανόνων Keywords[en_GB]=size,position,state,window behaviour,windows,specific,workarounds,remember,rules Keywords[eo]=grandeco,pozicio,stato,fenestra konduto,fenestroj,reguloj @@ -180,7 +180,7 @@ Keywords[lv]=izmērs,novietojums,statuss,loga izturēšanās,logi,specifisks,apj Keywords[mk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,големина,позиција,состојба,однесување на прозорец,специфично,заобиколни Keywords[mt]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,daqs Keywords[nb]=størrelse,posisjon,status,vindusoppførsel,vinduer,spesifikk,jukseløsninger,husk,regler -Keywords[nds]=Grött,Positschoon,tqStatus,Finsterbedregen,Finstern,enkel,enkelte,Regeln,behollen,workaround +Keywords[nds]=Grött,Positschoon,Status,Finsterbedregen,Finstern,enkel,enkelte,Regeln,behollen,workaround Keywords[ne]=साइज, स्थिति, अवस्था, सञ्झ्याल व्यवहार, सञ्झ्यालहरू, निर्दिष्ट, कार्यक्षेत्र, याद गर्नुहोस्, नियम Keywords[nl]=grootte,positie,venstergedrag,vensters,specifiek,alternatieven,onthouden,regels Keywords[nn]=storleik,plassering,tilstand,vindaugsåtferd,vindauge,spesifikk,jukseløysingar,hugs,reglar diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp index af25412f8..b58c96239 100644 --- a/kwin/kcmkwin/kwinrules/main.cpp +++ b/kwin/kcmkwin/kwinrules/main.cpp @@ -179,7 +179,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who if( type == NET::Unknown ) ret->types = NET::NormalMask; else - ret->types = 1 << type; // convert type to its tqmask + ret->types = 1 << type; // convert type to its mask ret->title = title; // set, but make unimportant ret->titlematch = Rules::UnimportantMatch; ret->clientmachine = machine; // set, but make unimportant diff --git a/kwin/kcmkwin/kwinrules/ruleslistbase.ui b/kwin/kcmkwin/kwinrules/ruleslistbase.ui index b36a1987f..c2abdaa9d 100644 --- a/kwin/kcmkwin/kwinrules/ruleslistbase.ui +++ b/kwin/kcmkwin/kwinrules/ruleslistbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>294</height> @@ -86,6 +86,6 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp index ea426e7f1..2525644d9 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp +++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp @@ -78,7 +78,7 @@ RulesWidget::RulesWidget( TQWidget* parent, const char* name ) " until it is hidden (this action will be deleted after the window is hidden).</li>" "</ul>" ); // window tabs have enable signals done in designer - // tqgeometry tab + // geometry tab SETUP( position, set ); SETUP( size, set ); SETUP( desktop, set ); @@ -106,7 +106,7 @@ RulesWidget::RulesWidget( TQWidget* parent, const char* name ) SETUP( ignoreposition, force ); SETUP( minsize, force ); SETUP( maxsize, force ); - SETUP( stricttqgeometry, force ); + SETUP( strictgeometry, force ); SETUP( disableglobalshortcuts, force ); KWinModule module; int i; @@ -126,7 +126,7 @@ void RulesWidget::updateEnable##var() \ var->setEnabled( enable_##var->isChecked() && rule_##var->currentItem() != 0 ); \ } -// tqgeometry tab +// geometry tab UPDATE_ENABLE_SLOT( position ) UPDATE_ENABLE_SLOT( size ) UPDATE_ENABLE_SLOT( desktop ) @@ -158,7 +158,7 @@ UPDATE_ENABLE_SLOT( type ) UPDATE_ENABLE_SLOT( ignoreposition ) UPDATE_ENABLE_SLOT( minsize ) UPDATE_ENABLE_SLOT( maxsize ) -UPDATE_ENABLE_SLOT( stricttqgeometry ) +UPDATE_ENABLE_SLOT( strictgeometry ) UPDATE_ENABLE_SLOT( disableglobalshortcuts ) #undef UPDATE_ENABLE_SLOT @@ -428,7 +428,7 @@ void RulesWidget::setRules( Rules* rules ) CHECKBOX_FORCE_RULE( ignoreposition, ); LINEEDIT_FORCE_RULE( minsize, sizeToStr ); LINEEDIT_FORCE_RULE( maxsize, sizeToStr ); - CHECKBOX_FORCE_RULE( stricttqgeometry, ); + CHECKBOX_FORCE_RULE( strictgeometry, ); CHECKBOX_FORCE_RULE( disableglobalshortcuts, ); } @@ -518,7 +518,7 @@ Rules* RulesWidget::rules() const CHECKBOX_FORCE_RULE( ignoreposition, ); LINEEDIT_FORCE_RULE( minsize, strToSize ); LINEEDIT_FORCE_RULE( maxsize, strToSize ); - CHECKBOX_FORCE_RULE( stricttqgeometry, ); + CHECKBOX_FORCE_RULE( strictgeometry, ); CHECKBOX_FORCE_RULE( disableglobalshortcuts, ); return rules; } @@ -621,7 +621,7 @@ void RulesWidget::prefillUnusedValues( const KWin::WindowInfo& info ) CHECKBOX_PREFILL( above,, info.state() & NET::KeepAbove ); CHECKBOX_PREFILL( below,, info.state() & NET::KeepBelow ); // noborder is only internal KWin information, so let's guess - CHECKBOX_PREFILL( noborder,, info.frameGeometry() == info.tqgeometry() ); + CHECKBOX_PREFILL( noborder,, info.frameGeometry() == info.geometry() ); CHECKBOX_PREFILL( skiptaskbar,, info.state() & NET::SkipTaskbar ); CHECKBOX_PREFILL( skippager,, info.state() & NET::SkipPager ); //CHECKBOX_PREFILL( acceptfocus, ); @@ -635,7 +635,7 @@ void RulesWidget::prefillUnusedValues( const KWin::WindowInfo& info ) //CHECKBOX_PREFILL( ignoreposition, ); LINEEDIT_PREFILL( minsize, sizeToStr, info.frameGeometry().size() ); LINEEDIT_PREFILL( maxsize, sizeToStr, info.frameGeometry().size() ); - //CHECKBOX_PREFILL( stricttqgeometry, ); + //CHECKBOX_PREFILL( strictgeometry, ); //CHECKBOX_PREFILL( disableglobalshortcuts, ); } @@ -661,7 +661,7 @@ bool RulesWidget::finalCheck() all_types = false; if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types ) { - if( KMessageBox::warningContinueCancel( tqtopLevelWidget(), + if( KMessageBox::warningContinueCancel( topLevelWidget(), 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 " @@ -673,14 +673,14 @@ bool RulesWidget::finalCheck() void RulesWidget::prepareWindowSpecific( WId window ) { - tabs->setCurrentPage( 2 ); // tqgeometry tab, skip tabs for window identification + tabs->setCurrentPage( 2 ); // geometry tab, skip tabs for window identification KWin::WindowInfo info( window, -1U, -1U ); // read everything prefillUnusedValues( info ); } void RulesWidget::shortcutEditClicked() { - EditShortcutDialog dlg( tqtopLevelWidget()); + EditShortcutDialog dlg( topLevelWidget()); 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()), tqtopLevelWidget()); + ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut().toString()); } diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.h b/kwin/kcmkwin/kwinrules/ruleswidget.h index ec38818ff..b47ad88ab 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.h +++ b/kwin/kcmkwin/kwinrules/ruleswidget.h @@ -54,7 +54,7 @@ class RulesWidget virtual void machineMatchChanged(); virtual void shortcutEditClicked(); private slots: - // tqgeometry tab + // geometry tab void updateEnableposition(); void updateEnablesize(); void updateEnabledesktop(); @@ -81,7 +81,7 @@ class RulesWidget void updateEnableignoreposition(); void updateEnableminsize(); void updateEnablemaxsize(); - void updateEnablestricttqgeometry(); + void updateEnablestrictgeometry(); void updateEnableshortcut(); void updateEnabledisableglobalshortcuts(); // internal diff --git a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui index 0b23f2ed2..01c1b9918 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui +++ b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>212</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>211</width> <height>20</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>212</width> <height>20</height> @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>211</width> <height>20</height> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> @@ -296,7 +296,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>269</width> <height>20</height> @@ -470,7 +470,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -501,7 +501,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -543,7 +543,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -574,7 +574,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -616,7 +616,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -647,7 +647,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -1181,7 +1181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -1347,7 +1347,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>171</width> <height>20</height> @@ -1364,7 +1364,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1381,7 +1381,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1398,7 +1398,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1415,7 +1415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1432,7 +1432,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1449,7 +1449,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1466,7 +1466,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1796,7 +1796,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -1847,7 +1847,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>181</width> <height>20</height> @@ -2231,7 +2231,7 @@ <cstring>enable_ignoreposition</cstring> </property> <property name="text"> - <string>Ignore requested &tqgeometry</string> + <string>Ignore requested &geometry</string> </property> </widget> <widget class="KComboBox" row="3" column="1"> @@ -2278,7 +2278,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> @@ -2287,10 +2287,10 @@ </spacer> <widget class="QCheckBox" row="6" column="0"> <property name="name"> - <cstring>enable_stricttqgeometry</cstring> + <cstring>enable_strictgeometry</cstring> </property> <property name="text"> - <string>Strictly obey tqgeometry</string> + <string>Strictly obey geometry</string> </property> <property name="accel"> <string></string> @@ -2313,7 +2313,7 @@ </property> </item> <property name="name"> - <cstring>rule_stricttqgeometry</cstring> + <cstring>rule_strictgeometry</cstring> </property> <property name="enabled"> <bool>false</bool> @@ -2321,7 +2321,7 @@ </widget> <widget class="QCheckBox" row="6" column="3"> <property name="name"> - <cstring>stricttqgeometry</cstring> + <cstring>strictgeometry</cstring> </property> <property name="enabled"> <bool>false</bool> @@ -2523,9 +2523,9 @@ <tabstop>enable_maxsize</tabstop> <tabstop>rule_maxsize</tabstop> <tabstop>maxsize</tabstop> - <tabstop>enable_stricttqgeometry</tabstop> - <tabstop>rule_stricttqgeometry</tabstop> - <tabstop>stricttqgeometry</tabstop> + <tabstop>enable_strictgeometry</tabstop> + <tabstop>rule_strictgeometry</tabstop> + <tabstop>strictgeometry</tabstop> <tabstop>enable_disableglobalshortcuts</tabstop> <tabstop>rule_disableglobalshortcuts</tabstop> <tabstop>disableglobalshortcuts</tabstop> @@ -2539,8 +2539,8 @@ <slot access="protected" specifier="pure virtual">machineMatchChanged()</slot> <slot access="protected" specifier="pure virtual">shortcutEditClicked()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp index 36f6fa072..ae31fc3e0 100644 --- a/kwin/killer/killer.cpp +++ b/kwin/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::tqfromLatin1( args->getOption( "applicationname" )); + TQString appname = TQString::fromLatin1( args->getOption( "applicationname" )); bool id_ok = false; Window id = args->getOption( "wid" ).toULong( &id_ok ); bool time_ok = false; diff --git a/kwin/kompmgr/kompmgr.c b/kwin/kompmgr/kompmgr.c index f65586be4..713752ee1 100644 --- a/kwin/kompmgr/kompmgr.c +++ b/kwin/kompmgr/kompmgr.c @@ -99,7 +99,7 @@ typedef struct _win { unsigned int shadowSize; Atom windowType; unsigned long damage_sequence; /* sequence when damage was created */ - Bool shapable; /* this will allow window managers to exclude windows if just the deco is tqshaped*/ + Bool shapable; /* this will allow window managers to exclude windows if just the deco is shaped*/ unsigned int decoHash; Picture dimPicture; @@ -151,7 +151,7 @@ Bool synchronize; int composite_opcode; Bool disable_argb = False; -int tqshapeEvent; +int shapeEvent; /* find these once and be done with it */ Atom opacityAtom; @@ -1679,10 +1679,10 @@ get_opacity_percent(Display *dpy, win *w, double def) } #if 0 static void -damage_tqshape(Display *dpy, win *w, XRectangle *tqshape_damage) +damage_shape(Display *dpy, win *w, XRectangle *shape_damage) { set_ignore (dpy, NextRequest (dpy)); - XserverRegion region = XFixesCreateRegion (dpy, tqshape_damage, 1); + XserverRegion region = XFixesCreateRegion (dpy, shape_damage, 1); set_ignore (dpy, NextRequest (dpy)); XserverRegion tmpRegion; add_damage(dpy, region); @@ -2707,7 +2707,7 @@ main (int argc, char **argv) VisibilityChangeMask); /*shaping stuff*/ - XShapeQueryExtension(dpy, &tqshapeEvent, &dummy); + XShapeQueryExtension(dpy, &shapeEvent, &dummy); XQueryTree (dpy, root, &root_return, &parent_return, &children, &nchildren); for (i = 0; i < nchildren; i++) @@ -2947,7 +2947,7 @@ main (int argc, char **argv) /* printf("damaging win: %u\n",ev.xany.window);*/ damage_win (dpy, (XDamageNotifyEvent *) &ev); } - else if (ev.type == tqshapeEvent) + else if (ev.type == shapeEvent) { win * w = find_win(dpy, ev.xany.window); #if 1 @@ -2963,7 +2963,7 @@ main (int argc, char **argv) rect.y = ((XShapeEvent*)&ev)->y; rect.width = ((XShapeEvent*)&ev)->width; rect.height = ((XShapeEvent*)&ev)->height; - damage_tqshape(dpy, w, &rect); + damage_shape(dpy, w, &rect); #endif #if 0 if (w->shadowSize != 0) @@ -2978,7 +2978,7 @@ main (int argc, char **argv) } #endif /*this is hardly efficient, but a current workaraound - shaping support isn't that good so far (e.g. we lack tqshaped shadows) + shaping support isn't that good so far (e.g. we lack shaped shadows) IDEA: use XRender to scale/shift a copy of the window and then blurr it*/ #if 1 if (w->picture) diff --git a/kwin/layers.cpp b/kwin/layers.cpp index a5b11d438..fcb6d8383 100644 --- a/kwin/layers.cpp +++ b/kwin/layers.cpp @@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to stacking order and layers. + This file contains things relevant to stacking order and layers. Design: @@ -89,7 +89,7 @@ void Workspace::updateClientLayer( Client* c ) if( c->layer() == c->belongsToLayer()) return; StackingUpdatesBlocker blocker( this ); - c->tqinvalidateLayer(); // tqinvalidate, will be updated when doing restacking + c->invalidateLayer(); // invalidate, will be updated when doing restacking for( ClientList::ConstIterator it = c->transients().begin(); it != c->transients().end(); ++it ) @@ -306,7 +306,7 @@ void Workspace::raiseOrLowerClient( Client *c) if (!c) return; Client* topmost = NULL; // TODO Q_ASSERT( block_stacking_updates == 0 ); - if ( most_recently_raised && stacking_order.tqcontains( most_recently_raised ) && + if ( most_recently_raised && stacking_order.contains( most_recently_raised ) && most_recently_raised->isShown( true ) && c->isOnCurrentDesktop()) topmost = most_recently_raised; else @@ -471,7 +471,7 @@ void Workspace::restackClientUnderActive( Client* c ) return; } - assert( unconstrained_stacking_order.tqcontains( active_client )); + assert( unconstrained_stacking_order.contains( active_client )); if( Client::belongToSameApplication( active_client, c )) { // put it below the active window if it's the same app unconstrained_stacking_order.remove( c ); @@ -494,12 +494,12 @@ void Workspace::restackClientUnderActive( Client* c ) } } } - assert( unconstrained_stacking_order.tqcontains( c )); + assert( unconstrained_stacking_order.contains( c )); for( int desktop = 1; desktop <= numberOfDesktops(); ++desktop ) { // do for every virtual desktop to handle the case of onalldesktop windows - if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].tqcontains( active_client )) + if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].contains( active_client )) { if( Client::belongToSameApplication( active_client, c )) { // put it after the active window if it's the same app @@ -523,7 +523,7 @@ void Workspace::restackClientUnderActive( Client* c ) } } // the same for global_focus_chain - if( c->wantsTabFocus() && global_focus_chain.tqcontains( active_client )) + if( c->wantsTabFocus() && global_focus_chain.contains( active_client )) { if( Client::belongToSameApplication( active_client, c )) { @@ -583,7 +583,7 @@ ClientList Workspace::constrainedStackingOrder() // If a window is raised above some other window in the same window group // which is in the ActiveLayer (i.e. it's fulscreened), make sure it stays // above that window (see #95731). - if( minimum_layer.tqcontains( (*it)->group()) + if( minimum_layer.contains( (*it)->group()) && minimum_layer[ (*it)->group() ] == ActiveLayer && ( l == NormalLayer || l == AboveLayer )) { diff --git a/kwin/lib/kcommondecoration.cpp b/kwin/lib/kcommondecoration.cpp index a950a7ecb..87541ad60 100644 --- a/kwin/lib/kcommondecoration.cpp +++ b/kwin/lib/kcommondecoration.cpp @@ -73,7 +73,7 @@ bool KCommonDecoration::decorationBehaviour(DecorationBehaviour behaviour) const return false; } -int KCommonDecoration::tqlayoutMetric(LayoutMetric lm, bool, const KCommonDecorationButton *) const +int KCommonDecoration::layoutMetric(LayoutMetric lm, bool, const KCommonDecorationButton *) const { switch (lm) { case LM_BorderLeft: @@ -145,12 +145,12 @@ void KCommonDecoration::updateCaption() void KCommonDecoration::borders( int& left, int& right, int& top, int& bottom ) const { - left = tqlayoutMetric(LM_BorderLeft); - right = tqlayoutMetric(LM_BorderRight); - bottom = tqlayoutMetric(LM_BorderBottom); - top = tqlayoutMetric(LM_TitleHeight) + - tqlayoutMetric(LM_TitleEdgeTop) + - tqlayoutMetric(LM_TitleEdgeBottom); + left = layoutMetric(LM_BorderLeft); + right = layoutMetric(LM_BorderRight); + bottom = layoutMetric(LM_BorderBottom); + top = layoutMetric(LM_TitleHeight) + + layoutMetric(LM_TitleEdgeTop) + + layoutMetric(LM_TitleEdgeBottom); updateLayout(); // TODO!! don't call everytime we are in ::borders } @@ -161,14 +161,14 @@ void KCommonDecoration::updateLayout() const int r_x, r_y, r_x2, r_y2; r.coords(&r_x, &r_y, &r_x2, &r_y2); - // tqlayout preview widget + // layout preview widget if (m_previewWidget) { - const int borderLeft = tqlayoutMetric(LM_BorderLeft); - const int borderRight = tqlayoutMetric(LM_BorderRight); - const int borderBottom = tqlayoutMetric(LM_BorderBottom); - const int titleHeight = tqlayoutMetric(LM_TitleHeight); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); + const int borderLeft = layoutMetric(LM_BorderLeft); + const int borderRight = layoutMetric(LM_BorderRight); + const int borderBottom = layoutMetric(LM_BorderBottom); + const int titleHeight = layoutMetric(LM_TitleHeight); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); int left = r_x+borderLeft; int top = r_y+titleEdgeTop+titleHeight+titleEdgeBottom; @@ -182,28 +182,28 @@ void KCommonDecoration::updateLayout() const // resize buttons... for (int n=0; n<NumButtons; n++) { if (m_button[n]) { - TQSize newSize = TQSize(tqlayoutMetric(LM_ButtonWidth, true, m_button[n]), - tqlayoutMetric(LM_ButtonHeight, true, m_button[n]) ); + TQSize newSize = TQSize(layoutMetric(LM_ButtonWidth, true, m_button[n]), + layoutMetric(LM_ButtonHeight, true, m_button[n]) ); if (newSize != m_button[n]->size() ) m_button[n]->setSize(newSize); } } - // tqlayout buttons - int y = r_y + tqlayoutMetric(LM_TitleEdgeTop) + tqlayoutMetric(LM_ButtonMarginTop); + // layout buttons + int y = r_y + layoutMetric(LM_TitleEdgeTop) + layoutMetric(LM_ButtonMarginTop); if (m_buttonsLeft.count() > 0) { - const int buttonSpacing = tqlayoutMetric(LM_ButtonSpacing); - int x = r_x + tqlayoutMetric(LM_TitleEdgeLeft); + const int buttonSpacing = layoutMetric(LM_ButtonSpacing); + int x = r_x + layoutMetric(LM_TitleEdgeLeft); for (ButtonContainer::const_iterator it = m_buttonsLeft.begin(); it != m_buttonsLeft.end(); ++it) { bool elementLayouted = false; if (*it) { if (!(*it)->isHidden() ) { moveWidget(x,y, *it); - x += tqlayoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) ); + x += layoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) ); elementLayouted = true; } } else { - x+= tqlayoutMetric(LM_ExplicitButtonSpacer); + x+= layoutMetric(LM_ExplicitButtonSpacer); elementLayouted = true; } if (elementLayouted && it != m_buttonsLeft.end() ) @@ -212,20 +212,20 @@ void KCommonDecoration::updateLayout() const } if (m_buttonsRight.count() > 0) { - const int titleEdgeRightLeft = r_x2-tqlayoutMetric(LM_TitleEdgeRight)+1; + const int titleEdgeRightLeft = r_x2-layoutMetric(LM_TitleEdgeRight)+1; - const int buttonSpacing = tqlayoutMetric(LM_ButtonSpacing); + const int buttonSpacing = layoutMetric(LM_ButtonSpacing); int x = titleEdgeRightLeft - buttonContainerWidth(m_buttonsRight); for (ButtonContainer::const_iterator it = m_buttonsRight.begin(); it != m_buttonsRight.end(); ++it) { bool elementLayouted = false; if (*it) { if (!(*it)->isHidden() ) { moveWidget(x,y, *it); - x += tqlayoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) );; + x += layoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) );; elementLayouted = true; } } else { - x += tqlayoutMetric(LM_ExplicitButtonSpacer); + x += layoutMetric(LM_ExplicitButtonSpacer); elementLayouted = true; } if (elementLayouted && it != m_buttonsRight.end() ) @@ -277,8 +277,8 @@ void KCommonDecoration::resetLayout() const int minTitleBarWidth = 35; btnHideMinWidth = buttonContainerWidth(m_buttonsLeft,true) + buttonContainerWidth(m_buttonsRight,true) + - tqlayoutMetric(LM_TitleEdgeLeft,false) + tqlayoutMetric(LM_TitleEdgeRight,false) + - tqlayoutMetric(LM_TitleBorderLeft,false) + tqlayoutMetric(LM_TitleBorderRight,false) + + layoutMetric(LM_TitleEdgeLeft,false) + layoutMetric(LM_TitleEdgeRight,false) + + layoutMetric(LM_TitleBorderLeft,false) + layoutMetric(LM_TitleBorderRight,false) + minTitleBarWidth; btnHideLastWidth = 0; } @@ -295,7 +295,7 @@ int KCommonDecoration::buttonsRightWidth() const int KCommonDecoration::buttonContainerWidth(const ButtonContainer &btnContainer, bool countHidden) const { - int explicitSpacer = tqlayoutMetric(LM_ExplicitButtonSpacer); + int explicitSpacer = layoutMetric(LM_ExplicitButtonSpacer); int shownElementsCount = 0; @@ -311,7 +311,7 @@ int KCommonDecoration::buttonContainerWidth(const ButtonContainer &btnContainer, ++shownElementsCount; } } - w += tqlayoutMetric(LM_ButtonSpacing)*(shownElementsCount-1); + w += layoutMetric(LM_ButtonSpacing)*(shownElementsCount-1); return w; } @@ -437,7 +437,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString if (btn) { btn->setLeft(isLeft); - btn->setSize(TQSize(tqlayoutMetric(LM_ButtonWidth, true, btn),tqlayoutMetric(LM_ButtonHeight, true, btn)) ); + btn->setSize(TQSize(layoutMetric(LM_ButtonWidth, true, btn),layoutMetric(LM_ButtonHeight, true, btn)) ); btn->show(); btnContainer.append(btn); } @@ -497,15 +497,15 @@ void KCommonDecoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize KCommonDecoration::tqminimumSize() const +TQSize KCommonDecoration::minimumSize() const { - const int minWidth = QMAX(tqlayoutMetric(LM_TitleEdgeLeft), tqlayoutMetric(LM_BorderLeft)) - +QMAX(tqlayoutMetric(LM_TitleEdgeRight), tqlayoutMetric(LM_BorderRight)) - +tqlayoutMetric(LM_TitleBorderLeft)+tqlayoutMetric(LM_TitleBorderRight); + const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft)) + +QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight)) + +layoutMetric(LM_TitleBorderLeft)+layoutMetric(LM_TitleBorderRight); return TQSize(minWidth, - tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight) - +tqlayoutMetric(LM_TitleEdgeBottom) - +tqlayoutMetric(LM_BorderBottom) ); + layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight) + +layoutMetric(LM_TitleEdgeBottom) + +layoutMetric(LM_BorderBottom) ); } void KCommonDecoration::maximizeChange() @@ -659,7 +659,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 tqrepaint... + // because there is already "something" else triggering the repaint... // widget()->update(); } @@ -688,7 +688,7 @@ void KCommonDecoration::mouseDoubleClickEvent(TQMouseEvent *e) if( e->button() != LeftButton ) return; - int tb = tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight)+tqlayoutMetric(LM_TitleEdgeBottom); + int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom); // when shaded, react on double clicks everywhere to make it easier to unshade. otherwise // react only on double clicks in the title bar region... if (isSetShade() || e->pos().y() <= tb ) @@ -697,14 +697,14 @@ void KCommonDecoration::mouseDoubleClickEvent(TQMouseEvent *e) void KCommonDecoration::wheelEvent(TQWheelEvent *e) { - int tb = tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight)+tqlayoutMetric(LM_TitleEdgeBottom); + int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom); if (isSetShade() || e->pos().y() <= tb ) titlebarMouseWheelOperation( e->delta()); } KCommonDecoration::Position KCommonDecoration::mousePosition(const TQPoint &point) const { - const int corner = 18+3*tqlayoutMetric(LM_BorderBottom, false)/2; + const int corner = 18+3*layoutMetric(LM_BorderBottom, false)/2; Position pos = PositionCenter; TQRect r = widget()->rect(); @@ -712,14 +712,14 @@ KCommonDecoration::Position KCommonDecoration::mousePosition(const TQPoint &poin r.coords(&r_x, &r_y, &r_x2, &r_y2); int p_x = point.x(); int p_y = point.y(); - const int borderLeft = tqlayoutMetric(LM_BorderLeft); -// const int borderRight = tqlayoutMetric(LM_BorderRight); - const int borderBottom = tqlayoutMetric(LM_BorderBottom); - const int titleHeight = tqlayoutMetric(LM_TitleHeight); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight); + const int borderLeft = layoutMetric(LM_BorderLeft); +// const int borderRight = layoutMetric(LM_BorderRight); + const int borderBottom = layoutMetric(LM_BorderBottom); + const int titleHeight = layoutMetric(LM_TitleHeight); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); const int borderBottomTop = r_y2-borderBottom+1; const int borderLeftRight = r_x+borderLeft-1; @@ -769,7 +769,7 @@ KCommonDecoration::Position KCommonDecoration::mousePosition(const TQPoint &poin void KCommonDecoration::updateWindowShape() { - // don't tqmask the widget... + // don't mask the widget... if (!decorationBehaviour(DB_WindowMask) ) return; @@ -783,7 +783,7 @@ void KCommonDecoration::updateWindowShape() for(int screen=0; screen < desktop->numScreens(); ++screen) { TQRect fullscreen(desktop->screenGeometry(screen)); - TQRect window = tqgeometry(); + TQRect window = geometry(); if(window.topLeft() == fullscreen.topLeft() ) tl = false; if(window.topRight() == fullscreen.topRight() ) tr = false; @@ -791,30 +791,30 @@ void KCommonDecoration::updateWindowShape() if(window.bottomRight()== fullscreen.bottomRight() ) br = false; } - TQRegion tqmask(0, 0, w, h); + TQRegion mask(0, 0, w, h); // Remove top-left corner. if(tl) { - tqmask -= cornerShape(WC_TopLeft); + mask -= cornerShape(WC_TopLeft); } // Remove top-right corner. if(tr) { - tqmask -= cornerShape(WC_TopRight); + mask -= cornerShape(WC_TopRight); } // Remove top-left corner. if(bl) { - tqmask -= cornerShape(WC_BottomLeft); + mask -= cornerShape(WC_BottomLeft); } // Remove top-right corner. if(br) { - tqmask -= cornerShape(WC_BottomRight); + mask -= cornerShape(WC_BottomRight); } - setMask( tqmask ); + setMask( mask ); } bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e ) @@ -857,13 +857,13 @@ TQRect KCommonDecoration::titleRect() const { int r_x, r_y, r_x2, r_y2; widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int titleBorderLeft = tqlayoutMetric(LM_TitleBorderLeft); - const int titleBorderRight = tqlayoutMetric(LM_TitleBorderRight); - const int ttlHeight = tqlayoutMetric(LM_TitleHeight); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int titleBorderLeft = layoutMetric(LM_TitleBorderLeft); + const int titleBorderRight = layoutMetric(LM_TitleBorderRight); + const int ttlHeight = layoutMetric(LM_TitleHeight); const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1; return TQRect(r_x+titleEdgeLeft+buttonsLeftWidth()+titleBorderLeft, r_y+titleEdgeTop, r_x2-titleEdgeRight-buttonsRightWidth()-titleBorderRight-(r_x+titleEdgeLeft+buttonsLeftWidth()+titleBorderLeft), @@ -921,7 +921,7 @@ void KCommonDecorationButton::setSize(const TQSize &s) } } -TQSize KCommonDecorationButton::tqsizeHint() const +TQSize KCommonDecorationButton::sizeHint() const { return m_size; } diff --git a/kwin/lib/kcommondecoration.h b/kwin/lib/kcommondecoration.h index 64e852e77..f515a7da7 100644 --- a/kwin/lib/kcommondecoration.h +++ b/kwin/lib/kcommondecoration.h @@ -54,7 +54,7 @@ class KCommonDecorationPrivate; /** * This class eases development of decorations by implementing parts of KDecoration * which are error prone and common for most decorations. - * It takes care of the window tqlayout, button/action handling, and window tqmask creation. + * It takes care of the window layout, button/action handling, and window mask creation. */ class KWIN_EXPORT KCommonDecoration : public KDecoration { @@ -65,7 +65,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration virtual ~KCommonDecoration(); /** - * Used to calculate the decoration tqlayout. The basic tqlayout looks like this: + * Used to calculate the decoration layout. The basic layout looks like this: * * Window: * _______________________________________________________________ @@ -95,7 +95,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration * | button | spacing | button | spacing | explicit spacer | spacing | ... | spacing | button | * |________|_________|________|_________|_________________|_________|________|_________|________| * - * @see tqlayoutMetric() + * @see layoutMetric() */ enum LayoutMetric { @@ -119,7 +119,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration enum DecorationBehaviour { DB_MenuClose, ///< Close window on double clicking the menu - DB_WindowMask, ///< Set a tqmask on the window + DB_WindowMask, ///< Set a mask on the window DB_ButtonHide ///< Hide buttons when there is not enough space in the titlebar }; @@ -155,13 +155,13 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; /** - * This controls the tqlayout of the decoration in various ways. It is - * possible to have a different tqlayout for different window states. - * @param lm The tqlayout element. + * This controls the layout of the decoration in various ways. It is + * possible to have a different layout for different window states. + * @param lm The layout element. * @param respectWindowState Whether window states should be taken into account or a "default" state should be assumed. * @param button For LM_ButtonWidth and LM_ButtonHeight, the button. */ - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton *button = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton *button = 0) const; /** * Create a new title bar button. KCommonDecoration takes care of memory management. @@ -170,14 +170,14 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration virtual KCommonDecorationButton *createButton(ButtonType type) = 0; /** - * @return the tqmask for the specific window corner. + * @return the mask for the specific window corner. */ virtual TQRegion cornerShape(WindowCorner corner); /** - * This updates the window tqmask using the information provided by + * This updates the window mask using the information provided by * cornerShape(). Edges which are aligned to screen corners are not - * tqshaped for better usability (remember to paint these areas in paintEvent(), too). + * shaped for better usability (remember to paint these areas in paintEvent(), too). * You normally don't want/need to reimplement updateWindowShape(). * @see cornerShape() */ @@ -202,7 +202,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration */ void updateLayout() const; /** - * Makes sure all buttons are tqrepainted. + * Makes sure all buttons are repainted. */ void updateButtons() const; /** @@ -223,7 +223,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration public: /** - * Handles widget and tqlayout creation, call the base implementation when subclassing this member. + * Handles widget and layout creation, call the base implementation when subclassing this member. */ virtual void init(); /** @@ -233,7 +233,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 tqminimumSize() const; + virtual TQSize minimumSize() const; virtual void maximizeChange(); virtual void desktopChange(); virtual void shadeChange(); @@ -343,7 +343,7 @@ class KWIN_EXPORT KCommonDecorationButton : public QButton */ ButtonState lastMousePress() const { return m_lastMouse; } - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: void setToggleButton(bool toggle); diff --git a/kwin/lib/kdecoration.cpp b/kwin/lib/kdecoration.cpp index 22b3cd75c..97c8965e9 100644 --- a/kwin/lib/kdecoration.cpp +++ b/kwin/lib/kdecoration.cpp @@ -68,7 +68,7 @@ void KDecoration::setMainWidget( TQWidget* w ) assert( w_ == NULL ); w_ = w; w->setMouseTracking( true ); - widget()->resize( tqgeometry().size()); + widget()->resize( geometry().size()); } TQWidget* KDecoration::initialParentWidget() const @@ -206,9 +206,9 @@ bool KDecoration::isPreview() const return bridge_->isPreview(); } -TQRect KDecoration::tqgeometry() const +TQRect KDecoration::geometry() const { - return bridge_->tqgeometry(); + return bridge_->geometry(); } TQRect KDecoration::iconGeometry() const @@ -388,7 +388,7 @@ const TQFont& KDecorationOptions::font(bool active, bool small) const return(active ? d->activeFont : d->inactiveFont); } -const TQColorGroup& KDecorationOptions::tqcolorGroup(ColorType type, bool active) const +const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const { int idx = type + (active ? 0 : NUM_COLORS); if(d->cg[idx]) diff --git a/kwin/lib/kdecoration.h b/kwin/lib/kdecoration.h index 89cdf95a5..f41f19041 100644 --- a/kwin/lib/kdecoration.h +++ b/kwin/lib/kdecoration.h @@ -127,7 +127,7 @@ public: SettingDecoration = 1 << 0, ///< The decoration was changed SettingColors = 1 << 1, ///< The color palette was changed SettingFont = 1 << 2, ///< The titlebar font was changed - SettingButtons = 1 << 3, ///< The button tqlayout was changed + SettingButtons = 1 << 3, ///< The button layout was changed SettingTooltips = 1 << 4, ///< The tooltip setting was changed SettingBorder = 1 << 5 ///< The border size setting was changed }; @@ -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& tqcolorGroup(ColorType type, bool active=true) const; + const TQColorGroup& colorGroup(ColorType type, bool active=true) const; /** * Returns the active or inactive decoration font. * The changed flags for this setting is SettingFont. @@ -291,7 +291,7 @@ public: /** * @internal */ - virtual unsigned long updateSettings() = 0; // returns SettingXYZ tqmask + virtual unsigned long updateSettings() = 0; // returns SettingXYZ mask protected: /** @@ -412,7 +412,7 @@ class KWIN_EXPORT KDecoration bool isResizable() const; /** * This function returns the window type of the decorated window. - * The argument to this function is a tqmask of all window types + * The argument to this function is a mask of all window types * the decoration knows about (as the list of valid window types * is extended over time, and fallback types are specified in order * to support older code). For a description of all window types, @@ -451,7 +451,7 @@ class KWIN_EXPORT KDecoration * * \note Decorations that enable a double-click operation for the menu * button must ensure to call \a showWindowMenu() with the \a pos - * rectangle set to the menu button tqgeometry. + * rectangle set to the menu button geometry. * IMPORTANT: As a result of this function, the decoration object that * called it may be destroyed after the function returns. This means * that the decoration object must either return immediately after @@ -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 tqshape of the decoration. + * to set the shape of the decoration. * - * @param reg The tqshape of the decoration. + * @param reg The shape 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 tqshape tqmask. + * This convenience function resets the shape mask. */ void clearMask(); // convenience /** @@ -499,13 +499,13 @@ class KWIN_EXPORT KDecoration */ bool isPreview() const; /** - * Returns the tqgeometry of the decoration. + * Returns the geometry of the decoration. */ - TQRect tqgeometry() const; + TQRect geometry() const; /** - * Returns the icon tqgeometry for the window, i.e. the tqgeometry of the taskbar + * Returns the icon geometry for the window, i.e. the geometry of the taskbar * entry. This is used mainly for window minimize animations. Note that - * the tqgeometry may be null. + * the geometry may be null. */ TQRect iconGeometry() const; /** @@ -573,13 +573,13 @@ class KWIN_EXPORT KDecoration * whether it's shaded. Decorations often turn off their bottom border when the * window is shaded, and turn off their left/right/bottom borders when * the window is maximized and moving and resizing of maximized windows is disabled. - * This function mustn't do any tqrepaints or resizes. Also, if the sizes returned + * This function mustn't do any repaints or resizes. Also, if the sizes returned * by this function don't match the real values, this may result in drawing errors * or other problems. * * @see KDecorationOptions::moveResizeMaximizedWindows() */ - // mustn't do any tqrepaints, resizes or anything like that + // mustn't do any repaints, resizes or anything like that virtual void borders( int& left, int& right, int& top, int& bottom ) const = 0; /** * This method is called by kwin when the style should resize the decoration window. @@ -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 tqminimumSize() const = 0; + virtual TQSize minimumSize() const = 0; /** * This function is called whenever the window either becomes or stops being active. * Use isActive() to find out the current state. @@ -647,10 +647,10 @@ class KWIN_EXPORT KDecoration * you should compensate for the 2 pixels that would make the window * look larger. * - * @param geom The tqgeometry at this the bound should be drawn + * @param geom The geometry at this the bound should be drawn * @param clear @a true if the bound should be cleared * - * @see workspaceWidget() and tqgeometry(). + * @see workspaceWidget() and geometry(). */ virtual bool drawbound( const TQRect& geom, bool clear ); /** @@ -661,7 +661,7 @@ class KWIN_EXPORT KDecoration * @a False should be returned if the default implementation should be used. * Note that you should not use this function to force disabling of the animation. * - * @see workspaceWidget(), tqgeometry() and helperShowHide(). + * @see workspaceWidget(), geometry() and helperShowHide(). */ virtual bool animateMinimize( bool minimize ); /** @@ -673,7 +673,7 @@ class KWIN_EXPORT KDecoration * This function is called to reset the decoration on settings changes. * It is usually invoked by calling KDecorationFactory::resetDecorations(). * - * @param changed Specifies which settings were changed, given by the SettingXXX tqmasks + * @param changed Specifies which settings were changed, given by the SettingXXX masks */ virtual void reset( unsigned long changed ); @@ -877,12 +877,12 @@ inline bool KDecoration::isOnAllDesktops() const inline int KDecoration::width() const { - return tqgeometry().width(); + return geometry().width(); } inline int KDecoration::height() const { - return tqgeometry().height(); + return geometry().height(); } #endif diff --git a/kwin/lib/kdecoration_p.h b/kwin/lib/kdecoration_p.h index c3797831e..58f386c9b 100644 --- a/kwin/lib/kdecoration_p.h +++ b/kwin/lib/kdecoration_p.h @@ -85,7 +85,7 @@ class KDecorationBridge : public KDecorationDefines virtual void performWindowOperation( WindowOperation ) = 0; virtual void setMask( const TQRegion&, int ) = 0; virtual bool isPreview() const = 0; - virtual TQRect tqgeometry() const = 0; + virtual TQRect geometry() const = 0; virtual TQRect iconGeometry() const = 0; virtual TQRegion unobscuredRegion( const TQRegion& r ) const = 0; virtual TQWidget* workspaceWidget() const = 0; diff --git a/kwin/lib/kdecoration_plugins_p.cpp b/kwin/lib/kdecoration_plugins_p.cpp index 2e870eaf4..0490e4755 100644 --- a/kwin/lib/kdecoration_plugins_p.cpp +++ b/kwin/lib/kdecoration_plugins_p.cpp @@ -167,7 +167,7 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr ) // For clients in kdeartwork TQString catalogue = nameStr; - catalogue.tqreplace( "kwin3_", "kwin_" ); + catalogue.replace( "kwin3_", "kwin_" ); KGlobal::locale()->insertCatalogue( catalogue ); // For KCommonDecoration based clients KGlobal::locale()->insertCatalogue( "kwin_lib" ); diff --git a/kwin/lib/kdecorationfactory.cpp b/kwin/lib/kdecorationfactory.cpp index 65fde37bc..7ad1aefbe 100644 --- a/kwin/lib/kdecorationfactory.cpp +++ b/kwin/lib/kdecorationfactory.cpp @@ -58,7 +58,7 @@ TQValueList< KDecorationDefines::BorderSize > KDecorationFactory::borderSizes() bool KDecorationFactory::exists( const KDecoration* deco ) const { - return _decorations.tqcontains( const_cast< KDecoration* >( deco )); + return _decorations.contains( const_cast< KDecoration* >( deco )); } void KDecorationFactory::addDecoration( KDecoration* deco ) diff --git a/kwin/lib/kdecorationfactory.h b/kwin/lib/kdecorationfactory.h index 467a24f17..7396ad987 100644 --- a/kwin/lib/kdecorationfactory.h +++ b/kwin/lib/kdecorationfactory.h @@ -53,10 +53,10 @@ class KWIN_EXPORT KDecorationFactory virtual KDecoration* createDecoration( KDecorationBridge* bridge ) = 0; /** * This function is called when the configuration settings changed. - * The argument specifies what has changed, using the SettingXXX tqmasks. + * 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 tqrepaint will be sufficient, in which case false should be returned, + * a repaint 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/kwin/main.cpp b/kwin/main.cpp index b24e86712..edceeb6bf 100644 --- a/kwin/main.cpp +++ b/kwin/main.cpp @@ -96,9 +96,9 @@ Application::Application( ) if (screen_number == -1) screen_number = DefaultScreen(qt_xdisplay()); - if( !owner.claim( args->isSet( "tqreplace" ), true )) + if( !owner.claim( args->isSet( "replace" ), true )) { - fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --tqreplace)\n").local8Bit(), stderr); + fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); ::exit(1); } connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); @@ -142,7 +142,7 @@ Application::Application( ) Application::~Application() { delete Workspace::self(); - if( owner.ownerWindow() != None ) // if there was no --tqreplace (no new WM) + if( owner.ownerWindow() != None ) // if there was no --replace (no new WM) { XSetInputFocus( qt_xdisplay(), PointerRoot, RevertToPointerRoot, qt_x_time ); DCOPRef ref( "kded", "kded" ); @@ -184,7 +184,7 @@ static const char description[] = I18N_NOOP( "KDE window manager" ); static KCmdLineOptions args[] = { { "lock", I18N_NOOP("Disable configuration options"), 0 }, - { "tqreplace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 }, + { "replace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 }, KCmdLineLastOption }; diff --git a/kwin/manage.cpp b/kwin/manage.cpp index 06fbb0511..df385867a 100644 --- a/kwin/manage.cpp +++ b/kwin/manage.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to handling incoming events. + This file contains things relevant to handling incoming events. */ @@ -32,7 +32,7 @@ namespace KWinInternal /*! Manages the clients. This means handling the very first maprequest: - reparenting, initial tqgeometry, initial state, placement, etc. + reparenting, initial geometry, initial state, placement, etc. Returns false if KWin is not going to manage this window. */ bool Client::manage( Window w, bool isMapped ) @@ -44,8 +44,8 @@ bool Client::manage( Window w, bool isMapped ) grabXServer(); // from this place on, manage() mustn't return false - postpone_tqgeometry_updates = 1; - pending_tqgeometry_update = true; // force update when finishing with tqgeometry changes + postpone_geometry_updates = 1; + pending_geometry_update = true; // force update when finishing with geometry changes embedClient( w, attr ); @@ -195,7 +195,7 @@ bool Client::manage( Window w, bool isMapped ) bool placementDone = FALSE; if ( session ) - geom = session->tqgeometry; + geom = session->geometry; TQRect area; bool partial_keep_in_area = isMapped || session; @@ -234,7 +234,7 @@ bool Client::manage( Window w, bool isMapped ) bool usePosition = false; if ( isMapped || session || placementDone ) - placementDone = true; // use tqgeometry + placementDone = true; // use geometry else if( isTransient() && !isUtility() && !isDialog() && !isSplash()) usePosition = true; else if( isTransient() && !hasNETSupport()) @@ -266,7 +266,7 @@ bool Client::manage( Window w, bool isMapped ) usePosition = true; if( !rules()->checkIgnoreGeometry( !usePosition )) { - bool ignorePPosition = ( options->ignorePositionClasses.tqcontains(TQString::tqfromLatin1(resourceClass()))); + bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::fromLatin1(resourceClass()))); if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) || (xSizeHint.flags & USPosition) ) @@ -321,7 +321,7 @@ bool Client::manage( Window w, bool isMapped ) keepInArea( area, partial_keep_in_area ); XShapeSelectInput( qt_xdisplay(), window(), ShapeNotifyMask ); - is_tqshape = Shape::hasShape( window()); + is_shape = Shape::hasShape( window()); updateShape(); //CT extra check for stupid jdk 1.3.1. But should make sense in general @@ -357,7 +357,7 @@ bool Client::manage( Window w, bool isMapped ) minimize( true ); // no animation // SELI this seems to be mainly for kstart and ksystraycmd - // probably should be tqreplaced by something better + // probably should be replaced by something better bool doNotShow = false; if ( workspace()->isNotManaged( caption() ) ) doNotShow = TRUE; @@ -388,7 +388,7 @@ bool Client::manage( Window w, bool isMapped ) } else { - geom_restore = tqgeometry(); // remember restore tqgeometry + geom_restore = geometry(); // remember restore geometry if ( isMaximizable() && ( width() >= area.width() || height() >= area.height() ) ) { @@ -416,7 +416,7 @@ bool Client::manage( Window w, bool isMapped ) } // window may want to be maximized // done after checking that the window isn't larger than the workarea, so that - // the restore tqgeometry from the checks above takes precedence, and window + // the restore geometry from the checks above takes precedence, and window // isn't restored larger than the workarea MaximizeMode maxmode = static_cast< MaximizeMode > ((( info->state() & NET::MaxVert ) ? MaximizeVertical : 0 ) diff --git a/kwin/options.cpp b/kwin/options.cpp index 3abc7ffc2..cab703051 100644 --- a/kwin/options.cpp +++ b/kwin/options.cpp @@ -53,7 +53,7 @@ unsigned long Options::updateSettings() config->setGroup( "Windows" ); moveMode = stringToMoveResizeMode( config->readEntry("MoveMode", "Opaque" )); resizeMode = stringToMoveResizeMode( config->readEntry("ResizeMode", "Opaque" )); - show_tqgeometry_tip = config->readBoolEntry("GeometryTip", false); + show_geometry_tip = config->readBoolEntry("GeometryTip", false); tabboxOutline = config->readBoolEntry("TabboxOutline", true); TQString val; @@ -95,7 +95,7 @@ unsigned long Options::updateSettings() placement = Placement::policyFromString( config->readEntry("Placement"), true ); xineramaPlacementScreen = KCLAMP( config->readNumEntry( "XineramaPlacementScreen", -1 ), - -1, tqApp->desktop()->numScreens() - 1 ); + -1, qApp->desktop()->numScreens() - 1 ); animateShade = config->readBoolEntry("AnimateShade", TRUE ); animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE ); @@ -301,7 +301,7 @@ Options::MouseWheelCommand Options::mouseWheelCommand(const TQString &name) bool Options::showGeometryTip() { - return show_tqgeometry_tip; + return show_geometry_tip; } TQColor &Options::shadowColour(bool active) @@ -379,7 +379,7 @@ int Options::electricBorderDelay() bool Options::checkIgnoreFocusStealing( const Client* c ) { - return ignoreFocusStealingClasses.tqcontains(TQString::tqfromLatin1(c->resourceClass())); + return ignoreFocusStealingClasses.contains(TQString::fromLatin1(c->resourceClass())); } Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta ) diff --git a/kwin/options.h b/kwin/options.h index 7200f3257..dbaa8855f 100644 --- a/kwin/options.h +++ b/kwin/options.h @@ -372,7 +372,7 @@ class Options : public KDecorationOptions int electric_borders; int electric_border_delay; - bool show_tqgeometry_tip; + bool show_geometry_tip; bool topmenus; bool desktop_topmenu; TQColor shadow_colour; diff --git a/kwin/placement.cpp b/kwin/placement.cpp index 4911d7256..a9862ce27 100644 --- a/kwin/placement.cpp +++ b/kwin/placement.cpp @@ -35,7 +35,7 @@ Placement::Placement(Workspace* w) } /*! - Places the client \a c according to the workspace's tqlayout policy + Places the client \a c according to the workspace's layout policy */ void Placement::place(Client* c, TQRect& area ) { @@ -452,7 +452,7 @@ void Placement::placeDialog(Client* c, TQRect& area, Policy nextPlacement ) void Placement::placeUnderMouse(Client* c, TQRect& area, Policy /*next*/ ) { area = checkArea( c, area ); - TQRect geom = c->tqgeometry(); + TQRect geom = c->geometry(); geom.moveCenter( TQCursor::pos()); c->move( geom.topLeft()); c->keepInArea( area ); // make sure it's kept inside workarea @@ -507,8 +507,8 @@ void Placement::placeOnMainWindow(Client* c, TQRect& area, Policy nextPlacement place( c, area, Centered ); return; } - TQRect geom = c->tqgeometry(); - geom.moveCenter( place_on->tqgeometry().center()); + TQRect geom = c->geometry(); + geom.moveCenter( place_on->geometry().center()); c->move( geom.topLeft()); // get area again, because the mainwindow may be on different xinerama screen area = checkArea( c, TQRect()); @@ -523,7 +523,7 @@ void Placement::placeMaximizing(Client* c, TQRect& area, Policy nextPlacement ) { if( m_WorkspacePtr->clientArea( MaximizeArea, c ) == area ) c->maximize( Client::MaximizeFull ); - else // if the tqgeometry doesn't match default maximize area (xinerama case?), + else // if the geometry doesn't match default maximize area (xinerama case?), { // it's probably better to use the given area c->setGeometry( area ); } @@ -538,7 +538,7 @@ void Placement::placeMaximizing(Client* c, TQRect& area, Policy nextPlacement ) TQRect Placement::checkArea( const Client* c, const TQRect& area ) { if( area.isNull()) - return m_WorkspacePtr->clientArea( PlacementArea, c->tqgeometry().center(), c->desktop()); + return m_WorkspacePtr->clientArea( PlacementArea, c->geometry().center(), c->desktop()); return area; } @@ -591,7 +591,7 @@ const char* Placement::policyToString( Policy policy ) void Workspace::slotWindowPackLeft() { if( active_client && active_client->isMovable()) - active_client->move( packPositionLeft( active_client, active_client->tqgeometry().left(), true ), + active_client->move( packPositionLeft( active_client, active_client->geometry().left(), true ), active_client->y()); } @@ -599,7 +599,7 @@ void Workspace::slotWindowPackRight() { if( active_client && active_client->isMovable()) active_client->move( - packPositionRight( active_client, active_client->tqgeometry().right(), true ) + packPositionRight( active_client, active_client->geometry().right(), true ) - active_client->width() + 1, active_client->y()); } @@ -607,14 +607,14 @@ void Workspace::slotWindowPackUp() { if( active_client && active_client->isMovable()) active_client->move( active_client->x(), - packPositionUp( active_client, active_client->tqgeometry().top(), true )); + packPositionUp( active_client, active_client->geometry().top(), true )); } void Workspace::slotWindowPackDown() { if( active_client && active_client->isMovable()) active_client->move( active_client->x(), - packPositionDown( active_client, active_client->tqgeometry().bottom(), true ) - active_client->height() + 1 ); + packPositionDown( active_client, active_client->geometry().bottom(), true ) - active_client->height() + 1 ); } void Workspace::slotWindowGrowHorizontal() @@ -627,16 +627,16 @@ void Client::growHorizontal() { if( !isResizable() || isShade()) return; - TQRect geom = tqgeometry(); + TQRect geom = geometry(); geom.setRight( workspace()->packPositionRight( this, geom.right(), true )); TQSize adjsize = adjustedSize( geom.size(), SizemodeFixedW ); - if( tqgeometry().size() == adjsize && geom.size() != adjsize && xSizeHint.width_inc > 1 ) // take care of size increments + if( geometry().size() == adjsize && geom.size() != adjsize && xSizeHint.width_inc > 1 ) // take care of size increments { int newright = workspace()->packPositionRight( this, geom.right() + xSizeHint.width_inc - 1, true ); // check that it hasn't grown outside of the area, due to size increments // TODO this may be wrong? if( workspace()->clientArea( MovementArea, - TQPoint(( x() + newright ) / 2, tqgeometry().center().y()), desktop()).right() >= newright ) + TQPoint(( x() + newright ) / 2, geometry().center().y()), desktop()).right() >= newright ) geom.setRight( newright ); } geom.setSize( adjustedSize( geom.size(), SizemodeFixedW )); @@ -653,7 +653,7 @@ void Client::shrinkHorizontal() { if( !isResizable() || isShade()) return; - TQRect geom = tqgeometry(); + TQRect geom = geometry(); geom.setRight( workspace()->packPositionLeft( this, geom.right(), false )); if( geom.width() <= 1 ) return; @@ -672,15 +672,15 @@ void Client::growVertical() { if( !isResizable() || isShade()) return; - TQRect geom = tqgeometry(); + TQRect geom = geometry(); geom.setBottom( workspace()->packPositionDown( this, geom.bottom(), true )); TQSize adjsize = adjustedSize( geom.size(), SizemodeFixedH ); - if( tqgeometry().size() == adjsize && geom.size() != adjsize && xSizeHint.height_inc > 1 ) // take care of size increments + if( geometry().size() == adjsize && geom.size() != adjsize && xSizeHint.height_inc > 1 ) // take care of size increments { int newbottom = workspace()->packPositionDown( this, geom.bottom() + xSizeHint.height_inc - 1, true ); // check that it hasn't grown outside of the area, due to size increments if( workspace()->clientArea( MovementArea, - TQPoint( tqgeometry().center().x(), ( y() + newbottom ) / 2 ), desktop()).bottom() >= newbottom ) + TQPoint( geometry().center().x(), ( y() + newbottom ) / 2 ), desktop()).bottom() >= newbottom ) geom.setBottom( newbottom ); } geom.setSize( adjustedSize( geom.size(), SizemodeFixedH )); @@ -698,7 +698,7 @@ void Client::shrinkVertical() { if( !isResizable() || isShade()) return; - TQRect geom = tqgeometry(); + TQRect geom = geometry(); geom.setBottom( workspace()->packPositionUp( this, geom.bottom(), false )); if( geom.height() <= 1 ) return; @@ -712,7 +712,7 @@ int Workspace::packPositionLeft( const Client* cl, int oldx, bool left_edge ) co int newx = clientArea( MovementArea, cl ).left(); if( oldx <= newx ) // try another Xinerama screen newx = clientArea( MovementArea, - TQPoint( cl->tqgeometry().left() - 1, cl->tqgeometry().center().y()), cl->desktop()).left(); + TQPoint( cl->geometry().left() - 1, cl->geometry().center().y()), cl->desktop()).left(); if( oldx <= newx ) return oldx; for( ClientList::ConstIterator it = clients.begin(); @@ -721,10 +721,10 @@ int Workspace::packPositionLeft( const Client* cl, int oldx, bool left_edge ) co { if( !(*it)->isShown( false ) || !(*it)->isOnDesktop( active_client->desktop())) continue; - int x = left_edge ? (*it)->tqgeometry().right() + 1 : (*it)->tqgeometry().left() - 1; + int x = left_edge ? (*it)->geometry().right() + 1 : (*it)->geometry().left() - 1; if( x > newx && x < oldx - && !( cl->tqgeometry().top() > (*it)->tqgeometry().bottom() // they overlap in Y direction - || cl->tqgeometry().bottom() < (*it)->tqgeometry().top())) + && !( cl->geometry().top() > (*it)->geometry().bottom() // they overlap in Y direction + || cl->geometry().bottom() < (*it)->geometry().top())) newx = x; } return newx; @@ -735,7 +735,7 @@ int Workspace::packPositionRight( const Client* cl, int oldx, bool right_edge ) int newx = clientArea( MovementArea, cl ).right(); if( oldx >= newx ) // try another Xinerama screen newx = clientArea( MovementArea, - TQPoint( cl->tqgeometry().right() + 1, cl->tqgeometry().center().y()), cl->desktop()).right(); + TQPoint( cl->geometry().right() + 1, cl->geometry().center().y()), cl->desktop()).right(); if( oldx >= newx ) return oldx; for( ClientList::ConstIterator it = clients.begin(); @@ -744,10 +744,10 @@ int Workspace::packPositionRight( const Client* cl, int oldx, bool right_edge ) { if( !(*it)->isShown( false ) || !(*it)->isOnDesktop( cl->desktop())) continue; - int x = right_edge ? (*it)->tqgeometry().left() - 1 : (*it)->tqgeometry().right() + 1; + int x = right_edge ? (*it)->geometry().left() - 1 : (*it)->geometry().right() + 1; if( x < newx && x > oldx - && !( cl->tqgeometry().top() > (*it)->tqgeometry().bottom() - || cl->tqgeometry().bottom() < (*it)->tqgeometry().top())) + && !( cl->geometry().top() > (*it)->geometry().bottom() + || cl->geometry().bottom() < (*it)->geometry().top())) newx = x; } return newx; @@ -758,7 +758,7 @@ int Workspace::packPositionUp( const Client* cl, int oldy, bool top_edge ) const int newy = clientArea( MovementArea, cl ).top(); if( oldy <= newy ) // try another Xinerama screen newy = clientArea( MovementArea, - TQPoint( cl->tqgeometry().center().x(), cl->tqgeometry().top() - 1 ), cl->desktop()).top(); + TQPoint( cl->geometry().center().x(), cl->geometry().top() - 1 ), cl->desktop()).top(); if( oldy <= newy ) return oldy; for( ClientList::ConstIterator it = clients.begin(); @@ -767,10 +767,10 @@ int Workspace::packPositionUp( const Client* cl, int oldy, bool top_edge ) const { if( !(*it)->isShown( false ) || !(*it)->isOnDesktop( cl->desktop())) continue; - int y = top_edge ? (*it)->tqgeometry().bottom() + 1 : (*it)->tqgeometry().top() - 1; + int y = top_edge ? (*it)->geometry().bottom() + 1 : (*it)->geometry().top() - 1; if( y > newy && y < oldy - && !( cl->tqgeometry().left() > (*it)->tqgeometry().right() // they overlap in X direction - || cl->tqgeometry().right() < (*it)->tqgeometry().left())) + && !( cl->geometry().left() > (*it)->geometry().right() // they overlap in X direction + || cl->geometry().right() < (*it)->geometry().left())) newy = y; } return newy; @@ -781,7 +781,7 @@ int Workspace::packPositionDown( const Client* cl, int oldy, bool bottom_edge ) int newy = clientArea( MovementArea, cl ).bottom(); if( oldy >= newy ) // try another Xinerama screen newy = clientArea( MovementArea, - TQPoint( cl->tqgeometry().center().x(), cl->tqgeometry().bottom() + 1 ), cl->desktop()).bottom(); + TQPoint( cl->geometry().center().x(), cl->geometry().bottom() + 1 ), cl->desktop()).bottom(); if( oldy >= newy ) return oldy; for( ClientList::ConstIterator it = clients.begin(); @@ -790,10 +790,10 @@ int Workspace::packPositionDown( const Client* cl, int oldy, bool bottom_edge ) { if( !(*it)->isShown( false ) || !(*it)->isOnDesktop( cl->desktop())) continue; - int y = bottom_edge ? (*it)->tqgeometry().top() - 1 : (*it)->tqgeometry().bottom() + 1; + int y = bottom_edge ? (*it)->geometry().top() - 1 : (*it)->geometry().bottom() + 1; if( y < newy && y > oldy - && !( cl->tqgeometry().left() > (*it)->tqgeometry().right() - || cl->tqgeometry().right() < (*it)->tqgeometry().left())) + && !( cl->geometry().left() > (*it)->geometry().right() + || cl->geometry().right() < (*it)->geometry().left())) newy = y; } return newy; diff --git a/kwin/popupinfo.cpp b/kwin/popupinfo.cpp index d07e7262c..f0e80640a 100644 --- a/kwin/popupinfo.cpp +++ b/kwin/popupinfo.cpp @@ -76,7 +76,7 @@ void PopupInfo::paintEvent( TQPaintEvent* ) { TQPainter p( this ); style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default ); + colorGroup(), 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, tqcolorGroup().brush( TQColorGroup::Background ) ); + p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) ); /* p.setPen(Qt::white); diff --git a/kwin/rules.cpp b/kwin/rules.cpp index e0631d53c..cfcf4bc43 100644 --- a/kwin/rules.cpp +++ b/kwin/rules.cpp @@ -58,7 +58,7 @@ Rules::Rules() , acceptfocusrule( UnusedForceRule ) , moveresizemoderule( UnusedForceRule ) , closeablerule( UnusedForceRule ) - , stricttqgeometryrule( UnusedForceRule ) + , strictgeometryrule( UnusedForceRule ) , shortcutrule( UnusedSetRule ) , disableglobalshortcutsrule( UnusedForceRule ) { @@ -162,7 +162,7 @@ void Rules::readFromCfg( KConfig& cfg ) READ_FORCE_RULE( acceptfocus, Bool, ); READ_FORCE_RULE( moveresizemode, , Options::stringToMoveResizeMode ); READ_FORCE_RULE( closeable, Bool, ); - READ_FORCE_RULE( stricttqgeometry, Bool, ); + READ_FORCE_RULE( strictgeometry, Bool, ); READ_SET_RULE( shortcut, , ); READ_FORCE_RULE( disableglobalshortcuts, Bool, ); } @@ -251,7 +251,7 @@ void Rules::write( KConfig& cfg ) const WRITE_FORCE_RULE( acceptfocus, ); WRITE_FORCE_RULE( moveresizemode, Options::moveResizeModeToString ); WRITE_FORCE_RULE( closeable, ); - WRITE_FORCE_RULE( stricttqgeometry, ); + WRITE_FORCE_RULE( strictgeometry, ); WRITE_SET_RULE( shortcut, ); WRITE_FORCE_RULE( disableglobalshortcuts, ); } @@ -288,7 +288,7 @@ bool Rules::isEmpty() const && acceptfocusrule == UnusedForceRule && moveresizemoderule == UnusedForceRule && closeablerule == UnusedForceRule - && stricttqgeometryrule == UnusedForceRule + && strictgeometryrule == UnusedForceRule && shortcutrule == UnusedSetRule && disableglobalshortcutsrule == UnusedForceRule ); } @@ -339,7 +339,7 @@ bool Rules::matchWMClass( const TQCString& match_class, const TQCString& match_n return false; if( wmclassmatch == ExactMatch && wmclass != cwmclass ) return false; - if( wmclassmatch == SubstringMatch && !cwmclass.tqcontains( wmclass )) + if( wmclassmatch == SubstringMatch && !cwmclass.contains( wmclass )) return false; } return true; @@ -353,7 +353,7 @@ bool Rules::matchRole( const TQCString& match_role ) const return false; if( windowrolematch == ExactMatch && windowrole != match_role ) return false; - if( windowrolematch == SubstringMatch && !match_role.tqcontains( windowrole )) + if( windowrolematch == SubstringMatch && !match_role.contains( windowrole )) return false; } return true; @@ -367,7 +367,7 @@ bool Rules::matchTitle( const TQString& match_title ) const return false; if( titlematch == ExactMatch && title != match_title ) return false; - if( titlematch == SubstringMatch && !match_title.tqcontains( title )) + if( titlematch == SubstringMatch && !match_title.contains( title )) return false; } return true; @@ -388,7 +388,7 @@ bool Rules::matchClientMachine( const TQCString& match_machine ) const && clientmachine != match_machine ) return false; if( clientmachinematch == SubstringMatch - && !match_machine.tqcontains( clientmachine )) + && !match_machine.contains( clientmachine )) return false; } return true; @@ -614,7 +614,7 @@ APPLY_FORCE_RULE( fsplevel, FSP, int ) APPLY_FORCE_RULE( acceptfocus, AcceptFocus, bool ) APPLY_FORCE_RULE( moveresizemode, MoveResizeMode, Options::MoveResizeMode ) APPLY_FORCE_RULE( closeable, Closeable, bool ) -APPLY_FORCE_RULE( stricttqgeometry, StrictGeometry, bool ) +APPLY_FORCE_RULE( strictgeometry, StrictGeometry, bool ) APPLY_RULE( shortcut, Shortcut, TQString ) APPLY_FORCE_RULE( disableglobalshortcuts, DisableGlobalShortcuts, bool ) @@ -676,7 +676,7 @@ void Rules::discardUsed( bool withdrawn ) DISCARD_USED_FORCE_RULE( acceptfocus ); DISCARD_USED_FORCE_RULE( moveresizemode ); DISCARD_USED_FORCE_RULE( closeable ); - DISCARD_USED_FORCE_RULE( stricttqgeometry ); + DISCARD_USED_FORCE_RULE( strictgeometry ); DISCARD_USED_SET_RULE( shortcut ); DISCARD_USED_FORCE_RULE( disableglobalshortcuts ); } @@ -1038,7 +1038,7 @@ void Workspace::discardUsedWindowRules( Client* c, bool withdrawn ) it != rules.end(); ) { - if( c->rules()->tqcontains( *it )) + if( c->rules()->contains( *it )) { updated = true; (*it)->discardUsed( withdrawn ); diff --git a/kwin/rules.h b/kwin/rules.h index 08a563762..584e6a952 100644 --- a/kwin/rules.h +++ b/kwin/rules.h @@ -40,7 +40,7 @@ class WindowRules WindowRules(); void update( Client* ); void discardTemporary(); - bool tqcontains( const Rules* rule ) const; + bool contains( const Rules* rule ) const; void remove( Rules* rule ); Placement::Policy checkPlacement( Placement::Policy placement ) const; TQRect checkGeometry( TQRect rect, bool init = false ) const; @@ -232,8 +232,8 @@ class Rules ForceRule moveresizemoderule; bool closeable; ForceRule closeablerule; - bool stricttqgeometry; - ForceRule stricttqgeometryrule; + bool strictgeometry; + ForceRule strictgeometryrule; TQString shortcut; SetRule shortcutrule; bool disableglobalshortcuts; @@ -284,15 +284,15 @@ WindowRules::WindowRules() } inline -bool WindowRules::tqcontains( const Rules* rule ) const +bool WindowRules::contains( const Rules* rule ) const { - return tqFind( rules.begin(), rules.end(), rule ) != rules.end(); + return qFind( rules.begin(), rules.end(), rule ) != rules.end(); } inline void WindowRules::remove( Rules* rule ) { - TQValueVector< Rules* >::Iterator pos = tqFind( rules.begin(), rules.end(), rule ); + TQValueVector< Rules* >::Iterator pos = qFind( rules.begin(), rules.end(), rule ); if( pos != rules.end()) rules.erase( pos ); } diff --git a/kwin/sm.cpp b/kwin/sm.cpp index 9628a8c19..31cada7e0 100644 --- a/kwin/sm.cpp +++ b/kwin/sm.cpp @@ -94,9 +94,9 @@ void Workspace::storeSession( KConfig* config, SMSavePhase phase ) config->writeEntry( TQString("wmClientMachine")+n, c->wmClientMachine( true ).data() ); config->writeEntry( TQString("resourceName")+n, c->resourceName().data() ); config->writeEntry( TQString("resourceClass")+n, c->resourceClass().data() ); - config->writeEntry( TQString("tqgeometry")+n, TQRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME - config->writeEntry( TQString("restore")+n, c->tqgeometryRestore() ); - config->writeEntry( TQString("fsrestore")+n, c->tqgeometryFSRestore() ); + config->writeEntry( TQString("geometry")+n, TQRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME + config->writeEntry( TQString("restore")+n, c->geometryRestore() ); + config->writeEntry( TQString("fsrestore")+n, c->geometryFSRestore() ); config->writeEntry( TQString("maximize")+n, (int) c->maximizeMode() ); config->writeEntry( TQString("fullscreen")+n, (int) c->fullScreenMode() ); config->writeEntry( TQString("desktop")+n, c->desktop() ); @@ -164,7 +164,7 @@ void Workspace::loadSessionInfo() info->wmClientMachine = config->readEntry( TQString("wmClientMachine")+n ).latin1(); info->resourceName = config->readEntry( TQString("resourceName")+n ).latin1(); info->resourceClass = config->readEntry( TQString("resourceClass")+n ).lower().latin1(); - info->tqgeometry = config->readRectEntry( TQString("tqgeometry")+n ); + info->geometry = config->readRectEntry( TQString("geometry")+n ); info->restore = config->readRectEntry( TQString("restore")+n ); info->fsrestore = config->readRectEntry( TQString("fsrestore")+n ); info->maximized = config->readNumEntry( TQString("maximize")+n, 0 ); @@ -265,7 +265,7 @@ bool Workspace::windowRoleMatch( const TQCString& role1, const TQCString& role2 if( pos1 < 0 || pos2 < 0 || pos1 != pos2 ) ret = role1 == role2; else - ret = tqstrncmp( role1, role2, pos1 ) == 0; + ret = qstrncmp( role1, role2, pos1 ) == 0; kdDebug() << "WR:" << role1 << ":" << pos1 << ":" << role2 << ":" << pos2 << ":::" << ret << endl; return ret; } @@ -402,7 +402,7 @@ SessionSaveDoneHelper::SessionSaveDoneHelper() props[ 2 ].num_vals = 1; props[ 2 ].vals = &propvalue[ 2 ]; propvalue[ 3 ].length = 0; - propvalue[ 3 ].value = tqApp->argv()[ 0 ]; + propvalue[ 3 ].value = qApp->argv()[ 0 ]; props[ 3 ].name = const_cast< char* >( SmProgram ); props[ 3 ].type = const_cast< char* >( SmARRAY8 ); props[ 3 ].num_vals = 1; @@ -30,7 +30,7 @@ struct SessionInfo TQCString resourceName; TQCString resourceClass; - TQRect tqgeometry; + TQRect geometry; TQRect restore; TQRect fsrestore; int maximized; diff --git a/kwin/tabbox.cpp b/kwin/tabbox.cpp index e96d0c24b..a79c10233 100644 --- a/kwin/tabbox.cpp +++ b/kwin/tabbox.cpp @@ -116,7 +116,7 @@ void TabBox::createClientList(ClientList &list, int desktop /*-1 = all*/, Client Client* modal = c->findModal(); if( modal == NULL || modal == c ) add = c; - else if( !list.tqcontains( modal )) + else if( !list.contains( modal )) add = modal; else { @@ -273,7 +273,7 @@ void TabBox::nextPrev( bool next) client = 0; break; } - } while ( client && !clients.tqcontains( client )); + } while ( client && !clients.contains( client )); setCurrentClient( client ); } else if( mode() == DesktopMode ) @@ -402,7 +402,7 @@ void TabBox::drawContents( TQPainter * ) { // draw highlight background if ( (*it) == current_client ) - p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); // draw icon TQPixmap icon; @@ -439,11 +439,11 @@ void TabBox::drawContents( TQPainter * ) // draw text if ( (*it) == current_client ) - p.setPen(tqcolorGroup().highlightedText()); + p.setPen(colorGroup().highlightedText()); else if( (*it)->isMinimized()) { - TQColor c1 = tqcolorGroup().text(); - TQColor c2 = tqcolorGroup().background(); + TQColor c1 = colorGroup().text(); + TQColor c2 = colorGroup().background(); // from kicker's TaskContainer::blendColors() int r1, g1, b1; int r2, g2, b2; @@ -458,7 +458,7 @@ void TabBox::drawContents( TQPainter * ) p.setPen(TQColor( r1, g1, b1 )); } else - p.setPen(tqcolorGroup().text()); + p.setPen(colorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, s); @@ -496,13 +496,13 @@ void TabBox::drawContents( TQPainter * ) { // draw highlight background if ( iDesktop == desk ) // current desktop - p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); p.save(); // draw "icon" (here: number of desktop) - p.fillRect(x+5, y+2, iconWidth, iconHeight, tqcolorGroup().base()); - p.setPen(tqcolorGroup().text()); + p.fillRect(x+5, y+2, iconWidth, iconHeight, colorGroup().base()); + p.setPen(colorGroup().text()); p.drawRect(x+5, y+2, iconWidth, iconHeight); // draw desktop-number @@ -514,9 +514,9 @@ void TabBox::drawContents( TQPainter * ) // draw desktop name text if ( iDesktop == desk ) - p.setPen(tqcolorGroup().highlightedText()); + p.setPen(colorGroup().highlightedText()); else - p.setPen(tqcolorGroup().text()); + p.setPen(colorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, @@ -698,7 +698,7 @@ void TabBox::handleMouseEvent( XEvent* e ) if( e->type != ButtonPress ) return; TQPoint pos( e->xbutton.x_root, e->xbutton.y_root ); - if( !tqgeometry().tqcontains( pos )) + if( !geometry().contains( pos )) { workspace()->closeTabBox(); // click outside closes tab return; @@ -766,10 +766,10 @@ bool areKeySymXsDepressed( bool bAll, const uint keySyms[], int nKeySyms ) uint keySymX = keySyms[ iKeySym ]; uchar keyCodeX = XKeysymToKeycode( qt_xdisplay(), keySymX ); int i = keyCodeX / 8; - char tqmask = 1 << (keyCodeX - (i * 8)); + char mask = 1 << (keyCodeX - (i * 8)); kdDebug(125) << iKeySym << ": keySymX=0x" << TQString::number( keySymX, 16 ) - << " i=" << i << " tqmask=0x" << TQString::number( tqmask, 16 ) + << " i=" << i << " mask=0x" << TQString::number( mask, 16 ) << " keymap[i]=0x" << TQString::number( keymap[i], 16 ) << endl; // Abort if bad index value, @@ -779,13 +779,13 @@ bool areKeySymXsDepressed( bool bAll, const uint keySyms[], int nKeySyms ) // If ALL keys passed need to be depressed, if( bAll ) { - if( (keymap[i] & tqmask) == 0 ) + if( (keymap[i] & mask) == 0 ) return false; } else { // If we are looking for ANY key press, and this key is depressed, - if( keymap[i] & tqmask ) + if( keymap[i] & mask ) return true; } } @@ -1117,8 +1117,8 @@ void Workspace::tabBoxKeyPress( const KKeyNative& keyX ) if (tab_grab) { - forward = cutWalkThroughWindows.tqcontains( keyX ); - backward = cutWalkThroughWindowsReverse.tqcontains( keyX ); + forward = cutWalkThroughWindows.contains( keyX ); + backward = cutWalkThroughWindowsReverse.contains( keyX ); if (forward || backward) { kdDebug(125) << "== " << cutWalkThroughWindows.toStringInternal() @@ -1128,10 +1128,10 @@ void Workspace::tabBoxKeyPress( const KKeyNative& keyX ) } else if (control_grab) { - forward = cutWalkThroughDesktops.tqcontains( keyX ) || - cutWalkThroughDesktopList.tqcontains( keyX ); - backward = cutWalkThroughDesktopsReverse.tqcontains( keyX ) || - cutWalkThroughDesktopListReverse.tqcontains( keyX ); + forward = cutWalkThroughDesktops.contains( keyX ) || + cutWalkThroughDesktopList.contains( keyX ); + backward = cutWalkThroughDesktopsReverse.contains( keyX ) || + cutWalkThroughDesktopListReverse.contains( keyX ); if (forward || backward) walkThroughDesktops(forward); } diff --git a/kwin/tools/decobenchmark/main.cpp b/kwin/tools/decobenchmark/main.cpp index ca3ce11d2..d0d165005 100644 --- a/kwin/tools/decobenchmark/main.cpp +++ b/kwin/tools/decobenchmark/main.cpp @@ -40,7 +40,7 @@ static KCmdLineOptions options[] = { { "+decoration", "Decoration library to use, such as kwin3_plastik.", 0 }, - { "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 }, + { "+tests", "Which test should be executed ('all', 'repaint', '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 == "tqrepaint") + else if (t == "repaint") test = RepaintTest; else if (t == "caption") test = CaptionTest; diff --git a/kwin/tools/decobenchmark/preview.cpp b/kwin/tools/decobenchmark/preview.cpp index 69c85c140..3cbcdcb5f 100644 --- a/kwin/tools/decobenchmark/preview.cpp +++ b/kwin/tools/decobenchmark/preview.cpp @@ -61,12 +61,12 @@ KDecorationPreview::~KDecorationPreview() void KDecorationPreview::performRepaintTest(int n) { - kdDebug() << "start " << n << " tqrepaints..." << endl; + kdDebug() << "start " << n << " repaints..." << endl; bridge->setCaption("Deco Benchmark"); deco->captionChange(); positionPreviews(0); for (int i = 0; i < n; ++i) { - deco->widget()->tqrepaint(); + deco->widget()->repaint(); 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()->tqrepaint(); + deco->widget()->repaint(); kapp->processEvents(); } } @@ -127,10 +127,10 @@ void KDecorationPreview::positionPreviews(int shrink) if ( !deco ) return; - TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->tqminimumSize()*/; + TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->minimumSize()*/; - TQRect tqgeometry(TQPoint(10, 10), size); - deco->widget()->setGeometry(tqgeometry); + TQRect geometry(TQPoint(10, 10), size); + deco->widget()->setGeometry(geometry); } void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode ) @@ -165,7 +165,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode ) TQRect KDecorationPreview::windowGeometry( bool active ) const { TQWidget *widget = deco->widget(); - return widget->tqgeometry(); + return widget->geometry(); } TQRegion KDecorationPreview::unobscuredRegion( bool active, const TQRegion& r ) const @@ -309,7 +309,7 @@ bool KDecorationPreviewBridge::isPreview() const return false; } -TQRect KDecorationPreviewBridge::tqgeometry() const +TQRect KDecorationPreviewBridge::geometry() const { return preview->windowGeometry( active ); } diff --git a/kwin/tools/decobenchmark/preview.h b/kwin/tools/decobenchmark/preview.h index aea4fe7ea..9f2445036 100644 --- a/kwin/tools/decobenchmark/preview.h +++ b/kwin/tools/decobenchmark/preview.h @@ -85,7 +85,7 @@ class KDecorationPreviewBridge virtual void performWindowOperation( WindowOperation ); virtual void setMask( const TQRegion&, int ); virtual bool isPreview() const; - virtual TQRect tqgeometry() const; + virtual TQRect geometry() const; virtual TQRect iconGeometry() const; virtual TQRegion unobscuredRegion( const TQRegion& r ) const; virtual TQWidget* workspaceWidget() const; diff --git a/kwin/tools/xreply/xreply.c b/kwin/tools/xreply/xreply.c index 648961b80..ecdf6ebc3 100644 --- a/kwin/tools/xreply/xreply.c +++ b/kwin/tools/xreply/xreply.c @@ -33,7 +33,7 @@ __attribute((weak)) int ___xreply_reply_enabled = 1; extern long ___xreply_reply_count; extern int ___xreply_reply_enabled; -typedef tqStatus (*xreply_ptr_t)(Display*,xReply*,int,Bool); +typedef Status (*xreply_ptr_t)(Display*,xReply*,int,Bool); static xreply_ptr_t xreply_ptr = NULL; static int xreply_backtrace_set = 0; @@ -163,7 +163,7 @@ static void xreply_backtrace() free (strings); } -tqStatus +Status _XReply (dpy, rep, extra, discard) register Display *dpy; register xReply *rep; diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp index 6ad2bf041..e825ac846 100644 --- a/kwin/useractions.cpp +++ b/kwin/useractions.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to direct user actions, such as + This file contains things relevant to direct user actions, such as responses to global keyboard shortcuts, or selecting actions from the window operations menu. @@ -229,7 +229,7 @@ void Workspace::desktopPopupAboutToShow() id = desk_popup->insertItem( basic_name .arg(i) - .arg( desktopName(i).tqreplace( '&', "&&" )), + .arg( desktopName(i).replace( '&', "&&" )), i ); if ( active_popup_client && !active_popup_client->isOnAllDesktops() && active_popup_client->desktop() == i ) @@ -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->tqsizeHint(); + TQSize size = client_keys_dialog->sizeHint(); TQPoint pos = c->pos() + c->clientPos(); if( pos.x() + size.width() >= r.right()) pos.setX( r.right() - size.width()); @@ -364,9 +364,9 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op ) return; if (op == Options::MoveOp || op == Options::UnrestrictedMoveOp ) - TQCursor::setPos( c->tqgeometry().center() ); + TQCursor::setPos( c->geometry().center() ); if (op == Options::ResizeOp || op == Options::UnrestrictedResizeOp ) - TQCursor::setPos( c->tqgeometry().bottomRight()); + TQCursor::setPos( c->geometry().bottomRight()); switch ( op ) { case Options::MoveOp: @@ -1044,8 +1044,8 @@ void Workspace::showWindowMenu( const TQRect &pos, Client* cl ) else { TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop()); - clientPopupAboutToShow(); // needed for tqsizeHint() to be correct :-/ - int popupHeight = p->tqsizeHint().height(); + clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/ + int popupHeight = p->sizeHint().height(); if (y + popupHeight < area.height()) p->exec( TQPoint( x, y ) ); else @@ -1093,7 +1093,7 @@ void Client::setShortcut( const TQString& _cut ) // Format: // base+(abcdef)<space>base+(abcdef) // E.g. Alt+Ctrl+(ABCDEF) Win+X,Win+(ABCDEF) - if( !cut.tqcontains( '(' ) && !cut.tqcontains( ')' ) && !cut.tqcontains( ' ' )) + if( !cut.contains( '(' ) && !cut.contains( ')' ) && !cut.contains( ' ' )) { if( workspace()->shortcutAvailable( KShortcut( cut ), this )) setShortcutInternal( KShortcut( cut )); diff --git a/kwin/utils.cpp b/kwin/utils.cpp index cfbf3e994..33bdd6299 100644 --- a/kwin/utils.cpp +++ b/kwin/utils.cpp @@ -43,11 +43,11 @@ namespace KWinInternal // used to store the return values of // XShapeQueryExtension. -// Necessary since tqshaped window are an extension to X -int Shape::kwin_tqshape_version = 0; -int Shape::kwin_tqshape_event = 0; +// Necessary since shaped window are an extension to X +int Shape::kwin_shape_version = 0; +int Shape::kwin_shape_event = 0; -// does the window w need a tqshape combine tqmask around it? +// does the window w need a shape combine mask around it? bool Shape::hasShape( WId w) { int xws, yws, xbs, ybs; @@ -61,21 +61,21 @@ bool Shape::hasShape( WId w) return boundingShaped != 0; } -int Shape::tqshapeEvent() +int Shape::shapeEvent() { - return kwin_tqshape_event; + return kwin_shape_event; } void Shape::init() { - kwin_tqshape_version = 0; + kwin_shape_version = 0; int dummy; - if( !XShapeQueryExtension(qt_xdisplay(), &kwin_tqshape_event, &dummy)) + if( !XShapeQueryExtension(qt_xdisplay(), &kwin_shape_event, &dummy)) return; int major, minor; if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor )) return; - kwin_tqshape_version = major * 0x10 + minor; + kwin_shape_version = major * 0x10 + minor; } void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move, diff --git a/kwin/utils.h b/kwin/utils.h index c1c0fd38c..b1b2b2e2c 100644 --- a/kwin/utils.h +++ b/kwin/utils.h @@ -89,9 +89,9 @@ enum ForceGeometry_t { NormalGeometrySet, ForceGeometrySet }; // Areas, mostly related to Xinerama enum clientAreaOption { - PlacementArea, // tqgeometry where a window will be initially placed after being mapped + PlacementArea, // geometry where a window will be initially placed after being mapped MovementArea, // ??? window movement snapping area? ignore struts - MaximizeArea, // tqgeometry to which a window will be maximized + MaximizeArea, // geometry to which a window will be maximized MaximizeFullArea, // like MaximizeArea, but ignore struts - used e.g. for topmenu FullScreenArea, // area for fullscreen windows // these below don't depend on xinerama settings @@ -111,14 +111,14 @@ enum ShadeMode class Shape { public: - static bool available() { return kwin_tqshape_version > 0; } - static int version() { return kwin_tqshape_version; } // as 16*major+minor, i.e. two hex digits + static bool available() { return kwin_shape_version > 0; } + static int version() { return kwin_shape_version; } // as 16*major+minor, i.e. two hex digits static bool hasShape( WId w); - static int tqshapeEvent(); + static int shapeEvent(); static void init(); private: - static int kwin_tqshape_version; - static int kwin_tqshape_event; + static int kwin_shape_version; + static int kwin_shape_event; }; // compile with XShape older than 1.0 diff --git a/kwin/wm-spec/index.html b/kwin/wm-spec/index.html index a8b0ac57c..187fe7d72 100644 --- a/kwin/wm-spec/index.html +++ b/kwin/wm-spec/index.html @@ -146,7 +146,7 @@ on the ICCCM [2], which defines WM (window manager) interactions at a lower level. The ICCCM does not provide ways to implement many features that modern desktop users expect. The GNOME and KDE desktop projects originally developed their own extensions to the ICCCM to -support these features; this spec tqreplaces those custom extensions +support these features; this spec replaces those custom extensions with a standardized set of ICCCM additions that any desktop environment can adopt. </P diff --git a/kwin/wm-spec/x107.html b/kwin/wm-spec/x107.html index 94c718ee9..d165e1fbc 100644 --- a/kwin/wm-spec/x107.html +++ b/kwin/wm-spec/x107.html @@ -84,7 +84,7 @@ a SendEvent request with the following arguments: CLASS="PROGRAMLISTING" >destination root propagate False -event-tqmask (SubstructureNotify|SubstructureRedirect) +event-mask (SubstructureNotify|SubstructureRedirect) event the specified ClientMessage</PRE > </P @@ -174,7 +174,7 @@ CLASS="PROGRAMLISTING" This property SHOULD be set by the Window Manager. </P ><P ->A Pager can request a change in the desktop tqgeometry by sending a _NET_DESKTOP_GEOMETRY client +>A Pager can request a change in the desktop geometry by sending a _NET_DESKTOP_GEOMETRY client message to the root window: </P ><PRE @@ -310,7 +310,7 @@ CLASS="PROGRAMLISTING" </PRE ><P >This property MUST be set by WM upon calculating the work area for -each desktop. Contains a tqgeometry for each desktop. These geometries are +each desktop. Contains a geometry for each desktop. These geometries are specified relative to the viewport on each desktop and specify an area that is completely contained within the viewport. Work area SHOULD be used by desktop applications to place desktop icons appropriately. @@ -407,17 +407,17 @@ CLASS="LITERAL" >n</TT > is the screen number. The purpose of this property is to allow the Window Manager to know the desktop - tqlayout displayed by the Pager. + layout displayed by the Pager. </P ><P > <TT CLASS="LITERAL" >_NET_DESKTOP_LAYOUT</TT -> describes the tqlayout of virtual - desktops relative to each other. More specifically, it describes the tqlayout +> describes the layout of virtual + desktops relative to each other. More specifically, it describes the layout used by the owner of the manager selection. The Window Manager may use - this tqlayout information or may choose to ignore it. - The property tqcontains four values: the Pager orientation, the number of + this layout information or may choose to ignore it. + The property contains four values: the Pager orientation, the number of desktops in the X direction, the number in the Y direction, and the starting corner of the Pager. </P @@ -454,7 +454,7 @@ CLASS="LITERAL" >_NET_WM_ORIENTATION_HORZ</TT > the desktops are layed out in rows, with the first desktop in the - specified starting corner. So a tqlayout with X=4 and Y=3 starting in + specified starting corner. So a layout with X=4 and Y=3 starting in the <TT CLASS="LITERAL" >_NET_WM_TOPLEFT</TT @@ -491,7 +491,7 @@ CLASS="PROGRAMLISTING" CLASS="LITERAL" >_NET_WM_ORIENTATION_VERT</TT > - the tqlayout for X=4 and Y=3 starting in the <TT + the layout for X=4 and Y=3 starting in the <TT CLASS="LITERAL" >_NET_WM_TOPLEFT</TT > diff --git a/kwin/wm-spec/x225.html b/kwin/wm-spec/x225.html index 93f45d980..7a31fb1b7 100644 --- a/kwin/wm-spec/x225.html +++ b/kwin/wm-spec/x225.html @@ -209,7 +209,7 @@ list of types, whilst providing default behaviour for window managers that do not recognise the extensions. </P ><P ->Rationale: This hint is intend to tqreplace the MOTIF hints. One of the +>Rationale: This hint is intend to replace the MOTIF hints. One of the objections to the MOTIF hints is that they are a purely visual description of the window decoration. By describing the function of the window, the window manager can apply consistent decoration and behaviour to windows of the same @@ -509,7 +509,7 @@ CLASS="PROGRAMLISTING" >_NET_WM_STRUT, left, right, top, bottom, CARDINAL[4]/32</PRE ><P >This property MUST be set by the Client if the window is to reserve space at -the edge of the screen. The property tqcontains a 4 cardinals specifying the +the edge of the screen. The property contains a 4 cardinals specifying the width of the reserved area at each border of the screen. The order of the borders is left, right, top, bottom. The client MAY change this property anytime, therefore the Window Manager MUST @@ -545,7 +545,7 @@ CLASS="PROGRAMLISTING" >_NET_WM_ICON_GEOMETRY, x, y, width, height, CARDINAL[4]/32</PRE ><P >This optional property MAY be set by standalone tools like a taskbar or an -iconbox. It specifies the tqgeometry of a possible icon in case the window is iconified. +iconbox. It specifies the geometry of a possible icon in case the window is iconified. </P ><P >Rationale: This makes it possible for a window manager to display a nice diff --git a/kwin/wm-spec/x24.html b/kwin/wm-spec/x24.html index bff756d52..47b406d0b 100644 --- a/kwin/wm-spec/x24.html +++ b/kwin/wm-spec/x24.html @@ -102,13 +102,13 @@ NAME="AEN30" in early ICCCM drafts. Maximizing a window should give it as much of the screen area as possible (this may not be the full screen area, but only a smaller 'workarea', since the Window Manager may have reserved certain areas for other -windows). A Window Manager is expected to remember the tqgeometry of a maximized window +windows). A Window Manager is expected to remember the geometry of a maximized window and restore it upon de-maximization. Modern Window Managers typically allow separate horizontal and vertical maximization.</P ><P >With the introduction of the Xinerama extension in X11 R6.4, maximization has become more involved. Xinerama allows a screen to span multiple -monitors in a freely configurable tqgeometry. In such a setting, maximizing +monitors in a freely configurable geometry. In such a setting, maximizing a window would ideally not grow it to fill the whole screen, but only the monitor it is shown on. There are of course borderline cases for windows crossing monitor boundaries, and 'real' maximization to the full screen may @@ -335,7 +335,7 @@ NAME="AEN76" ><P >Window-in-window MDI is a multiple document interface known from MS Windows platforms. Programs employing it have a single top-level window -which tqcontains a workspace which tqcontains the subwindows for the open +which contains a workspace which contains the subwindows for the open documents. These subwindows are decorated with Window Manager frames and can be manipulated within their parent window just like ordinary top-level windows on the root window.</P diff --git a/kwin/wm-spec/x351.html b/kwin/wm-spec/x351.html index 2e827fbc1..882f63fbf 100644 --- a/kwin/wm-spec/x351.html +++ b/kwin/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 tqshape) to all desktops, with +desktop-sized window (no shape) 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 tqshaped windows. The file manager draws the background +managing lots of small shaped 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/kwin/wm-spec/x512.html b/kwin/wm-spec/x512.html index a89e6ac1d..73a6ca4fb 100644 --- a/kwin/wm-spec/x512.html +++ b/kwin/wm-spec/x512.html @@ -124,7 +124,7 @@ NAME="AEN514" ></LI ><LI ><P -> Added _NET_DESKTOP_LAYOUT to allow a Pager to specify inter-desktop tqgeometry. +> Added _NET_DESKTOP_LAYOUT to allow a Pager to specify inter-desktop geometry. </P ></LI ><LI diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index 18aa2a662..2d4eea005 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -124,9 +124,9 @@ Workspace::Workspace( bool restore ) electric_bottom_border(None), electric_left_border(None), electric_right_border(None), - tqlayoutOrientation(Qt::Vertical), - tqlayoutX(-1), - tqlayoutY(2), + layoutOrientation(Qt::Vertical), + layoutX(-1), + layoutY(2), workarea(NULL), screenarea(NULL), managing_topmenus( false ), @@ -170,7 +170,7 @@ Workspace::Workspace( bool restore ) Qt::WType_Desktop | Qt::WPaintUnclipped ); - kapp->setGlobalMouseTracking( true ); // so that this doesn't mess eventtqmask on root window later + kapp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later // call this before XSelectInput() on the root window startup = new KStartupInfo( KStartupInfo::DisableKWinModule | KStartupInfo::AnnounceSilenceChanges, this ); @@ -412,11 +412,11 @@ void Workspace::init() NETPoint* viewports = new NETPoint[ number_of_desktops ]; rootInfo->setDesktopViewport( number_of_desktops, *viewports ); delete[] viewports; - TQRect geom = TQApplication::desktop()->tqgeometry(); - NETSize desktop_tqgeometry; - desktop_tqgeometry.width = geom.width(); - desktop_tqgeometry.height = geom.height(); - rootInfo->setDesktopGeometry( -1, desktop_tqgeometry ); + TQRect geom = TQApplication::desktop()->geometry(); + NETSize desktop_geometry; + desktop_geometry.width = geom.width(); + desktop_geometry.height = geom.height(); + rootInfo->setDesktopGeometry( -1, desktop_geometry ); setShowingDesktop( false ); } // end updates blocker block @@ -450,7 +450,7 @@ Workspace::~Workspace() delete kompmgr; blockStackingUpdates( true ); // TODO grabXServer(); - // use stacking_order, so that kwin --tqreplace keeps stacking order + // use stacking_order, so that kwin --replace keeps stacking order for( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it ) @@ -539,9 +539,9 @@ void Workspace::addClient( Client* c, allowed_t ) updateFocusChains( c, FocusChainUpdate ); // add to focus chain if not already there clients.append( c ); } - if( !unconstrained_stacking_order.tqcontains( c )) + if( !unconstrained_stacking_order.contains( c )) unconstrained_stacking_order.append( c ); - if( !stacking_order.tqcontains( c )) // it'll be updated later, and updateToolWindows() requires + if( !stacking_order.contains( c )) // it'll be updated later, and updateToolWindows() requires stacking_order.append( c ); // c to be in stacking_order if( c->isTopMenu()) addTopMenu( c ); @@ -580,7 +580,7 @@ void Workspace::removeClient( Client* c, allowed_t ) if( c->isNormalWindow()) Notify::raise( Notify::Delete ); - Q_ASSERT( clients.tqcontains( c ) || desktops.tqcontains( c )); + Q_ASSERT( clients.contains( c ) || desktops.contains( c )); clients.remove( c ); desktops.remove( c ); unconstrained_stacking_order.remove( c ); @@ -612,7 +612,7 @@ void Workspace::removeClient( Client* c, allowed_t ) updateStackingOrder( true ); if (tab_grab) - tab_box->tqrepaint(); + tab_box->repaint(); updateClientArea(); } @@ -641,7 +641,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change ) else focus_chain[ i ].prepend( c ); } - else if( !focus_chain[ i ].tqcontains( c )) + else if( !focus_chain[ i ].contains( c )) { // add it after the active one if( active_client != NULL && active_client != c && !focus_chain[ i ].isEmpty() && focus_chain[ i ].last() == active_client ) @@ -667,7 +667,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change ) focus_chain[ i ].remove( c ); focus_chain[ i ].prepend( c ); } - else if( !focus_chain[ i ].tqcontains( c )) + else if( !focus_chain[ i ].contains( c )) { if( active_client != NULL && active_client != c && !focus_chain[ i ].isEmpty() && focus_chain[ i ].last() == active_client ) @@ -690,7 +690,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change ) global_focus_chain.remove( c ); global_focus_chain.prepend( c ); } - else if( !global_focus_chain.tqcontains( c )) + else if( !global_focus_chain.contains( c )) { if( active_client != NULL && active_client != c && !global_focus_chain.isEmpty() && global_focus_chain.last() == active_client ) @@ -970,7 +970,7 @@ void Workspace::slotReconfigure() #if 0 // This actually seems to make things worse now TQWidget curtain; curtain.setBackgroundMode( NoBackground ); - curtain.setGeometry( TQApplication::desktop()->tqgeometry() ); + curtain.setGeometry( TQApplication::desktop()->geometry() ); curtain.show(); #endif for( ClientList::ConstIterator it = clients.begin(); @@ -1000,7 +1000,7 @@ void Workspace::slotReconfigure() topmenu_selection->release(); lostTopMenuSelection(); } - topmenu_height = 0; // tqinvalidate used menu height + topmenu_height = 0; // invalidate used menu height if( managingTopMenus()) { updateTopMenuGeometry(); @@ -1136,7 +1136,7 @@ bool Workspace::isNotManaged( const TQString& title ) void Workspace::refresh() { TQWidget w; - w.setGeometry( TQApplication::desktop()->tqgeometry() ); + w.setGeometry( TQApplication::desktop()->geometry() ); w.show(); w.hide(); TQApplication::flushX(); @@ -1147,7 +1147,7 @@ void Workspace::refresh() going to be hidden are first obscured by new windows with no background ( i.e. transparent ) placed right below the windows. These invisible windows are removed after the switch is complete. - Reduces desktop ( wallpaper ) tqrepaints during desktop switching + Reduces desktop ( wallpaper ) repaints during desktop switching */ class ObscuringWindows { @@ -1169,7 +1169,7 @@ void ObscuringWindows::create( Client* c ) cached = new TQValueList<Window>; Window obs_win; XWindowChanges chngs; - int tqmask = CWSibling | CWStackMode; + int mask = CWSibling | CWStackMode; if( cached->count() > 0 ) { cached->remove( obs_win = cached->first()); @@ -1177,7 +1177,7 @@ void ObscuringWindows::create( Client* c ) chngs.y = c->y(); chngs.width = c->width(); chngs.height = c->height(); - tqmask |= CWX | CWY | CWWidth | CWHeight; + mask |= CWX | CWY | CWWidth | CWHeight; } else { @@ -1190,7 +1190,7 @@ void ObscuringWindows::create( Client* c ) } chngs.sibling = c->frameId(); chngs.stack_mode = Below; - XConfigureWindow( qt_xdisplay(), obs_win, tqmask, &chngs ); + XConfigureWindow( qt_xdisplay(), obs_win, mask, &chngs ); XMapWindow( qt_xdisplay(), obs_win ); obscuring_windows.append( obs_win ); } @@ -1271,7 +1271,7 @@ bool Workspace::setCurrentDesktop( int new_desktop ) { // Search in focus chain if ( movingClient != NULL && active_client == movingClient - && focus_chain[currentDesktop()].tqcontains( active_client ) + && focus_chain[currentDesktop()].contains( active_client ) && active_client->isShown( true ) && active_client->isOnCurrentDesktop()) { c = active_client; // the requestFocus below will fail, as the client is already active @@ -1348,7 +1348,7 @@ int Workspace::desktopToRight( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (tqlayoutOrientation == Qt::Vertical) + if (layoutOrientation == Qt::Vertical) { dt += y; if ( dt >= numberOfDesktops() ) @@ -1379,7 +1379,7 @@ int Workspace::desktopToLeft( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (tqlayoutOrientation == Qt::Vertical) + if (layoutOrientation == Qt::Vertical) { dt -= y; if ( dt < 0 ) @@ -1410,7 +1410,7 @@ int Workspace::desktopUp( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (tqlayoutOrientation == Qt::Horizontal) + if (layoutOrientation == Qt::Horizontal) { dt -= x; if ( dt < 0 ) @@ -1441,7 +1441,7 @@ int Workspace::desktopDown( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (tqlayoutOrientation == Qt::Horizontal) + if (layoutOrientation == Qt::Horizontal) { dt += x; if ( dt >= numberOfDesktops() ) @@ -1562,7 +1562,7 @@ int Workspace::numScreens() const { if( !options->xineramaEnabled ) return 0; - return tqApp->desktop()->numScreens(); + return qApp->desktop()->numScreens(); } int Workspace::activeScreen() const @@ -1572,10 +1572,10 @@ int Workspace::activeScreen() const if( !options->activeMouseScreen ) { if( activeClient() != NULL && !activeClient()->isOnScreen( active_screen )) - return tqApp->desktop()->screenNumber( activeClient()->tqgeometry().center()); + return qApp->desktop()->screenNumber( activeClient()->geometry().center()); return active_screen; } - return tqApp->desktop()->screenNumber( TQCursor::pos()); + return qApp->desktop()->screenNumber( TQCursor::pos()); } // check whether a client moved completely out of what's considered the active screen, @@ -1596,21 +1596,21 @@ void Workspace::setActiveScreenMouse( TQPoint mousepos ) { if( !options->xineramaEnabled ) return; - active_screen = tqApp->desktop()->screenNumber( mousepos ); + active_screen = qApp->desktop()->screenNumber( mousepos ); } TQRect Workspace::screenGeometry( int screen ) const { if (( !options->xineramaEnabled ) || (kapp->desktop()->numScreens() < 2)) - return tqApp->desktop()->tqgeometry(); - return tqApp->desktop()->screenGeometry( screen ); + return qApp->desktop()->geometry(); + return qApp->desktop()->screenGeometry( screen ); } int Workspace::screenNumber( TQPoint pos ) const { if( !options->xineramaEnabled ) return 0; - return tqApp->desktop()->screenNumber( pos ); + return qApp->desktop()->screenNumber( pos ); } void Workspace::sendClientToScreen( Client* c, int screen ) @@ -1640,18 +1640,18 @@ void Workspace::setDesktopLayout( int, int, int ) void Workspace::updateDesktopLayout() { // rootInfo->desktopLayoutCorner(); // I don't find this worth bothering, feel free to - tqlayoutOrientation = ( rootInfo->desktopLayoutOrientation() == NET::OrientationHorizontal + layoutOrientation = ( rootInfo->desktopLayoutOrientation() == NET::OrientationHorizontal ? Qt::Horizontal : Qt::Vertical ); - tqlayoutX = rootInfo->desktopLayoutColumnsRows().width(); - tqlayoutY = rootInfo->desktopLayoutColumnsRows().height(); - if( tqlayoutX == 0 && tqlayoutY == 0 ) // not given, set default tqlayout - tqlayoutY = 2; + layoutX = rootInfo->desktopLayoutColumnsRows().width(); + layoutY = rootInfo->desktopLayoutColumnsRows().height(); + if( layoutX == 0 && layoutY == 0 ) // not given, set default layout + layoutY = 2; } void Workspace::calcDesktopLayout(int &x, int &y) const { - x = tqlayoutX; // <= 0 means compute it from the other and total number of desktops - y = tqlayoutY; + x = layoutX; // <= 0 means compute it from the other and total number of desktops + y = layoutY; if((x <= 0) && (y > 0)) x = (numberOfDesktops()+y-1) / y; else if((y <=0) && (x > 0)) @@ -1669,7 +1669,7 @@ void Workspace::calcDesktopLayout(int &x, int &y) const */ bool Workspace::addSystemTrayWin( WId w ) { - if ( systemTrayWins.tqcontains( w ) ) + if ( systemTrayWins.contains( w ) ) return TRUE; NETWinInfo ni( qt_xdisplay(), w, root, NET::WMKDESystemTrayWinFor ); @@ -1691,7 +1691,7 @@ bool Workspace::addSystemTrayWin( WId w ) */ bool Workspace::removeSystemTrayWin( WId w, bool check ) { - if ( !systemTrayWins.tqcontains( w ) ) + if ( !systemTrayWins.contains( w ) ) return FALSE; if( check ) { @@ -1794,17 +1794,17 @@ void Workspace::slotGrabWindow() //No XShape - no work. if( Shape::available()) { - //As the first step, get the tqmask from XShape. + //As the first step, get the mask from XShape. int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), active_client->frameId(), ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost tqshape of the window; + //The ShapeBounding region is the outermost shape 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 if (rects) { - //Create a TQRegion from the rectangles describing the bounding tqmask. + //Create a TQRegion from the rectangles describing the bounding mask. TQRegion contents; for (int pos = 0; pos < count; pos++) contents += TQRegion(rects[pos].x, rects[pos].y, @@ -1814,18 +1814,18 @@ void Workspace::slotGrabWindow() //Create the bounding box. TQRegion bbox(0, 0, snapshot.width(), snapshot.height()); - //Get the tqmasked away area. - TQRegion tqmaskedAway = bbox - contents; - TQMemArray<TQRect> tqmaskedAwayRects = tqmaskedAway.rects(); + //Get the masked away area. + TQRegion maskedAway = bbox - contents; + TQMemArray<TQRect> maskedAwayRects = maskedAway.rects(); - //Construct a bitmap tqmask from the rectangles - TQBitmap tqmask( snapshot.width(), snapshot.height()); - TQPainter p(&tqmask); - p.fillRect(0, 0, tqmask.width(), tqmask.height(), Qt::color1); - for (uint pos = 0; pos < tqmaskedAwayRects.count(); pos++) - p.fillRect(tqmaskedAwayRects[pos], Qt::color0); + //Construct a bitmap mask from the rectangles + TQBitmap mask( snapshot.width(), snapshot.height()); + TQPainter p(&mask); + p.fillRect(0, 0, mask.width(), mask.height(), Qt::color1); + for (uint pos = 0; pos < maskedAwayRects.count(); pos++) + p.fillRect(maskedAwayRects[pos], Qt::color0); p.end(); - snapshot.setMask(tqmask); + snapshot.setMask(mask); } } @@ -2121,7 +2121,7 @@ void Workspace::checkElectricBorders( bool force ) electric_current_border = 0; - TQRect r = TQApplication::desktop()->tqgeometry(); + TQRect r = TQApplication::desktop()->geometry(); electricTop = r.top(); electricBottom = r.bottom(); electricLeft = r.left(); @@ -2140,12 +2140,12 @@ void Workspace::createBorderWindows() electric_have_borders = true; - TQRect r = TQApplication::desktop()->tqgeometry(); + TQRect r = TQApplication::desktop()->geometry(); XSetWindowAttributes attributes; - unsigned long valuetqmask; + unsigned long valuemask; attributes.override_redirect = True; attributes.event_mask = ( EnterWindowMask | LeaveWindowMask ); - valuetqmask= (CWOverrideRedirect | CWEventMask | CWCursor ); + valuemask= (CWOverrideRedirect | CWEventMask | CWCursor ); attributes.cursor = XCreateFontCursor(qt_xdisplay(), XC_sb_up_arrow); electric_top_border = XCreateWindow (qt_xdisplay(), qt_xrootwin(), @@ -2154,7 +2154,7 @@ void Workspace::createBorderWindows() 0, CopyFromParent, InputOnly, CopyFromParent, - valuetqmask, &attributes); + valuemask, &attributes); XMapWindow(qt_xdisplay(), electric_top_border); attributes.cursor = XCreateFontCursor(qt_xdisplay(), @@ -2165,7 +2165,7 @@ void Workspace::createBorderWindows() 0, CopyFromParent, InputOnly, CopyFromParent, - valuetqmask, &attributes); + valuemask, &attributes); XMapWindow(qt_xdisplay(), electric_bottom_border); attributes.cursor = XCreateFontCursor(qt_xdisplay(), @@ -2176,7 +2176,7 @@ void Workspace::createBorderWindows() 0, CopyFromParent, InputOnly, CopyFromParent, - valuetqmask, &attributes); + valuemask, &attributes); XMapWindow(qt_xdisplay(), electric_left_border); attributes.cursor = XCreateFontCursor(qt_xdisplay(), @@ -2187,7 +2187,7 @@ void Workspace::createBorderWindows() 0, CopyFromParent, InputOnly, CopyFromParent, - valuetqmask, &attributes); + valuemask, &attributes); XMapWindow(qt_xdisplay(), electric_right_border); // Set XdndAware on the windows, so that DND enter events are received (#86998) Atom version = 4; // XDND version @@ -2264,7 +2264,7 @@ void Workspace::clientMoved(const TQPoint &pos, Time now) { electric_current_border = 0; - TQRect r = TQApplication::desktop()->tqgeometry(); + TQRect r = TQApplication::desktop()->geometry(); int offset; int desk_before = currentDesktop(); @@ -2381,7 +2381,7 @@ void Workspace::raiseElectricBorders() void Workspace::addTopMenu( Client* c ) { assert( c->isTopMenu()); - assert( !topmenus.tqcontains( c )); + assert( !topmenus.contains( c )); topmenus.append( c ); if( managingTopMenus()) { @@ -2402,7 +2402,7 @@ void Workspace::removeTopMenu( Client* c ) // if( c->isTopMenu()) // kdDebug() << "REMOVE TOPMENU:" << c << endl; assert( c->isTopMenu()); - assert( topmenus.tqcontains( c )); + assert( topmenus.contains( c )); topmenus.remove( c ); updateCurrentTopMenu(); // TODO reduce topMenuHeight() if possible? @@ -2466,7 +2466,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.tqsizeHint().height(); + topmenu_height = tmpmenu.sizeHint().height(); } return topmenu_height; } @@ -2650,20 +2650,20 @@ void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen) { TQString message; TQString output = TQString::fromLocal8Bit( buffer, buflen ); - if (output.tqcontains("Started",false)) + if (output.contains("Started",false)) ; // don't do anything, just pass to the connection release - else if (output.tqcontains("Can't open display",false)) + else if (output.contains("Can't open display",false)) message = i18n("<qt><b>kompmgr failed to open the display</b><br>There is probably an invalid display entry in your ~/.xcompmgrrc.</qt>"); - else if (output.tqcontains("No render extension",false)) + else if (output.contains("No render extension",false)) message = i18n("<qt><b>kompmgr cannot find the Xrender extension</b><br>You are using either an outdated or a crippled version of XOrg.<br>Get XOrg ≥ 6.8 from www.freedesktop.org.<br></qt>"); - else if (output.tqcontains("No composite extension",false)) + else if (output.contains("No composite extension",false)) message = i18n("<qt><b>Composite extension not found</b><br>You <i>must</i> use XOrg ≥ 6.8 for translucency and shadows to work.<br>Additionally, you need to add a new section to your X config file:<br>" "<i>Section \"Extensions\"<br>" "Option \"Composite\" \"Enable\"<br>" "EndSection</i></qt>"); - else if (output.tqcontains("No damage extension",false)) + else if (output.contains("No damage extension",false)) message = i18n("<qt><b>Damage extension not found</b><br>You <i>must</i> use XOrg ≥ 6.8 for translucency and shadows to work.</qt>"); - else if (output.tqcontains("No XFixes extension",false)) + else if (output.contains("No XFixes extension",false)) message = i18n("<qt><b>XFixes extension not found</b><br>You <i>must</i> use XOrg ≥ 6.8 for translucency and shadows to work.</qt>"); else return; //skip others // kompmgr startup failed or succeeded, release connection diff --git a/kwin/workspace.h b/kwin/workspace.h index e60bc5e88..55043276e 100644 --- a/kwin/workspace.h +++ b/kwin/workspace.h @@ -619,9 +619,9 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin Time electric_time_last; TQPoint electric_push_point; - Qt::Orientation tqlayoutOrientation; - int tqlayoutX; - int tqlayoutY; + Qt::Orientation layoutOrientation; + int layoutX; + int layoutY; Placement *initPositioning; |