diff options
Diffstat (limited to 'kwin')
87 files changed, 855 insertions, 852 deletions
diff --git a/kwin/activation.cpp b/kwin/activation.cpp index 2cd836555..e964ed1b9 100644 --- a/kwin/activation.cpp +++ b/kwin/activation.cpp @@ -433,7 +433,7 @@ bool Workspace::activateNextClient( Client* c ) if( c == NULL && !(*it)->isOnScreen( activeScreen())) continue; } - if( mainwindows.contains( *it )) + if( mainwindows.tqcontains( *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.contains( const_cast< Client* >( c ))) + if( should_get_focus.tqcontains( 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.contains( const_cast< Client* >( c ))) + if( should_get_focus.tqcontains( 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. diff --git a/kwin/bridge.cpp b/kwin/bridge.cpp index 49840e248..17b801475 100644 --- a/kwin/bridge.cpp +++ b/kwin/bridge.cpp @@ -160,7 +160,7 @@ TQRegion Bridge::unobscuredRegion( const TQRegion& r ) const { TQRegion reg( r ); const ClientList stacking_order = c->workspace()->stackingOrder(); - ClientList::ConstIterator it = stacking_order.find( c ); + ClientList::ConstIterator it = stacking_order.tqfind( c ); ++it; for(; it != stacking_order.end(); diff --git a/kwin/client.cpp b/kwin/client.cpp index 0d2c5cfbf..2b7794748 100644 --- a/kwin/client.cpp +++ b/kwin/client.cpp @@ -141,7 +141,7 @@ Client::Client( Workspace *ws ) deleting = false; keep_above = FALSE; keep_below = FALSE; - is_shape = FALSE; + is_tqshape = FALSE; motif_noborder = false; motif_may_move = TRUE; motif_may_resize = TRUE; @@ -286,7 +286,7 @@ void Client::destroyClient() destroyDecoration(); cleanGrouping(); workspace()->removeClient( this, Allowed ); - client = None; // invalidate + client = None; // tqinvalidate XDestroyWindow( qt_xdisplay(), wrapper ); wrapper = None; XDestroyWindow( qt_xdisplay(), frame ); @@ -307,7 +307,7 @@ void Client::updateDecoration( bool check_workspace_pos, bool force ) destroyDecoration(); if( !noBorder()) { - setMask( TQRegion()); // reset shape mask + setMask( TQRegion()); // reset tqshape mask decoration = workspace()->createDecoration( bridge ); // TODO check decoration's minimum size? decoration->init(); @@ -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 shape mask + setMask( TQRegion()); // reset tqshape mask int save_workarea_diff_x = workarea_diff_x; int save_workarea_diff_y = workarea_diff_y; plainResize( sizeForClientSize( clientSize()), ForceGeometrySet ); @@ -502,32 +502,32 @@ void Client::setUserNoBorder( bool set ) void Client::updateShape() { - // workaround for #19644 - shaped windows shouldn't have decoration - if( shape() && !noBorder()) + // workaround for #19644 - tqshaped windows shouldn't have decoration + if( tqshape() && !noBorder()) { noborder = true; updateDecoration( true ); } updateOpacityCache(); - if ( shape() ) + if ( tqshape() ) { XShapeCombineShape(qt_xdisplay(), frameId(), ShapeBounding, clientPos().x(), clientPos().y(), window(), ShapeBounding, ShapeSet); setShapable(TRUE); } - // !shape() mask setting is done in setMask() when the decoration + // !tqshape() mask setting is done in setMask() when the decoration // calls it or when the decoration is created/destroyed - if( Shape::version() >= 0x11 ) // 1.1, has input shape support + if( Shape::version() >= 0x11 ) // 1.1, has input tqshape support { // There appears to be no way to find out if a window has input - // shape set or not, so always propagate the input shape - // (it's the same like the bounding shape by default). - // Also, build the shape using a helper window, not directly - // in the frame window, because the sequence set-shape-to-frame, - // remove-shape-of-client, add-input-shape-of-client has the problem - // that after the second step there's a hole in the input shape - // until the real shape of the client is added and that can make + // tqshape set or not, so always propagate the input tqshape + // (it's the same like the bounding tqshape by default). + // Also, build the tqshape using a helper window, not directly + // in the frame window, because the sequence set-tqshape-to-frame, + // remove-tqshape-of-client, add-input-tqshape-of-client has the problem + // that after the second step there's a hole in the input tqshape + // until the real tqshape of the client is added and that can make // the window lose focus (which is a problem with mouse focus policies) static Window helper_window = None; if( helper_window == None ) @@ -558,7 +558,7 @@ void Client::setMask( const TQRegion& reg, int mode ) reg.handle(), ShapeSet ); else { - TQMemArray< TQRect > rects = reg.rects(); + TQMemArray< TQRect > rects = reg.tqrects(); XRectangle* xrects = new XRectangle[ rects.count() ]; for( unsigned int i = 0; i < rects.count(); @@ -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 repaint( FALSE ); +// FRAME tqrepaint( FALSE ); // bool wasStaticContents = testWFlags( WStaticContents ); // setWFlags( WStaticContents ); int step = QMAX( 4, QABS( h - s.height() ) / as )+1; @@ -888,7 +888,7 @@ void Client::setShade( ShadeMode mode ) resizeDecoration( TQSize( s.width(), h )); // assume a border // we do not have time to wait for X to send us paint events -// FRAME repaint( 0, h - step-5, width(), step+5, TRUE); +// FRAME tqrepaint( 0, h - step-5, width(), step+5, TRUE); TQApplication::syncX(); } while ( h < s.height() - step ); // if ( !wasStaticContents ) @@ -1051,7 +1051,7 @@ void Client::drawIntersectingShadows() { // active window has a shadow. return; - region = shapeBoundingRegion; + region = tqshapeBoundingRegion; // Generate list of Clients whose shadows need to be redrawn. That is, // those that are currently intersecting or intersected by other windows or @@ -1089,7 +1089,7 @@ void Client::drawOverlappingShadows(bool waitForMe) // active window has a shadow. return; - region = shapeBoundingRegion; + region = tqshapeBoundingRegion; stacking_order = workspace()->stackingOrder(); for (it = stacking_order.fromLast(); it != stacking_order.end(); --it) { @@ -1140,7 +1140,7 @@ void Client::drawOverlappingShadows(bool waitForMe) /*! Draw shadow after some time has elapsed, to give recently exposed windows a - chance to repaint before a shadow gradient is drawn over them. + chance to tqrepaint before a shadow gradient is drawn over them. */ void Client::drawDelayedShadow() { @@ -1163,7 +1163,7 @@ void Client::drawShadowAfter(Client *after) void Client::drawShadow() { Window shadows[2]; - XRectangle *shapes; + XRectangle *tqshapes; int i, count, ordering; // If we are waiting for another Client's shadow to be drawn, stop waiting now @@ -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. */ - shapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, + tqshapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, &count, &ordering); - if (!shapes) + if (!tqshapes) // XShape extension not supported - shapeBoundingRegion = TQRegion(x(), y(), width(), height()); + tqshapeBoundingRegion = TQRegion(x(), y(), width(), height()); else { - shapeBoundingRegion = TQRegion(); + tqshapeBoundingRegion = TQRegion(); for (i = 0; i < count; i++) { // Translate XShaped window into a TQRegion - TQRegion shapeRectangle(shapes[i].x, shapes[i].y, shapes[i].width, - shapes[i].height); - shapeBoundingRegion += shapeRectangle; + TQRegion tqshapeRectangle(tqshapes[i].x, tqshapes[i].y, tqshapes[i].width, + tqshapes[i].height); + tqshapeBoundingRegion += tqshapeRectangle; } if (isShade()) // Since XResize() doesn't change a window's XShape regions, ensure that - // shapeBoundingRegion is not taller than the window's shaded height, + // tqshapeBoundingRegion is not taller than the window's shaded height, // or the bottom shadow will appear to be missing - shapeBoundingRegion &= TQRegion(0, 0, width(), height()); - shapeBoundingRegion.translate(x(), y()); + tqshapeBoundingRegion &= TQRegion(0, 0, width(), height()); + tqshapeBoundingRegion.translate(x(), y()); } if (!isShadowed() || hidden || isMinimized() || maximizeMode() == MaximizeFull || !options->shadowWindowType(windowType())) { - XFree(shapes); + XFree(tqshapes); // Tell whatever Clients are listening that this Client's shadow has been drawn. // It hasn't, but there's no sense waiting for something that won't happen. @@ -1231,15 +1231,15 @@ void Client::drawShadow() shadowPixmap.resize(shadow.size()); // Create a fake drop-down shadow effect via blended Xwindows - shadowWidget = new TQWidget(0, 0, WStyle_Customize | WX11BypassWM); + shadowWidget = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WX11BypassWM)); shadowWidget->setGeometry(shadow); XSelectInput(qt_xdisplay(), shadowWidget->winId(), ButtonPressMask | ButtonReleaseMask | StructureNotifyMask); shadowWidget->installEventFilter(this); - if (!shapes) { + if (!tqshapes) { // XShape extension not supported - exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1247,7 +1247,7 @@ void Client::drawShadow() shadowRegions.append(shadowRegion); if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, shapeBoundingRegion, + imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else @@ -1258,7 +1258,7 @@ void Client::drawShadow() TQMemArray<TQRect>::Iterator it, itEnd; XRectangle *shadowShapes; - exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1266,7 +1266,7 @@ void Client::drawShadow() shadowRegions.append(shadowRegion); // XShape the shadow - exposedRects = exposedRegion.rects(); + exposedRects = exposedRegion.tqrects(); i = 0; itEnd = exposedRects.end(); shadowShapes = new XRectangle[exposedRects.count()]; @@ -1284,14 +1284,14 @@ void Client::drawShadow() delete [] shadowShapes; if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, shapeBoundingRegion, + imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else imposeCachedShadow(shadowPixmap, exposedRegion); } - XFree(shapes); + XFree(tqshapes); // Set the background pixmap //shadowPixmap.convertFromImage(shadowImage); @@ -1364,10 +1364,10 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w, TQMemArray<TQRect>::Iterator it, itEnd; TQRegion shadowRegion; - occludedRects = occludedRegion.rects(); + occludedRects = occludedRegion.tqrects(); itEnd = occludedRects.end(); for (it = occludedRects.begin(); it != itEnd; ++it) { - // Expand each of the occluded region's shape rectangles to contain + // Expand each of the occluded region's tqshape rectangles to contain // where a shadow of the specified thickness will be drawn. Create // a new TQRegion that contains the expanded occluded region it->setTop(it->top() - thickness + yOffset); @@ -1398,7 +1398,7 @@ void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed) Window rootWindow; int thickness, windowX, windowY, xOffset, yOffset; - rectangles = exposed.rects(); + rectangles = exposed.tqrects(); rootWindow = qt_xrootwin(); thickness = options->shadowThickness(isActive()); windowX = this->x(); @@ -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 = qRed(pixel); - pixelGreen = qGreen(pixel); - pixelBlue = qBlue(pixel); + pixelRed = tqRed(pixel); + pixelGreen = tqGreen(pixel); + pixelBlue = tqBlue(pixel); image.setPixel(x, y, - qRgb((int)(pixelRed + (red - pixelRed) * opacity), + tqRgb((int)(pixelRed + (red - pixelRed) * opacity), (int)(pixelGreen + (green - pixelGreen) * opacity), (int)(pixelBlue + (blue - pixelBlue) * opacity))); } @@ -1458,7 +1458,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, Window rootWindow; int windowX, windowY, xOffset, yOffset; - rectangles = exposed.rects(); + rectangles = exposed.tqrects(); rootWindow = qt_xrootwin(); windowX = this->x(); windowY = this->y(); @@ -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.contains(TQPoint(i, j))) + if (occluded.tqcontains(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.contains(TQPoint(i, irBottom))) + if (occluded.tqcontains(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 = qRed(pixel); - pixelGreen = qGreen(pixel); - pixelBlue = qBlue(pixel); + pixelRed = tqRed(pixel); + pixelGreen = tqGreen(pixel); + pixelBlue = tqBlue(pixel); image.setPixel(x, y, - qRgb((int)(pixelRed + (red - pixelRed) * opacity), + tqRgb((int)(pixelRed + (red - pixelRed) * opacity), (int)(pixelGreen + (green - pixelGreen) * opacity), (int)(pixelBlue + (blue - pixelBlue) * opacity))); for (i = irLeft; i <= irRight; i++) { - if (occluded.contains(TQPoint(i, irTop))) + if (occluded.tqcontains(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.contains(TQPoint(irLeft, j))) + if (occluded.tqcontains(TQPoint(irLeft, j))) intersectCount--; } irRight++; for (j = irTop; j != irBottom; j += yIncrement) { - if (occluded.contains(TQPoint(irRight, j))) + if (occluded.tqcontains(TQPoint(irRight, j))) intersectCount++; } @@ -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( qstrncmp( resourceClass(), oo_prefix, strlen( oo_prefix )) == 0 && wt == NET::Dialog ) + if( tqstrncmp( 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 shape for the logical mouse position \a m + Sets an appropriate cursor tqshape for the logical mouse position \a m */ void Client::setCursor( Position m ) @@ -2412,25 +2412,25 @@ void Client::setCursor( Position m ) { case PositionTopLeft: case PositionBottomRight: - setCursor( sizeFDiagCursor ); + setCursor( tqsizeFDiagCursor ); break; case PositionBottomLeft: case PositionTopRight: - setCursor( sizeBDiagCursor ); + setCursor( tqsizeBDiagCursor ); break; case PositionTop: case PositionBottom: - setCursor( sizeVerCursor ); + setCursor( tqsizeVerCursor ); break; case PositionLeft: case PositionRight: - setCursor( sizeHorCursor ); + setCursor( tqsizeHorCursor ); break; default: if( buttonDown && isMovable()) - setCursor( sizeAllCursor ); + setCursor( tqsizeAllCursor ); else - setCursor( arrowCursor ); + setCursor( tqarrowCursor ); break; } } diff --git a/kwin/client.h b/kwin/client.h index 1c4d45f51..52fb025f6 100644 --- a/kwin/client.h +++ b/kwin/client.h @@ -162,7 +162,7 @@ class Client : public TQObject, public KDecorationDefines void setKeepBelow( bool ); Layer layer() const; Layer belongsToLayer() const; - void invalidateLayer(); + void tqinvalidateLayer(); void setModal( bool modal ); bool isModal() const; @@ -213,8 +213,8 @@ class Client : public TQObject, public KDecorationDefines // window to be redrawn. friend void Workspace::updateOverlappingShadows(WId); - // shape extensions - bool shape() const; + // tqshape extensions + bool tqshape() const; void updateShape(); void setGeometry( int x, int y, int w, int h, ForceGeometry_t force = NormalGeometrySet ); @@ -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_shape :1; + uint is_tqshape :1; uint skip_taskbar :1; uint original_skip_taskbar :1; // unaffected by KWin uint Pdeletewindow :1; // does the window understand the DeleteWindow protocol? @@ -569,7 +569,7 @@ class Client : public TQObject, public KDecorationDefines TQMemArray<double> activeOpacityCache; TQMemArray<double> inactiveOpacityCache; TQMemArray<double>* opacityCache; - TQRegion shapeBoundingRegion; + TQRegion tqshapeBoundingRegion; TQTimer* shadowDelayTimer; bool shadowMe; @@ -801,9 +801,9 @@ inline bool Client::keepBelow() const return keep_below; } -inline bool Client::shape() const +inline bool Client::tqshape() const { - return is_shape; + return is_tqshape; } @@ -832,7 +832,7 @@ inline pid_t Client::pid() const return info->pid(); } -inline void Client::invalidateLayer() +inline void Client::tqinvalidateLayer() { in_layer = UnknownLayer; } diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp index 97d049ffb..ae010e830 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) qSwap(hColor, lColor); + if (down) tqSwap(hColor, lColor); if (TQPixmap::defaultDepth() > 8) { KPixmapEffect::gradient(*pix, hColor, lColor, @@ -355,7 +355,7 @@ void B2Client::init() // Check this early, otherwise the preview will be rendered badly. resizable = isResizable(); - createMainWidget(WResizeNoErase | WRepaintNoErase); + createMainWidget((WFlags)(WResizeNoErase | WRepaintNoErase)); widget()->installEventFilter(this); widget()->setBackgroundMode(NoBackground); @@ -418,7 +418,7 @@ void B2Client::init() titleLayout->addSpacing(3); - TQColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()). + TQColor c = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()). color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) { @@ -443,7 +443,7 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], case 'M': // Menu button if (!button[BtnMenu]) { button[BtnMenu] = new B2Button(this, tb, tips[BtnMenu], - LeftButton | RightButton); + Qt::LeftButton | Qt::RightButton); button[BtnMenu]->setPixmaps(P_MENU); button[BtnMenu]->setUseMiniIcon(); connect(button[BtnMenu], TQT_SIGNAL(pressed()), @@ -483,7 +483,7 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], case 'A': // Maximize button if (isMaximizable() && (!button[BtnMax])) { button[BtnMax] = new B2Button(this, tb, tips[BtnMax], - LeftButton | MidButton | RightButton); + Qt::LeftButton | Qt::MidButton | Qt::RightButton); button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ? P_NORMALIZE : P_MAX); connect(button[BtnMax], TQT_SIGNAL(clicked()), @@ -537,7 +537,7 @@ bool B2Client::mustDrawHandle() const void B2Client::iconChange() { if (button[BtnMenu]) - button[BtnMenu]->repaint(false); + button[BtnMenu]->tqrepaint(false); } // Gallium: New button show/hide magic for customizable @@ -586,7 +586,7 @@ void B2Client::resizeEvent(TQResizeEvent * /*e*/) titleMoveAbs(bar_x_ofs); doShape(); - widget()->repaint(); // the frame is misrendered without this + widget()->tqrepaint(); // the frame is misrendered without this } void B2Client::captionChange() @@ -595,7 +595,7 @@ void B2Client::captionChange() titleMoveAbs(bar_x_ofs); doShape(); titlebar->recalcBuffer(); - titlebar->repaint(false); + titlebar->tqrepaint(false); } void B2Client::paintEvent(TQPaintEvent* e) @@ -614,7 +614,7 @@ void B2Client::paintEvent(TQPaintEvent* e) int bb = mustDrawHandle() ? 4 : 0; int bDepth = thickness + bb; - TQColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive()); + TQColorGroup fillColor = options()->tqcolorGroup(frameColorGroup, isActive()); TQBrush fillBrush(options()->color(frameColorGroup, isActive())); // outer frame rect @@ -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 repaint contained the titlebar area */ + /* We first see, if our tqrepaint contained the titlebar area */ TQRegion reg(TQRect(0, 0, width(), buttonSize + 4)); reg = reg.intersect(e->region()); if (!reg.isEmpty()) @@ -794,8 +794,8 @@ void B2Client::titleMoveAbs(int new_ofs) bar_x_ofs = new_ofs; positionButtons(); doShape(); - widget()->repaint(0, 0, width(), buttonSize + 4, false); - titlebar->repaint(false); + widget()->tqrepaint(0, 0, width(), buttonSize + 4, false); + titlebar->tqrepaint(false); } } @@ -820,7 +820,7 @@ void B2Client::maximizeChange() bool m = maximizeMode() == MaximizeFull; if (button[BtnMax]) { button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX); - button[BtnMax]->repaint(); + button[BtnMax]->tqrepaint(); TQToolTip::remove(button[BtnMax]); TQToolTip::add(button[BtnMax], m ? i18n("Restore") : i18n("Maximize")); @@ -830,21 +830,21 @@ void B2Client::maximizeChange() g->activate(); doShape(); - widget()->repaint(false); + widget()->tqrepaint(false); } void B2Client::activeChange() { - widget()->repaint(false); - titlebar->repaint(false); + widget()->tqrepaint(false); + titlebar->tqrepaint(false); - TQColor c = options()->colorGroup( + TQColor c = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) if (button[i]) { button[i]->setBg(c); - button[i]->repaint(false); + button[i]->tqrepaint(false); } } @@ -860,7 +860,7 @@ void B2Client::shadeChange() } } -TQSize B2Client::minimumSize() const +TQSize B2Client::tqminimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -939,8 +939,8 @@ void B2Client::unobscureTitlebar() static void redraw_pixmaps() { int i; - TQColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true); - TQColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false); + TQColorGroup aGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup iGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); // close drawB2Rect(PIXMAP_A(P_CLOSE), aGrp.button(), false); @@ -961,8 +961,8 @@ static void redraw_pixmaps() TQColor color = is_act ? aGrp.button() : iGrp.button(); drawB2Rect(&thinBox, color, is_down); pix->fill(Qt::black); - bitBlt(pix, 0, 0, &thinBox, - 0, 0, thinBox.width(), thinBox.height(), Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&thinBox), + 0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true); } // maximize @@ -984,12 +984,12 @@ static void redraw_pixmaps() drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down); drawB2Rect(&largeBox, is_act ? aGrp.button() : iGrp.button(), is_down); pix->fill(options()->color(KDecoration::ColorTitleBar, is_act)); - bitBlt(pix, pix->width() - 12, pix->width() - 12, &largeBox, - 0, 0, 12, 12, Qt::CopyROP, true); - bitBlt(pix, 0, 0, &smallBox, 0, 0, 10, 10, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(pix), pix->width() - 12, pix->width() - 12, TQT_TQPAINTDEVICE(&largeBox), + 0, 0, 12, 12, TQt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); - bitBlt(pixmap[P_ICONIFY * NumStates + i], 0, 0, - &smallBox, 0, 0, 10, 10, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(pixmap[P_ICONIFY * NumStates + i]), 0, 0, + TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); } // resize @@ -999,8 +999,8 @@ static void redraw_pixmaps() *pixmap[P_RESIZE * NumStates + i] = *pixmap[P_CLOSE * NumStates + i]; pixmap[P_RESIZE * NumStates + i]->detach(); drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down); - bitBlt(pixmap[P_RESIZE * NumStates + i], - 0, 0, &smallBox, 0, 0, 10, 10, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(pixmap[P_RESIZE * NumStates + i]), + 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); } @@ -1107,7 +1107,7 @@ void B2Client::positionButtons() // Transparent bound stuff. static TQRect *visible_bound; -static TQPointArray bound_shape; +static TQPointArray bound_tqshape; bool B2Client::drawbound(const TQRect& geom, bool clear) { @@ -1132,7 +1132,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) barLeft += 2; barRight -= 2; - bound_shape.putPoints(0, 8, + bound_tqshape.putPoints(0, 8, g.left(), frameTop, barLeft, frameTop, barLeft, g.top(), @@ -1146,8 +1146,8 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) } TQPainter p(workspaceWidget()); p.setPen(TQPen(Qt::white, 5)); - p.setRasterOp(Qt::XorROP); - p.drawPolygon(bound_shape); + p.setRasterOp(TQt::XorROP); + p.drawPolygon(bound_tqshape); if (clear) { delete visible_bound; @@ -1158,26 +1158,26 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) bool B2Client::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; case TQEvent::MouseButtonDblClick: - titlebar->mouseDoubleClickEvent(static_cast< TQMouseEvent* >(e)); + titlebar->mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Wheel: - titlebar->wheelEvent(static_cast< TQWheelEvent* >(e)); + titlebar->wheelEvent(TQT_TQWHEELEVENT(e)); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast< TQMouseEvent* >(e)); + processMousePressEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Show: - showEvent(static_cast< TQShowEvent* >(e)); + showEvent(TQT_TQSHOWEVENT(e)); return true; default: break; @@ -1192,7 +1192,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent, : TQButton(parent, 0), hover(false) { setBackgroundMode(NoBackground); - setCursor(arrowCursor); + setCursor(tqarrowCursor); realizeButtons = realizeBtns; client = _client; useMiniIcon = false; @@ -1201,7 +1201,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent, } -TQSize B2Button::sizeHint() const +TQSize B2Button::tqsizeHint() const { return TQSize(buttonSize, buttonSize); } @@ -1252,14 +1252,14 @@ void B2Button::setPixmaps(int button_id) for (int i = 0; i < NumStates; i++) { icon[i] = B2::pixmap[button_id + i]; } - repaint(false); + tqrepaint(false); } void B2Button::mousePressEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button() & realizeButtons) ? LeftButton : NoButton, + (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -1268,7 +1268,7 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button() & realizeButtons) ? LeftButton : NoButton, + (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } @@ -1276,21 +1276,21 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e) void B2Button::enterEvent(TQEvent *e) { hover = true; - repaint(false); + tqrepaint(false); TQButton::enterEvent(e); } void B2Button::leaveEvent(TQEvent *e) { hover = false; - repaint(false); + tqrepaint(false); TQButton::leaveEvent(e); } // ===================================== B2Titlebar::B2Titlebar(B2Client *parent) - : TQWidget(parent->widget(), 0, WStyle_Customize | WRepaintNoErase), + : TQWidget(parent->widget(), 0, (WFlags)(WStyle_Customize | WRepaintNoErase)), client(parent), set_x11mask(false), isfullyobscured(false), shift_move(false) { @@ -1342,7 +1342,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state) // titlebar fill const TQColorGroup cg = - options()->colorGroup(KDecoration::ColorTitleBar, state); + options()->tqcolorGroup(KDecoration::ColorTitleBar, state); TQBrush brush(cg.background()); if (gradient) brush.setPixmap(*gradient); qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1, @@ -1367,15 +1367,15 @@ void B2Titlebar::recalcBuffer() void B2Titlebar::resizeEvent(TQResizeEvent *) { recalcBuffer(); - repaint(false); + tqrepaint(false); } void B2Titlebar::paintEvent(TQPaintEvent *) { if(client->isActive()) - bitBlt(this, 0, 0, &titleBuffer, 0, 0, titleBuffer.width(), - titleBuffer.height(), Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&titleBuffer), 0, 0, titleBuffer.width(), + titleBuffer.height(), TQt::CopyROP, true); else { TQPainter p(this); drawTitlebar(p, false); @@ -1384,14 +1384,14 @@ void B2Titlebar::paintEvent(TQPaintEvent *) void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e) { - if (e->button() == LeftButton && e->y() < height()) { + if (e->button() == Qt::LeftButton && e->y() < height()) { client->titlebarDblClickOperation(); } } void B2Titlebar::wheelEvent(TQWheelEvent *e) { - if (client->isSetShade() || rect().contains(e->pos())) + if (client->isSetShade() || TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) client->titlebarMouseWheelOperation( e->delta()); } diff --git a/kwin/clients/b2/b2client.h b/kwin/clients/b2/b2client.h index 198dfbb9b..e7616157c 100644 --- a/kwin/clients/b2/b2client.h +++ b/kwin/clients/b2/b2client.h @@ -25,10 +25,10 @@ namespace B2 { class B2Client; -class B2Button : public QButton +class B2Button : public TQButton { public: - B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = LeftButton); + B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton); ~B2Button() {}; void setBg(const TQColor &c){bg = c;} @@ -38,7 +38,7 @@ public: void setToggle(){setToggleType(Toggle);} void setActive(bool on){setOn(on);} void setUseMiniIcon(){useMiniIcon = true;} - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSizePolicy sizePolicy() const; protected: virtual void drawButton(TQPainter *p); @@ -61,7 +61,7 @@ public: bool hover; }; -class B2Titlebar : public QWidget +class B2Titlebar : public TQWidget { friend class B2Client; public: @@ -119,7 +119,7 @@ protected: Position mousePosition( const TQPoint& p ) const; void resize(const TQSize&); void borders(int &, int &, int &, int &) const; - TQSize minimumSize() const; + TQSize tqminimumSize() const; bool eventFilter(TQObject *, TQEvent *); private slots: void menuButtonPressed(); diff --git a/kwin/clients/b2/config/config.h b/kwin/clients/b2/config/config.h index 92c255ae6..99d664ad1 100644 --- a/kwin/clients/b2/config/config.h +++ b/kwin/clients/b2/config/config.h @@ -16,7 +16,7 @@ #include <tqcombobox.h> #include <kconfig.h> -class B2Config: public QObject +class B2Config: public TQObject { Q_OBJECT diff --git a/kwin/clients/default/config/config.h b/kwin/clients/default/config/config.h index 5857910b1..733b96141 100644 --- a/kwin/clients/default/config/config.h +++ b/kwin/clients/default/config/config.h @@ -17,7 +17,7 @@ #include <tqlabel.h> #include <tqvbox.h> -class KDEDefaultConfig: public QObject +class KDEDefaultConfig: public TQObject { Q_OBJECT diff --git a/kwin/clients/default/kdedefault.cpp b/kwin/clients/default/kdedefault.cpp index d91ccf56b..f3b8fa2ba 100644 --- a/kwin/clients/default/kdedefault.cpp +++ b/kwin/clients/default/kdedefault.cpp @@ -240,7 +240,7 @@ unsigned long KDEDefaultHandler::readConfig( bool update ) || new_useGradients != useGradients || new_titleHeight != normalTitleHeight || new_toolTitleHeight != toolTitleHeight ) - changed |= SettingColors; // just recreate the pixmaps and repaint + changed |= SettingColors; // just recreate the pixmaps and tqrepaint } showGrabBar = new_showGrabBar; @@ -328,7 +328,7 @@ void KDEDefaultHandler::createPixmaps() TQPainter p; // Active pins - g = options()->colorGroup( ColorButtonBg, true ); + g = options()->tqcolorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); p.begin( pinUpPix ); @@ -346,7 +346,7 @@ void KDEDefaultHandler::createPixmaps() pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) ); // Inactive pins - g = options()->colorGroup( ColorButtonBg, false ); + g = options()->tqcolorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); p.begin( ipinUpPix ); @@ -404,25 +404,25 @@ void KDEDefaultHandler::createPixmaps() irightBtnDownPix[false]->resize(toolTitleHeight, toolTitleHeight); // Draw the button state pixmaps - g = options()->colorGroup( ColorTitleBar, true ); + g = options()->tqcolorGroup( ColorTitleBar, true ); drawButtonBackground( leftBtnUpPix[true], g, false ); drawButtonBackground( leftBtnDownPix[true], g, true ); drawButtonBackground( leftBtnUpPix[false], g, false ); drawButtonBackground( leftBtnDownPix[false], g, true ); - g = options()->colorGroup( ColorButtonBg, true ); + g = options()->tqcolorGroup( ColorButtonBg, true ); drawButtonBackground( rightBtnUpPix[true], g, false ); drawButtonBackground( rightBtnDownPix[true], g, true ); drawButtonBackground( rightBtnUpPix[false], g, false ); drawButtonBackground( rightBtnDownPix[false], g, true ); - g = options()->colorGroup( ColorTitleBar, false ); + g = options()->tqcolorGroup( ColorTitleBar, false ); drawButtonBackground( ileftBtnUpPix[true], g, false ); drawButtonBackground( ileftBtnDownPix[true], g, true ); drawButtonBackground( ileftBtnUpPix[false], g, false ); drawButtonBackground( ileftBtnDownPix[false], g, true ); - g = options()->colorGroup( ColorButtonBg, false ); + g = options()->tqcolorGroup( ColorButtonBg, false ); drawButtonBackground( irightBtnUpPix[true], g, false ); drawButtonBackground( irightBtnDownPix[true], g, true ); drawButtonBackground( irightBtnUpPix[false], g, false ); @@ -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 = qGray( KDecoration::options()->color( + bool darkDeco = tqGray( KDecoration::options()->color( isLeft() ? KDecoration::ColorTitleBar : KDecoration::ColorButtonBg, active).rgb() ) > 127; @@ -708,7 +708,7 @@ void KDEDefaultButton::drawButton(TQPainter *p) // Smooth scale the pixmap for small titlebars // This is slow, but we assume this isn't done too often if ( width() < 16 ) { - btnpix.convertFromImage(btnpix.convertToImage().smoothScale(12, 12)); + btnpix.convertFromImage(TQImage(btnpix.convertToImage()).smoothScale(12, 12)); p->drawPixmap( 0, 0, btnpix ); } else @@ -720,7 +720,7 @@ void KDEDefaultButton::drawButton(TQPainter *p) void KDEDefaultButton::enterEvent(TQEvent *e) { isMouseOver=true; - repaint(false); + tqrepaint(false); TQButton::enterEvent(e); } @@ -728,7 +728,7 @@ void KDEDefaultButton::enterEvent(TQEvent *e) void KDEDefaultButton::leaveEvent(TQEvent *e) { isMouseOver=false; - repaint(false); + tqrepaint(false); TQButton::leaveEvent(e); } @@ -856,7 +856,7 @@ void KDEDefaultClient::init() void KDEDefaultClient::reset( unsigned long changed) { - widget()->repaint(); + widget()->tqrepaint(); KCommonDecoration::reset(changed); } @@ -909,7 +909,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) p.drawRect(x,y,w,h); // Draw part of the frame that is the titlebar color - g = options()->colorGroup(ColorTitleBar, isActive()); + g = options()->tqcolorGroup(ColorTitleBar, isActive()); p.setPen(g.light()); p.drawLine(x+1, y+1, rightOffset-1, y+1); p.drawLine(x+1, y+1, x+1, leftFrameStart+borderWidth-4); @@ -929,7 +929,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2); // Fill out the border edges - g = options()->colorGroup(ColorFrame, isActive()); + g = options()->tqcolorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(rightOffset, y+1, x2-1, y+1); p.drawLine(x+1, leftFrameStart+borderWidth-3, x+1, y2-1); diff --git a/kwin/clients/keramik/config/keramikconfig.ui b/kwin/clients/keramik/config/keramikconfig.ui index f074a00b8..f24d15952 100644 --- a/kwin/clients/keramik/config/keramikconfig.ui +++ b/kwin/clients/keramik/config/keramikconfig.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KeramikConfigUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KeramikConfigUI</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>showAppIcons</cstring> </property> @@ -33,7 +33,7 @@ <string>Check this option if you want the window icon to be displayed in the caption bubble next to the titlebar text.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>smallCaptions</cstring> </property> @@ -44,7 +44,7 @@ <string>Check this option if you want the caption bubble to have the same size on active windows that it has on inactive ones. This option is useful for laptops or low resolution displays where you want maximize the amount of space available to the window contents.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>largeGrabBars</cstring> </property> @@ -55,7 +55,7 @@ <string>Check this option if you want a grab bar to be drawn below windows. When this option is not selected only a thin border will be drawn in its place.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useShadowedText</cstring> </property> diff --git a/kwin/clients/keramik/embedtool.cpp b/kwin/clients/keramik/embedtool.cpp index 4f5135a3f..415862842 100644 --- a/kwin/clients/keramik/embedtool.cpp +++ b/kwin/clients/keramik/embedtool.cpp @@ -1,7 +1,7 @@ /* * Keramik KWin embed tool (version 1.0) * - * Copyright (C) 2002 Fredrik Höglund <fredrik@kde.org> + * Copyright (C) 2002 Fredrik H�glund <fredrik@kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -60,13 +60,13 @@ private: KeramikEmbedder::KeramikEmbedder() { - TQDateTime date( TQDateTime::currentDateTime() ); + TQDateTime date( TQDateTime::tqcurrentDateTime() ); TQString datestring( date.toString() ); file = new TQFile( "tiles.h" ); file->open( IO_WriteOnly | IO_Truncate ); - stream.setDevice( file ); + stream.setDevice( TQT_TQIODEVICE(file) ); stream << "/*\n"; stream << " * Generated by embedtool 1.0 on " << datestring << endl; @@ -100,19 +100,19 @@ void KeramikEmbedder::embed( const char *name ) TQString codename( basename ); TQImage image( name ); - codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" ); + codename = codename.tqreplace( 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(); - Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( image.bits() ); + TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( image.bits() ); bool hasAlpha = false; for ( int i = 0, j = 0; i < pixels; i++ ) { - if ( qAlpha( *data ) && qAlpha( *data ) != 0xff ) + if ( tqAlpha( *data ) && tqAlpha( *data ) != 0xff ) hasAlpha = true; stream << "0x" << qSetW(8) << *(data++); @@ -174,12 +174,12 @@ void KeramikEmbedder::writeIndex() stream << "\tclass KeramikImageDb {\n"; stream << "\tprivate:\n"; stream << "\t\tstatic KeramikImageDb *m_inst;\n"; - stream << "\t\tQDict<TQImage> *db;\n\n"; + stream << "\t\tTQDict<TQImage> *db;\n\n"; stream << "\t\tKeramikImageDb() {\n"; stream << "\t\t\tdb = new TQDict<TQImage>( " << prime << " );\n"; stream << "\t\t\tdb->setAutoDelete( true );\n\n"; stream << "\t\t\tfor ( int i = 0; i < " << index->count() << "; i++ ) {\n"; - stream << "\t\t\t\tQImage *img = new TQImage( (uchar*)image_db[i].data,\n"; + stream << "\t\t\t\tTQImage *img = new TQImage( (uchar*)image_db[i].data,\n"; stream << "\t\t\t\t\t\timage_db[i].width, image_db[i].height,\n"; stream << "\t\t\t\t\t\t32, NULL, 0, TQImage::LittleEndian );\n\n"; stream << "\t\t\t\tif ( image_db[i].alpha )\n"; @@ -199,8 +199,8 @@ void KeramikEmbedder::writeIndex() stream << "\t\t\tif ( m_inst ) delete m_inst;\n"; stream << "\t\t\tm_inst = NULL;\n"; stream << "\t\t}\n\n"; - stream << "\t\tQImage *image( const TQString &name ) const {\n"; - stream << "\t\t\treturn db->find( name );\n"; + stream << "\t\tTQImage *image( const TQString &name ) const {\n"; + stream << "\t\t\treturn db->tqfind( name );\n"; stream << "\t\t}\n\n"; stream << "\t}; // class KeramikImageDb\n\n"; stream << "\tKeramikImageDb *KeramikImageDb::m_inst = NULL;\n\n"; diff --git a/kwin/clients/keramik/keramik.cpp b/kwin/clients/keramik/keramik.cpp index 48a187098..2d5f111c8 100644 --- a/kwin/clients/keramik/keramik.cpp +++ b/kwin/clients/keramik/keramik.cpp @@ -585,39 +585,39 @@ TQPixmap *KeramikHandler::composite( TQImage *over, TQImage *under ) int width = over->width(), height = over->height(); // Clear the destination image - Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( dest.bits() ); + TQ_UINT32 *data = reinterpret_cast<TQ_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 Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.scanLine(y1) ); - register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( under->scanLine(y2) ); + register TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( dest.scanLine(y1) ); + register TQ_UINT32 *src = reinterpret_cast<TQ_UINT32*>( under->scanLine(y2) ); for ( int x = 0; x < width; x++ ) *(dst++) = *(src++); } // Blend the over image onto the destination - register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.bits() ); - register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( over->bits() ); + register TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( dest.bits() ); + register TQ_UINT32 *src = reinterpret_cast<TQ_UINT32*>( over->bits() ); for ( int i = 0; i < width * height; i++ ) { - int r1 = qRed( *dst ), g1 = qGreen( *dst ), b1 = qBlue( *dst ); - int r2 = qRed( *src ), g2 = qGreen( *src ), b2 = qBlue( *src ); - int a = qAlpha( *src ); + int r1 = tqRed( *dst ), g1 = tqGreen( *dst ), b1 = tqBlue( *dst ); + int r2 = tqRed( *src ), g2 = tqGreen( *src ), b2 = tqBlue( *src ); + int a = tqAlpha( *src ); if ( a == 0xff ) *dst = *src; else if ( a != 0x00 ) - *dst = qRgba( Q_UINT8( r1 + (((r2 - r1) * a) >> 8) ), - Q_UINT8( g1 + (((g2 - g1) * a) >> 8) ), - Q_UINT8( b1 + (((b2 - b1) * a) >> 8) ), + *dst = tqRgba( TQ_UINT8( r1 + (((r2 - r1) * a) >> 8) ), + TQ_UINT8( g1 + (((g2 - g1) * a) >> 8) ), + TQ_UINT8( b1 + (((b2 - b1) * a) >> 8) ), 0xff ); - else if ( qAlpha(*dst) == 0x00 ) + else if ( tqAlpha(*dst) == 0x00 ) *dst = 0; src++; dst++; @@ -758,13 +758,13 @@ TQValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const TQString &tip, const int realizeBtns ) : TQButton( c->widget(), name ), - client( c ), button( btn ), hover( false ), lastbutton( NoButton ) + client( c ), button( btn ), hover( false ), lastbutton( Qt::NoButton ) { realizeButtons = realizeBtns; TQToolTip::add( this, tip ); // FRAME setBackgroundMode( NoBackground ); - setCursor( arrowCursor ); + setCursor( tqarrowCursor ); int size = clientHandler->roundButton()->height(); setFixedSize( size, size ); @@ -783,7 +783,7 @@ void KeramikButton::enterEvent( TQEvent *e ) TQButton::enterEvent( e ); hover = true; - repaint( false ); + tqrepaint( false ); } @@ -792,14 +792,14 @@ void KeramikButton::leaveEvent( TQEvent *e ) TQButton::leaveEvent( e ); hover = false; - repaint( false ); + tqrepaint( false ); } void KeramikButton::mousePressEvent( TQMouseEvent *e ) { lastbutton = e->button(); - TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?LeftButton:NoButton, e->state() ); + TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mousePressEvent( &me ); } @@ -807,7 +807,7 @@ void KeramikButton::mousePressEvent( TQMouseEvent *e ) void KeramikButton::mouseReleaseEvent( TQMouseEvent *e ) { lastbutton = e->button(); - TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?LeftButton:NoButton, e->state() ); + TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -831,14 +831,14 @@ void KeramikButton::drawButton( TQPainter *p ) if ( isDown() ) { // Pressed - p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); p->translate( TQApplication::reverseLayout() ? -1 : 1, 1 ); } else if ( hover ) // Mouse over - p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(size, 0, size, size), pix->rect() ) ); else // Normal - p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(0, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(0, 0, size, size), pix->rect() ) ); // Draw the button deco on the bevel @@ -909,7 +909,7 @@ void KeramikClient::init() connect( this, TQT_SIGNAL( keepAboveChanged( bool )), TQT_SLOT( keepAboveChange( bool ))); connect( this, TQT_SIGNAL( keepBelowChanged( bool )), TQT_SLOT( keepBelowChange( bool ))); - createMainWidget( WStaticContents | WResizeNoErase | WRepaintNoErase ); + createMainWidget( (WFlags)(WStaticContents | WResizeNoErase | WRepaintNoErase) ); widget()->installEventFilter( this ); // Minimize flicker @@ -1013,13 +1013,13 @@ void KeramikClient::reset( unsigned long ) captionBufferDirty = maskDirty = true; - // Only repaint the window if it's visible + // Only tqrepaint the window if it's visible // (i.e. not minimized and on the current desktop) if ( widget()->isVisible() ) { - widget()->repaint( false ); + widget()->tqrepaint( false ); for ( int i = 0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->repaint( false ); + if ( button[i] ) button[i]->tqrepaint( false ); } } @@ -1033,7 +1033,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) // Menu button case 'M' : if ( !button[MenuButton] ) { - button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), LeftButton|RightButton ); + button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), Qt::LeftButton|Qt::RightButton ); connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) ); layout->addWidget( button[MenuButton] ); } @@ -1072,7 +1072,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) // Maximize button case 'A' : if ( !button[MaxButton] && isMaximizable() ) { - button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), LeftButton|MidButton|RightButton ); + button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton ); connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) ); layout->addWidget( button[MaxButton] ); } @@ -1260,7 +1260,7 @@ void KeramikClient::updateCaptionBuffer() ( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 ); int xpos = QMAX( (captionRect.width() - tw) / 3, 8 ); - TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, + TQRect tr = TQStyle::tqvisualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, captionRect.height() - 4), captionBuffer.rect() ); //p.setPen( Qt::red ); // debug @@ -1269,7 +1269,7 @@ void KeramikClient::updateCaptionBuffer() // Application icon if ( clientHandler->showAppIcons() ) { - TQRect iconRect = TQStyle::visualRect( TQRect(tr.x(), + TQRect iconRect = TQStyle::tqvisualRect( TQRect(tr.x(), 1 + (captionRect.height() - 4 - 16) / 2, 16, 16), tr ); TQRect r( icon->rect() ); r.moveCenter( iconRect.center() ); @@ -1304,7 +1304,7 @@ void KeramikClient::updateCaptionBuffer() { p.translate( TQApplication::reverseLayout() ? -1 : 1, 1 ); //p.setPen( options()->color(ColorTitleBar, active).dark() ); - if (qGray(options()->color(ColorFont, active).rgb()) < 100) + if (tqGray(options()->color(ColorFont, active).rgb()) < 100) p.setPen( TQColor(200,200,200) ); else p.setPen( black ); @@ -1329,7 +1329,7 @@ void KeramikClient::calculateCaptionRect() cw += 16 + 4; // icon width + space cw = QMIN( cw, titlebar->geometry().width() ); - captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), + captionRect = TQStyle::tqvisualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), cw, clientHandler->titleBarHeight(largeCaption) ), titlebar->geometry() ); } @@ -1345,7 +1345,7 @@ void KeramikClient::captionChange() captionBufferDirty = true; - widget()->repaint( r | captionRect, false ); + widget()->tqrepaint( r | captionRect, false ); } @@ -1361,7 +1361,7 @@ void KeramikClient::iconChange() activeIcon = inactiveIcon = NULL; captionBufferDirty = true; - widget()->repaint( captionRect, false ); + widget()->tqrepaint( captionRect, false ); } } @@ -1380,10 +1380,10 @@ void KeramikClient::activeChange() captionBufferDirty = true; - widget()->repaint( false ); + widget()->tqrepaint( false ); for ( int i=0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->repaint( false ); + if ( button[i] ) button[i]->tqrepaint( false ); } @@ -1400,7 +1400,7 @@ void KeramikClient::maximizeChange() captionBufferDirty = maskDirty = true; widget()->layout()->activate(); - widget()->repaint( false ); + widget()->tqrepaint( false ); } else if (( maximizeMode() & MaximizeVertical ) == 0 && !largeTitlebar ) { // We've been restored - enlarge the titlebar by 3 pixels topSpacer->changeSize( 10, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -1410,14 +1410,14 @@ void KeramikClient::maximizeChange() captionBufferDirty = maskDirty = true; widget()->layout()->activate(); - widget()->repaint( false ); + widget()->tqrepaint( false ); } } if ( button[ MaxButton ] ) { TQToolTip::remove( button[ MaxButton ] ); TQToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") ); - button[ MaxButton ]->repaint(); + button[ MaxButton ]->tqrepaint(); } } @@ -1426,7 +1426,7 @@ void KeramikClient::desktopChange() { if ( button[ OnAllDesktopsButton ] ) { - button[ OnAllDesktopsButton ]->repaint( true ); + button[ OnAllDesktopsButton ]->tqrepaint( true ); TQToolTip::remove( button[ OnAllDesktopsButton ] ); TQToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") ); } @@ -1437,7 +1437,7 @@ void KeramikClient::shadeChange() { if ( button[ ShadeButton ] ) { - button[ ShadeButton ]->repaint( true ); + button[ ShadeButton ]->tqrepaint( true ); TQToolTip::remove( button[ ShadeButton ] ); TQToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") ); } @@ -1447,14 +1447,14 @@ void KeramikClient::shadeChange() void KeramikClient::keepAboveChange( bool ) { if ( button[ AboveButton ] ) - button[ AboveButton ]->repaint( true ); + button[ AboveButton ]->tqrepaint( true ); } void KeramikClient::keepBelowChange( bool ) { if ( button[ BelowButton ] ) - button[ BelowButton ]->repaint( true ); + button[ BelowButton ]->tqrepaint( true ); } @@ -1482,21 +1482,21 @@ void KeramikClient::slotMaximize() void KeramikClient::slotAbove() { setKeepAbove( !keepAbove()); - button[ AboveButton ]->repaint( true ); + button[ AboveButton ]->tqrepaint( true ); } void KeramikClient::slotBelow() { setKeepBelow( !keepBelow()); - button[ BelowButton ]->repaint( true ); + button[ BelowButton ]->tqrepaint( true ); } void KeramikClient::slotShade() { setShade( !isSetShade()); - button[ ShadeButton ]->repaint( true ); + button[ ShadeButton ]->tqrepaint( true ); } @@ -1656,15 +1656,15 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e ) { - if ( e->button() == LeftButton - && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton + && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) ) titlebarDblClickOperation(); } void KeramikClient::wheelEvent( TQWheelEvent *e ) { if (isSetShade() - || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) + || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } @@ -1774,37 +1774,37 @@ void KeramikClient::borders( int& left, int& right, int& top, int& bottom ) cons } -TQSize KeramikClient::minimumSize() const +TQSize KeramikClient::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } bool KeramikClient::eventFilter( TQObject* o, TQEvent* e ) { - if ( o != widget() ) + if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) ) return false; switch ( e->type() ) { case TQEvent::Resize: - resizeEvent( static_cast< TQResizeEvent* >( e ) ); + resizeEvent( TQT_TQRESIZEEVENT( e ) ); return true; case TQEvent::Paint: - paintEvent( static_cast< TQPaintEvent* >( e ) ); + paintEvent( TQT_TQPAINTEVENT( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e ) ); + mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( static_cast< TQMouseEvent* >( e ) ); + processMousePressEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: diff --git a/kwin/clients/keramik/keramik.h b/kwin/clients/keramik/keramik.h index c90d3509f..e4b1df5f5 100644 --- a/kwin/clients/keramik/keramik.h +++ b/kwin/clients/keramik/keramik.h @@ -2,7 +2,7 @@ * * Keramik KWin client (version 0.8) * - * Copyright (C) 2002 Fredrik Höglund <fredrik@kde.org> + * Copyright (C) 2002 Fredrik H�glund <fredrik@kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -111,10 +111,10 @@ namespace Keramik { }; // class KeramikHandler class KeramikClient; - class KeramikButton : public QButton + class KeramikButton : public TQButton { public: - KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = LeftButton ); + KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = Qt::LeftButton ); ~KeramikButton(); ButtonState lastButton() const { return lastbutton; } @@ -148,7 +148,7 @@ namespace Keramik { virtual Position mousePosition( const TQPoint& p ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void resize( const TQSize& s ); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; virtual bool eventFilter( TQObject* o, TQEvent* e ); virtual void activeChange(); virtual void captionChange(); diff --git a/kwin/clients/kwmtheme/cli_installer/main.cpp b/kwin/clients/kwmtheme/cli_installer/main.cpp index abf2bad3d..56de8c9fe 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("shapePixmapTop"); + tmpStr = input.readEntry("tqshapePixmapTop"); if(!tmpStr.isEmpty()){ copy(srcStr+tmpStr, localDirStr+tmpStr); } output->writeEntry("wm_top", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapBottom"); + tmpStr = input.readEntry("tqshapePixmapBottom"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottom", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapLeft"); + tmpStr = input.readEntry("tqshapePixmapLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_left", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapRight"); + tmpStr = input.readEntry("tqshapePixmapRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_right", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapTopLeft"); + tmpStr = input.readEntry("tqshapePixmapTopLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topleft", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapTopRight"); + tmpStr = input.readEntry("tqshapePixmapTopRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topright", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapBottomLeft"); + tmpStr = input.readEntry("tqshapePixmapBottomLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomleft", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapBottomRight"); + tmpStr = input.readEntry("tqshapePixmapBottomRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomright", tmpStr, true, true); diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp index 89dc6a564..0293d47c4 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.cpp +++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp @@ -231,7 +231,7 @@ void MyButton::drawButtonLabel(TQPainter *p) int offset = (isDown() && ((pixmap()->width() >= width()) || (pixmap()->height() >= height()))) ? 1 : 0; style().drawItem(p, TQRect( offset, offset, width(), height() ), - AlignCenter, colorGroup(), + AlignCenter, tqcolorGroup(), true, pixmap(), TQString::null); } } @@ -364,7 +364,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest) p.begin(&buffer); if(titleSunken){ - qDrawShadeRect(&p, r, options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), + qDrawShadeRect(&p, r, options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), true, 1, 0); r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2); } @@ -384,7 +384,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest) p.drawTiledPixmap(r, *fill); } else{ - p.fillRect(r, options()->colorGroup(KDecorationOptions::ColorTitleBar, isActive()). + p.fillRect(r, options()->tqcolorGroup(KDecorationOptions::ColorTitleBar, isActive()). brush(TQColorGroup::Button)); } p.setFont(options()->font(isActive())); @@ -402,12 +402,12 @@ void KWMThemeClient::drawTitle(TQPainter &dest) void KWMThemeClient::resizeEvent( TQResizeEvent* ) { doShape(); - widget()->repaint(); + widget()->tqrepaint(); } void KWMThemeClient::captionChange() { - widget()->repaint( titlebar->geometry(), false ); + widget()->tqrepaint( titlebar->geometry(), false ); } void KWMThemeClient::paintEvent( TQPaintEvent *) @@ -557,7 +557,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) } drawTitle(p); - TQColor c = widget()->colorGroup().background(); + TQColor c = widget()->tqcolorGroup().background(); // KWM evidently had a 1 pixel border around the client window. We // emulate it here, but should be removed at some point in order to @@ -576,10 +576,10 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) void KWMThemeClient::doShape() { - TQBitmap shapemask(width(), height()); - shapemask.fill(color0); + TQBitmap tqshapemask(width(), height()); + tqshapemask.fill(color0); TQPainter p; - p.begin(&shapemask); + p.begin(&tqshapemask); p.setBrush(color1); p.setPen(color1); int x,y; @@ -740,19 +740,19 @@ void KWMThemeClient::doShape() } } p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1); - setMask(shapemask); + setMask(tqshapemask); } void KWMThemeClient::showEvent(TQShowEvent *) { doShape(); - widget()->repaint(false); + widget()->tqrepaint(false); } void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if (e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if (e->button() == LeftButton && titlebar->geometry().tqcontains( e->pos() ) ) titlebarDblClickOperation(); } @@ -868,9 +868,9 @@ bool KWMThemeClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize KWMThemeClient::minimumSize() const +TQSize KWMThemeClient::tqminimumSize() const { - return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); } void KWMThemeClient::resize( const TQSize& s ) diff --git a/kwin/clients/kwmtheme/kwmthemeclient.h b/kwin/clients/kwmtheme/kwmthemeclient.h index 13914b2f6..e51bfe6d1 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.h +++ b/kwin/clients/kwmtheme/kwmthemeclient.h @@ -13,7 +13,7 @@ class TQGridLayout; namespace KWMTheme { -class MyButton : public QToolButton +class MyButton : public TQToolButton { public: MyButton(TQWidget *parent=0, const char *name=0) @@ -30,7 +30,7 @@ public: ~KWMThemeClient(){;} void init(); void resize( const TQSize& s ); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; protected: void doShape(); diff --git a/kwin/clients/laptop/laptopclient.cpp b/kwin/clients/laptop/laptopclient.cpp index db91cf15d..db37feae6 100644 --- a/kwin/clients/laptop/laptopclient.cpp +++ b/kwin/clients/laptop/laptopclient.cpp @@ -157,7 +157,7 @@ static void create_pixmaps() KPixmapEffect::VerticalGradient); } // buttons (active/inactive, sunken/unsunken, 2 sizes each) - TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); TQColor c = g.background(); btnPix1 = new KPixmap; btnPix1->resize(btnWidth1, titleHeight); @@ -184,7 +184,7 @@ static void create_pixmaps() KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120), KPixmapEffect::DiagonalGradient); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130), KPixmapEffect::DiagonalGradient); @@ -200,27 +200,27 @@ static void create_pixmaps() btnDownPix1->fill(c.rgb()); btnPix2->fill(c.rgb()); btnDownPix2->fill(c.rgb()); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); iBtnPix2->fill(c.rgb()); iBtnDownPix2->fill(c.rgb()); } - g = options()->colorGroup(KDecoration::ColorButtonBg, true); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); c = g.background(); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(btnPix2, g, false); drawButtonFrame(btnDownPix2, g, true); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); c = g.background(); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iBtnPix2, g, false); drawButtonFrame(iBtnDownPix2, g, true); - if(qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) + if(tqGray(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); - repaint(); + tqrepaint(); } void LaptopButton::drawButton(TQPainter *p) @@ -314,7 +314,7 @@ void LaptopButton::drawButton(TQPainter *p) } } else{ - TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); int w = width(); int h = height(); p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button()); @@ -469,7 +469,7 @@ void LaptopClient::captionChange() void LaptopClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); TQRect r(widget()->rect()); p.setPen(Qt::black); @@ -546,7 +546,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) p.setFont(options()->font(false, isToolWindow() )); TQFontMetrics fm(options()->font(false)); - g = options()->colorGroup(KDecoration::ColorTitleBar, false); + g = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); if(iUpperGradient) p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(), fm.width(caption())+8, r.height()-1, @@ -564,7 +564,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) p.setPen(options()->color(KDecoration::ColorFont, false)); p.drawText(r.x(), r.y(), r.width(), r.height()-1, AlignCenter, caption() ); - g = options()->colorGroup(KDecoration::ColorFrame, true); + g = options()->tqcolorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); @@ -629,7 +629,7 @@ void LaptopClient::updateActiveBuffer( ) p.setFont(options()->font(true, isToolWindow() )); TQFontMetrics fm(options()->font(true)); - TQColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); if(aUpperGradient) p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(), fm.width(caption())+8, r.height()-1, @@ -647,7 +647,7 @@ void LaptopClient::updateActiveBuffer( ) p.setPen(options()->color(KDecoration::ColorFont, true)); p.drawText(r.x(), r.y(), r.width(), r.height()-1, AlignCenter, caption() ); - g = options()->colorGroup(KDecoration::ColorFrame, true); + g = options()->tqcolorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); diff --git a/kwin/clients/modernsystem/config/config.cpp b/kwin/clients/modernsystem/config/config.cpp index 8a94c1748..f5260ba7d 100644 --- a/kwin/clients/modernsystem/config/config.cpp +++ b/kwin/clients/modernsystem/config/config.cpp @@ -47,7 +47,7 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged())); sliderBox = new TQVBox(handleBox); - handleSizeSlider = new TQSlider(0, 4, 1, 0, TQSlider::Horizontal, sliderBox); + handleSizeSlider = new TQSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox); TQWhatsThis::add(handleSizeSlider, i18n("Here you can change the size of the resize handle.")); handleSizeSlider->setTickInterval(1); @@ -59,11 +59,11 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par bool rtl = kapp->reverseLayout(); label1 = new TQLabel(i18n("Small"), hbox); - label1->setAlignment(rtl ? AlignRight : AlignLeft); + label1->tqsetAlignment(rtl ? AlignRight : AlignLeft); label2 = new TQLabel(i18n("Medium"), hbox); - label2->setAlignment(AlignHCenter); + label2->tqsetAlignment(AlignHCenter); label3 = new TQLabel(i18n("Large"), hbox); - label3->setAlignment(rtl ? AlignLeft : AlignRight); + label3->tqsetAlignment(rtl ? AlignLeft : AlignRight); vbox->addWidget(handleBox); vbox->addStretch(1); @@ -104,7 +104,7 @@ void ModernSysConfig::load(KConfig* /*conf*/) handleSizeSlider->setEnabled(i); handleWidth = clientrc->readUnsignedNumEntry("HandleWidth", 6); handleSize = clientrc->readUnsignedNumEntry("HandleSize", 30); - handleSizeSlider->setValue(QMIN((handleWidth - 6) / 2, 4)); + handleSizeSlider->setValue(TQMIN((handleWidth - 6) / 2, 4)); } diff --git a/kwin/clients/modernsystem/config/config.h b/kwin/clients/modernsystem/config/config.h index dcf4a588f..3a04573cf 100644 --- a/kwin/clients/modernsystem/config/config.h +++ b/kwin/clients/modernsystem/config/config.h @@ -8,7 +8,7 @@ #include <tqslider.h> #include <tqlabel.h> -class ModernSysConfig : public QObject +class ModernSysConfig : public TQObject { Q_OBJECT @@ -30,16 +30,16 @@ class ModernSysConfig : public QObject private: KConfig *clientrc; - QWidget *mainw; - QVBoxLayout *vbox; + TQWidget *mainw; + TQVBoxLayout *vbox; TQWidget *handleBox; TQCheckBox *cbShowHandle; - QVBox *sliderBox; - QSlider *handleSizeSlider; - QHBox *hbox; - QLabel *label1; - QLabel *label2; - QLabel *label3; + TQVBox *sliderBox; + TQSlider *handleSizeSlider; + TQHBox *hbox; + TQLabel *label1; + TQLabel *label2; + TQLabel *label3; unsigned handleWidth; unsigned handleSize; diff --git a/kwin/clients/modernsystem/modernsys.cpp b/kwin/clients/modernsystem/modernsys.cpp index ce7545cdf..30344d75c 100644 --- a/kwin/clients/modernsystem/modernsys.cpp +++ b/kwin/clients/modernsystem/modernsys.cpp @@ -171,20 +171,20 @@ static void create_pixmaps() KPixmapEffect::VerticalGradient); } // buttons - TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true)); + TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true)); buttonPix = new TQPixmap(14, 15); make_button_fx(btnColor, buttonPix); buttonPixDown = new TQPixmap(14, 15); make_button_fx(btnColor, buttonPixDown, true); - btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false); + btnColor = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); iButtonPix = new TQPixmap(14, 15); make_button_fx(btnColor, iButtonPix); iButtonPixDown = new TQPixmap(14, 15); make_button_fx(btnColor, iButtonPixDown, true); - if(qGray(btnColor.background().rgb()) < 150) + if(tqGray(btnColor.background().rgb()) < 150) buttonFg = new TQColor(Qt::white); else buttonFg = new TQColor(Qt::black); @@ -515,7 +515,7 @@ void ModernSys::recalcTitleBuffer() p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient); else p.fillRect(0, 0, width(), title_height+2, - options()->colorGroup(ColorTitleBar, true). + options()->tqcolorGroup(ColorTitleBar, true). brush(TQColorGroup::Button)); TQRect t = titleRect(); // titlebar->geometry(); @@ -554,7 +554,7 @@ void ModernSys::updateCaption() void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h) { kDrawRoundButton(&p, x, y, w, h, - options()->colorGroup(ColorFrame, isActive()), false); + options()->tqcolorGroup(ColorFrame, isActive()), false); } @@ -570,9 +570,9 @@ void ModernSys::paintEvent( TQPaintEvent* ) TQPainter p( widget() ); TQRect t = titleRect(); // titlebar->geometry(); - TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ? - widget()->colorGroup().brush(TQColorGroup::Background) : - options()->colorGroup(ColorFrame, isActive()). + TQBrush fillBrush(widget()->tqcolorGroup().tqbrush(TQColorGroup::Background).pixmap() ? + widget()->tqcolorGroup().brush(TQColorGroup::Background) : + options()->tqcolorGroup(ColorFrame, isActive()). brush(TQColorGroup::Button)); p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush); @@ -586,7 +586,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) int h = height() - hw; // titlebar - TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive()); + TQColorGroup g = options()->tqcolorGroup(ColorTitleBar, isActive()); if(isActive()){ p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2); } @@ -609,7 +609,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) p.drawLine(0, title_height+2, w-2, title_height+2); // frame - g = options()->colorGroup(ColorFrame, isActive()); + g = options()->tqcolorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(1, title_height+3, 1, h-2); p.setPen(g.dark()); diff --git a/kwin/clients/plastik/config/config.h b/kwin/clients/plastik/config/config.h index f288c58ea..d06bd30b8 100644 --- a/kwin/clients/plastik/config/config.h +++ b/kwin/clients/plastik/config/config.h @@ -30,7 +30,7 @@ class TQGroupBox; class KConfig; class ConfigDialog; -class PlastikConfig : public QObject +class PlastikConfig : public TQObject { Q_OBJECT public: diff --git a/kwin/clients/plastik/config/configdialog.ui b/kwin/clients/plastik/config/configdialog.ui index 642891b31..f751d8024 100644 --- a/kwin/clients/plastik/config/configdialog.ui +++ b/kwin/clients/plastik/config/configdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigDialog</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>titleAlign</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignLeft</cstring> </property> @@ -41,7 +41,7 @@ <string>Left</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignHCenter</cstring> </property> @@ -49,7 +49,7 @@ <string>Center</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignRight</cstring> </property> @@ -59,7 +59,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>coloredBorder</cstring> </property> @@ -73,7 +73,7 @@ <string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>titleShadow</cstring> </property> @@ -84,7 +84,7 @@ <string>Check this option if you want the titlebar text to have a 3D look with a shadow behind it.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>animateButtons</cstring> </property> @@ -95,7 +95,7 @@ <string>Check this option if you want the buttons to fade in when the mouse pointer hovers over them and fade out again when it moves away.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>menuClose</cstring> </property> diff --git a/kwin/clients/plastik/misc.cpp b/kwin/clients/plastik/misc.cpp index 43786fe46..1b259d383 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( 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) ); + 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) ); 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) == qRgb(0,0,255) ) { + if(img->pixel(x,y) == tqRgb(0,0,255) ) { destImg.setPixel(x,y,color.rgb() ); // set to the new color } else { - destImg.setPixel(x,y,qRgba(0,0,0,0) ); // set transparent... + destImg.setPixel(x,y,tqRgba(0,0,0,0) ); // set transparent... } } } diff --git a/kwin/clients/plastik/plastik.cpp b/kwin/clients/plastik/plastik.cpp index a6313cd1c..3f0ceab85 100644 --- a/kwin/clients/plastik/plastik.cpp +++ b/kwin/clients/plastik/plastik.cpp @@ -290,7 +290,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo } else { pm = new TQPixmap(1, titleBarTileHeight); painter.begin(pm); - painter.drawPixmap(0, 0, gradient, 0,2); + painter.tqdrawPixmap(0, 0, gradient, 0,2); if (m_coloredBorder) { painter.setPen(getColor(TitleGradient3, active).dark(110) ); } else { diff --git a/kwin/clients/plastik/plastik.h b/kwin/clients/plastik/plastik.h index 974df622b..a4c1bc5b7 100644 --- a/kwin/clients/plastik/plastik.h +++ b/kwin/clients/plastik/plastik.h @@ -93,7 +93,7 @@ public: int borderSize() { return m_borderSize; } bool animateButtons() { return m_animateButtons; } bool menuClose() { return m_menuClose; } - Qt::AlignmentFlags titleAlign() { return m_titleAlign; } + TQ_Alignment titleAlign() { return m_titleAlign; } bool reverseLayout() { return m_reverse; } TQColor getColor(KWinPlastik::ColorType type, const bool active = true); @@ -113,7 +113,7 @@ private: int m_titleHeightTool; TQFont m_titleFont; TQFont m_titleFontTool; - Qt::AlignmentFlags m_titleAlign; + TQ_Alignment m_titleAlign; // pixmap cache TQPixmap *m_pixmaps[2][2][NumPixmaps]; // button pixmaps have normal+pressed state... diff --git a/kwin/clients/plastik/plastikbutton.cpp b/kwin/clients/plastik/plastikbutton.cpp index 27a3eb127..795a384d2 100644 --- a/kwin/clients/plastik/plastikbutton.cpp +++ b/kwin/clients/plastik/plastikbutton.cpp @@ -140,7 +140,7 @@ void PlastikButton::animate() } } - repaint(false); + tqrepaint(false); } void PlastikButton::enterEvent(TQEvent *e) @@ -253,7 +253,7 @@ void PlastikButton::drawButton(TQPainter *painter) { TQPixmap menuIcon(m_client->icon().pixmap( TQIconSet::Small, TQIconSet::Normal)); if (width() < menuIcon.width() || height() < menuIcon.height() ) { - menuIcon.convertFromImage( menuIcon.convertToImage().smoothScale(width(), height())); + menuIcon.convertFromImage( TQImage(menuIcon.convertToImage()).smoothScale(width(), height())); } bP.drawPixmap((width()-menuIcon.width())/2, (height()-menuIcon.height())/2, menuIcon); } @@ -269,7 +269,7 @@ void PlastikButton::drawButton(TQPainter *painter) if(!isDown() && Handler()->titleShadow() ) { TQColor shadowColor; - if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100) + if (tqGray(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 604c66641..61dfdaba7 100644 --- a/kwin/clients/plastik/plastikclient.cpp +++ b/kwin/clients/plastik/plastikclient.cpp @@ -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.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(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.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(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.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(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.contains(m_captionRect) ) + if (m_captionRect.isValid() && region.tqcontains(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.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(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.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(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.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(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.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(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.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomLeft, active, toolWindow) ); l = tempRect.right()+1; } tempRect.setRect(borderRightLeft, borderBottomTop, borderLeft, borderBottom); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomRight, active, toolWindow) ); r = tempRect.left()-1; } tempRect.setCoords(l, borderBottomTop, r, r_y2); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomTile, active, toolWindow) ); } } @@ -394,7 +394,7 @@ TQRect PlastikClient::captionRect() const buttonsLeftWidth() - buttonsRightWidth() - marginLeft - marginRight; - Qt::AlignmentFlags a = Handler()->titleAlign(); + TQ_Alignment a = Handler()->titleAlign(); int tX, tW; // position/width of the title buffer if (caption.width() > titleWidth) { @@ -435,7 +435,7 @@ void PlastikClient::reset( unsigned long changed ) { if (changed & SettingColors) { - // repaint the whole thing + // tqrepaint the whole thing clearCaptionPixmaps(); widget()->update(); updateButtons(); @@ -445,7 +445,7 @@ void PlastikClient::reset( unsigned long changed ) updateLayout(); - // then repaint + // then tqrepaint clearCaptionPixmaps(); widget()->update(); } @@ -496,7 +496,7 @@ const TQPixmap &PlastikClient::captionPixmap() const if(Handler()->titleShadow()) { TQColor shadowColor; - if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100) + if (tqGray(Handler()->getColor(TitleFont,active).rgb()) < 100) shadowColor = TQColor(255, 255, 255); else shadowColor = TQColor(0,0,0); diff --git a/kwin/clients/quartz/config/config.h b/kwin/clients/quartz/config/config.h index 0a952c4e9..6bd1ba384 100644 --- a/kwin/clients/quartz/config/config.h +++ b/kwin/clients/quartz/config/config.h @@ -14,7 +14,7 @@ #include <tqvbox.h> #include <kconfig.h> -class QuartzConfig: public QObject +class QuartzConfig: public TQObject { Q_OBJECT diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp index 82caabb45..4c4a883b6 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().contains( 'S' ); + onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().tqcontains( '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()->colorGroup(ColorTitleBlend, true); + TQColorGroup g2 = options()->tqcolorGroup(ColorTitleBlend, true); TQColor c2 = g2.background(); - g2 = options()->colorGroup(ColorTitleBar, true ); + g2 = options()->tqcolorGroup(ColorTitleBar, true ); TQColor c = g2.background().light(130); titleBlocks = new KPixmap(); titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight ); drawBlocks( titleBlocks, *titleBlocks, c, c2 ); - g2 = options()->colorGroup(ColorTitleBlend, false); + g2 = options()->tqcolorGroup(ColorTitleBlend, false); c2 = g2.background(); - g2 = options()->colorGroup(ColorTitleBar, false ); + g2 = options()->tqcolorGroup(ColorTitleBar, false ); c = g2.background().light(130); ititleBlocks = new KPixmap(); @@ -313,9 +313,9 @@ void QuartzHandler::createPixmaps() TQColorGroup g; TQPainter p; - g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); - c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background(); - g2 = options()->colorGroup( ColorButtonBg, true ); + g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); + c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background(); + g2 = options()->tqcolorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); @@ -335,9 +335,9 @@ void QuartzHandler::createPixmaps() // Inactive pins - g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); - c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background(); - g2 = options()->colorGroup( ColorButtonBg, false ); + g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); + c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background(); + g2 = options()->tqcolorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); @@ -437,7 +437,7 @@ void QuartzButton::setBitmap(const unsigned char *bitmap) if (bitmap) { deco = new TQBitmap(10, 10, bitmap, true); deco->setMask( *deco ); - repaint( false ); + tqrepaint( false ); } } @@ -492,7 +492,7 @@ void QuartzButton::drawButton(TQPainter *p) TQPixmap tmpPix; // Smooth scale the image - tmpPix.convertFromImage( btnpix.convertToImage().smoothScale(height(), height())); + tmpPix.convertFromImage( TQImage(btnpix.convertToImage()).smoothScale(height(), height())); p->drawPixmap( 0, 0, tmpPix ); } else { Offset += (height() - 16)/2; @@ -643,8 +643,8 @@ void QuartzClient::reset( unsigned long changed ) { if (changed & SettingColors || changed & SettingFont) { - // repaint the whole thing - widget()->repaint(false); + // tqrepaint the whole thing + widget()->tqrepaint(false); } KCommonDecoration::reset(changed); @@ -675,9 +675,9 @@ void QuartzClient::paintEvent( TQPaintEvent* ) // Draw part of the frame that is the title color if( coloredFrame ) - g = options()->colorGroup(ColorTitleBar, isActive()); + g = options()->tqcolorGroup(ColorTitleBar, isActive()); else - g = options()->colorGroup(ColorFrame, isActive()); + g = options()->tqcolorGroup(ColorFrame, isActive()); // Draw outer highlights and lowlights p.setPen( g.light().light(120) ); @@ -723,7 +723,7 @@ void QuartzClient::paintEvent( TQPaintEvent* ) // Draw the title bar. // =================== int r_x, r_y, r_x2, r_y2; - widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); + TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); diff --git a/kwin/clients/redmond/redmond.cpp b/kwin/clients/redmond/redmond.cpp index 7f74479ed..b6161d9ce 100644 --- a/kwin/clients/redmond/redmond.cpp +++ b/kwin/clients/redmond/redmond.cpp @@ -108,7 +108,7 @@ static void drawButtonFrame( KPixmap *pix, const TQColorGroup &g, bool sunken ) p.begin(pix); // titlebar button frame - p.setPen( sunken ? g.dark().dark(155) : g.light()); + p.setPen( sunken ? TQColor(g.dark().dark(155)) : g.light()); p.drawLine(0, 0, x2-1, 0); p.drawLine(0, 0, 0, y2-1); @@ -119,11 +119,11 @@ static void drawButtonFrame( KPixmap *pix, const TQColorGroup &g, bool sunken ) p.drawLine(1, 1, 1, y2-2); } - p.setPen( sunken ? g.light() : g.mid().dark(135)); + p.setPen( sunken ? g.light() : TQColor(g.mid().dark(135))); p.drawLine(1, y2-1, x2-1, y2-1); p.drawLine(x2-1, 1, x2-1, y2-1); - p.setPen( sunken ? g.light() : g.dark().dark(155)); + p.setPen( sunken ? g.light() : TQColor(g.dark().dark(155))); p.drawLine(0, y2, x2, y2); p.drawLine(x2, 0, x2, y2); } @@ -149,7 +149,7 @@ static void create_pixmaps () defaultMenuPix = new TQPixmap(kdelogo); // buttons (active/inactive, sunken/unsunken) - TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); TQColor c = g.background(); btnPix1->resize(normalTitleHeight, normalTitleHeight-2); btnDownPix1->resize(normalTitleHeight, normalTitleHeight-2); @@ -172,7 +172,7 @@ static void create_pixmaps () KPixmapEffect::gradient(*miniBtnDownPix1, c.dark(130), c.light(130), KPixmapEffect::VerticalGradient); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(130), c.dark(130), KPixmapEffect::VerticalGradient); @@ -188,7 +188,7 @@ static void create_pixmaps () miniBtnPix1->fill(c.rgb()); miniBtnDownPix1->fill(c.rgb()); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); @@ -196,20 +196,20 @@ static void create_pixmaps () iMiniBtnDownPix1->fill(c.rgb()); } - g = options()->colorGroup(KDecoration::ColorButtonBg, true); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(miniBtnPix1, g, false); drawButtonFrame(miniBtnDownPix1, g, true); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iMiniBtnPix1, g, false); drawButtonFrame(iMiniBtnDownPix1, g, true); // Make sure button pixmaps contrast with the current colour scheme. - if (qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127) + if (tqGray(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; - repaint(false); + tqrepaint(false); } @@ -331,7 +331,7 @@ void RedmondButton::drawButton(TQPainter *p) // Smooth scale the menu button pixmap tmpPix.convertFromImage( - pix.convertToImage().smoothScale(height(), height() )); + TQImage(pix.convertToImage()).smoothScale(height(), height() )); p->drawPixmap( 0, 0, tmpPix ); } else { @@ -485,7 +485,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* ) // Draw part of the frame that is the frame color // ============================================== - TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); p.setPen( g.background() ); p.drawLine( x, y, x2-1, y ); p.drawLine( x, y, x, y2-1 ); diff --git a/kwin/clients/test/test.cpp b/kwin/clients/test/test.cpp index a04437067..02fd5b1d3 100644 --- a/kwin/clients/test/test.cpp +++ b/kwin/clients/test/test.cpp @@ -22,7 +22,7 @@ void Decoration::init() { button = new TQPushButton( widget()); button->show(); - button->setCursor( arrowCursor ); + button->setCursor( tqarrowCursor ); button->move( 0, 0 ); connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow())); TQToolTip::add( button, "Zelva Mana" ); @@ -93,20 +93,20 @@ void Decoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize Decoration::minimumSize() const +TQSize Decoration::tqminimumSize() const { return TQSize( 100, 50 ); } bool Decoration::eventFilter( TQObject* o, TQEvent* e ) { - if( o == widget()) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(widget())) { switch( e->type()) { case TQEvent::MouseButtonPress: { // FRAME - processMousePressEvent( static_cast< TQMouseEvent* >( e )); + processMousePressEvent( TQT_TQMOUSEEVENT( e )); return true; } case TQEvent::Show: @@ -144,7 +144,7 @@ bool Decoration::animateMinimize(bool iconify) // Go away quick. helperShowHide( false ); - qApp->syncX(); + tqApp->syncX(); TQRect r = iconGeometry(); @@ -179,7 +179,7 @@ bool Decoration::animateMinimize(bool iconify) double delta = finalAngle / steps; TQPainter p( workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); for (double angle = 0; ; angle += delta) { @@ -213,7 +213,7 @@ bool Decoration::animateMinimize(bool iconify) ungrabXServer(); -// FRAME qApp->processEvents(); // FRAME ??? +// FRAME tqApp->processEvents(); // FRAME ??? cx += xstep; cy += ystep; @@ -236,7 +236,7 @@ bool Decoration::animateMinimize(bool iconify) // Go away quick. helperShowHide( false ); - qApp->syncX(); + tqApp->syncX(); int stepCount = 12; @@ -246,7 +246,7 @@ bool Decoration::animateMinimize(bool iconify) int dy = r.height() / (stepCount * 2); TQPainter p( workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); for (int step = 0; step < stepCount; step++) { @@ -263,7 +263,7 @@ bool Decoration::animateMinimize(bool iconify) ungrabXServer(); -// FRAME qApp->processEvents(); +// FRAME tqApp->processEvents(); } } break; @@ -280,7 +280,7 @@ bool Decoration::animateMinimize(bool iconify) TQPainter p( workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); #if 0 if (iconify) @@ -298,7 +298,7 @@ bool Decoration::animateMinimize(bool iconify) p.flush(); - qApp->syncX(); + tqApp->syncX(); usleep(30000); diff --git a/kwin/clients/test/test.h b/kwin/clients/test/test.h index bfe36fa7c..e1d3d51a6 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 minimumSize() const; + virtual TQSize tqminimumSize() 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 43d1b9f42..9b5e434da 100644 --- a/kwin/clients/web/Web.cpp +++ b/kwin/clients/web/Web.cpp @@ -120,31 +120,31 @@ KCommonDecorationButton *WebClient::createButton(ButtonType type) { switch (type) { case MenuButton: - return new WebButton(MenuButton, this, "menu", shape_); + return new WebButton(MenuButton, this, "menu", tqshape_); case OnAllDesktopsButton: - return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", shape_); + return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", tqshape_); case HelpButton: - return new WebButton(HelpButton, this, "help", shape_); + return new WebButton(HelpButton, this, "help", tqshape_); case MinButton: - return new WebButton(MinButton, this, "minimize", shape_); + return new WebButton(MinButton, this, "minimize", tqshape_); case MaxButton: - return new WebButton(MaxButton, this, "maximize", shape_); + return new WebButton(MaxButton, this, "maximize", tqshape_); case CloseButton: - return new WebButton(CloseButton, this, "close", shape_); + return new WebButton(CloseButton, this, "close", tqshape_); case AboveButton: - return new WebButton(AboveButton, this, "above", shape_); + return new WebButton(AboveButton, this, "above", tqshape_); case BelowButton: - return new WebButton(BelowButton, this, "below", shape_); + return new WebButton(BelowButton, this, "below", tqshape_); case ShadeButton: - return new WebButton(ShadeButton, this, "shade", shape_); + return new WebButton(ShadeButton, this, "shade", tqshape_); default: return 0; @@ -185,7 +185,7 @@ WebClient::init() KConfig c("kwinwebrc"); c.setGroup("General"); - shape_ = c.readBoolEntry("Shape", true); + tqshape_ = c.readBoolEntry("Shape", true); KCommonDecoration::init(); } @@ -195,8 +195,8 @@ WebClient::reset( unsigned long changed ) { if (changed & SettingColors) { - // repaint the whole thing - widget()->repaint(false); + // tqrepaint the whole thing + widget()->tqrepaint(false); } else if (changed & SettingFont) { // font has changed -- update title height // title height @@ -206,7 +206,7 @@ WebClient::reset( unsigned long changed ) if (0 != titleHeight_ % 2) titleHeight_ += 1; - widget()->repaint(false); + widget()->tqrepaint(false); } KCommonDecoration::reset(changed); @@ -216,7 +216,7 @@ WebClient::reset( unsigned long changed ) WebClient::paintEvent(TQPaintEvent * pe) { int r_x, r_y, r_x2, r_y2; - widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); + TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); @@ -231,7 +231,7 @@ WebClient::paintEvent(TQPaintEvent * pe) TQPainter p(widget()); p.setPen(Qt::black); - p.setBrush(options()->colorGroup(ColorFrame, isActive()).background()); + p.setBrush(options()->tqcolorGroup(ColorFrame, isActive()).background()); p.setClipRegion(pe->region() - titleRect); @@ -241,7 +241,7 @@ WebClient::paintEvent(TQPaintEvent * pe) p.fillRect(titleRect, options()->color(ColorTitleBar, isActive())); - if (shape_) + if (tqshape_) { int r(width()); int b(height()); @@ -288,7 +288,7 @@ WebClient::paintEvent(TQPaintEvent * pe) void WebClient::updateWindowShape() { - if (!shape_) + if (!tqshape_) return; TQRegion mask(0, 0, width(), height()); diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h index c8a8fa2db..565fe8125 100644 --- a/kwin/clients/web/Web.h +++ b/kwin/clients/web/Web.h @@ -62,7 +62,7 @@ namespace Web int titleHeight_, borderSize_; - bool shape_; + bool tqshape_; TQBitmap _buttonBitmap(ButtonType t) const; }; diff --git a/kwin/clients/web/WebButton.cpp b/kwin/clients/web/WebButton.cpp index 61811accc..c58a7e75d 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 shape) +WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape) : KCommonDecorationButton (type, parent, name), mouseOver_ (false), - shape_ (shape), + tqshape_ (tqshape), deco_ (parent) { setBackgroundMode(NoBackground); @@ -127,7 +127,7 @@ void WebButton::reset(unsigned long changed) WebButton::enterEvent(TQEvent * e) { mouseOver_ = true; - repaint(); + tqrepaint(); TQButton::enterEvent(e); } @@ -135,7 +135,7 @@ WebButton::enterEvent(TQEvent * e) WebButton::leaveEvent(TQEvent * e) { mouseOver_ = false; - repaint(); + tqrepaint(); TQButton::leaveEvent(e); } @@ -145,17 +145,17 @@ WebButton::drawButton(TQPainter *p) TQPen highlightPen; if (isDown() ) - highlightPen = TQPen(colorGroup().light()); + highlightPen = TQPen(tqcolorGroup().light()); else { if (mouseOver_) - highlightPen = TQPen(colorGroup().highlight()); + highlightPen = TQPen(tqcolorGroup().highlight()); else highlightPen = TQPen(NoPen); } - p->fillRect(rect(), colorGroup().background()); + p->fillRect(rect(), tqcolorGroup().background()); Position position_; if (0 == mapToParent(rect().topLeft() ).x() ) @@ -174,7 +174,7 @@ WebButton::drawButton(TQPainter *p) p->drawLine(0, 0, width(), 0); p->drawLine(0, 1, 0, height() - 1); - if (shape_) + if (tqshape_) { p->drawPoint(3, 1); p->drawPoint(4, 1); @@ -187,11 +187,11 @@ WebButton::drawButton(TQPainter *p) p->setBrush(NoBrush); p->setPen(highlightPen); - if (shape_) + if (tqshape_) p->setClipRegion(TQRegion(rect()) - TQRect(0, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (shape_) + if (tqshape_) { p->setClipRect(rect()); p->drawPoint(4, 3); @@ -210,7 +210,7 @@ WebButton::drawButton(TQPainter *p) p->setPen(Qt::black); p->drawLine(0, 0, width(), 0); p->drawLine(width() - 1, 1, width() - 1, height() - 1); - if (shape_) + if (tqshape_) { p->drawPoint(width() - 5, 1); p->drawPoint(width() - 4, 1); @@ -223,11 +223,11 @@ WebButton::drawButton(TQPainter *p) p->setBrush(NoBrush); p->setPen(highlightPen); - if (shape_) + if (tqshape_) p->setClipRegion(TQRegion(rect()) - TQRect(width() - 6, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (shape_) + if (tqshape_) { p->setClipRect(rect()); p->drawPoint(width() - 5, 3); diff --git a/kwin/clients/web/WebButton.h b/kwin/clients/web/WebButton.h index da94ea3f7..b24136868 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 shape); + WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape); virtual ~WebButton(); @@ -59,7 +59,7 @@ namespace Web bool mouseOver_; - bool shape_; + bool tqshape_; WebClient* deco_; }; } diff --git a/kwin/data/update_default_rules.cpp b/kwin/data/update_default_rules.cpp index e43323ec9..a949d6980 100644 --- a/kwin/data/update_default_rules.cpp +++ b/kwin/data/update_default_rules.cpp @@ -52,5 +52,5 @@ int main( int argc, char* argv[] ) dest_cfg.sync(); DCOPClient client; client.attach(); - client.send("kwin*", "", "reconfigure()", ""); + client.send("kwin*", "", "reconfigure()", TQString("")); } diff --git a/kwin/data/update_window_settings.cpp b/kwin/data/update_window_settings.cpp index 0a39850d7..4c2414568 100644 --- a/kwin/data/update_window_settings.cpp +++ b/kwin/data/update_window_settings.cpp @@ -164,5 +164,5 @@ int main() dest_cfg.sync(); DCOPClient client; client.attach(); - client.send("kwin*", "", "reconfigure()", ""); + client.send("kwin*", "", "reconfigure()", TQString("")); } diff --git a/kwin/events.cpp b/kwin/events.cpp index a30e915e1..74563d3fb 100644 --- a/kwin/events.cpp +++ b/kwin/events.cpp @@ -384,7 +384,7 @@ bool Workspace::workspaceEvent( XEvent * e ) { if ( TQWhatsThis::inWhatsThisMode() ) { - TQWidget* w = TQWidget::find( e->xcrossing.window ); + TQWidget* w = TQWidget::tqfind( e->xcrossing.window ); if ( w ) TQWhatsThis::leaveWhatsThisMode(); } @@ -625,9 +625,9 @@ bool Client::windowEvent( XEvent* e ) default: if( e->xany.window == window()) { - if( e->type == Shape::shapeEvent() ) + if( e->type == Shape::tqshapeEvent() ) { - is_shape = Shape::hasShape( window()); // workaround for #19644 + is_tqshape = Shape::hasShape( window()); // workaround for #19644 updateShape(); } } @@ -923,9 +923,9 @@ void Client::leaveNotifyEvent( XCrossingEvent* e ) if ( !buttonDown ) { mode = PositionCenter; - setCursor( arrowCursor ); + setCursor( tqarrowCursor ); } - bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) ); + bool lostMouse = !rect().tqcontains( 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 @@ -1043,7 +1043,7 @@ void Client::updateMouseGrab() } } -int qtToX11Button( Qt::ButtonState button ) +int qtToX11Button( TQt::ButtonState button ) { if( button == Qt::LeftButton ) return Button1; @@ -1054,7 +1054,7 @@ int qtToX11Button( Qt::ButtonState button ) return AnyButton; } -int qtToX11State( Qt::ButtonState state ) +int qtToX11State( TQt::ButtonState state ) { int ret = 0; if( state & Qt::LeftButton ) @@ -1063,13 +1063,13 @@ int qtToX11State( Qt::ButtonState state ) ret |= Button2Mask; if( state & Qt::RightButton ) ret |= Button3Mask; - if( state & Qt::ShiftButton ) + if( state & TQt::ShiftButton ) ret |= ShiftMask; - if( state & Qt::ControlButton ) + if( state & TQt::ControlButton ) ret |= ControlMask; - if( state & Qt::AltButton ) + if( state & TQt::AltButton ) ret |= KKeyNative::modX(KKey::ALT); - if( state & Qt::MetaButton ) + if( state & TQt::MetaButton ) ret |= KKeyNative::modX(KKey::WIN); return ret; } @@ -1078,7 +1078,7 @@ int qtToX11State( Qt::ButtonState state ) // for the decoration window cannot be (easily) intercepted as X11 events bool Client::eventFilter( TQObject* o, TQEvent* e ) { - if (o == shadowWidget) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(shadowWidget)) { if (e->type() == TQEvent::MouseButtonRelease) { @@ -1290,29 +1290,29 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) } } if( decoration == NULL - || o != decoration->widget()) + || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(decoration->widget())) return false; if( e->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent* ev = static_cast< TQMouseEvent* >( e ); + TQMouseEvent* ev = TQT_TQMOUSEEVENT( e ); return buttonPressEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); } if( e->type() == TQEvent::MouseButtonRelease ) { - TQMouseEvent* ev = static_cast< TQMouseEvent* >( e ); + TQMouseEvent* ev = TQT_TQMOUSEEVENT( e ); return buttonReleaseEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); } if( e->type() == TQEvent::MouseMove ) // FRAME i fake z enter/leave? { - TQMouseEvent* ev = static_cast< TQMouseEvent* >( e ); + TQMouseEvent* ev = TQT_TQMOUSEEVENT( e ); return motionNotifyEvent( decorationId(), qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); } if( e->type() == TQEvent::Wheel ) { - TQWheelEvent* ev = static_cast< TQWheelEvent* >( e ); + TQWheelEvent* ev = TQT_TQWHEELEVENT( e ); bool r = buttonPressEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); r = r || buttonReleaseEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()), @@ -1321,7 +1321,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) } if( e->type() == TQEvent::Resize ) { - TQResizeEvent* ev = static_cast< TQResizeEvent* >( e ); + TQResizeEvent* ev = TQT_TQRESIZEEVENT( e ); // Filter out resize events that inform about size different than frame size. // This will ensure that decoration->width() etc. and decoration->widget()->width() will be in sync. // These events only seem to be delayed events from initial resizing before show() was called @@ -1479,13 +1479,13 @@ void Client::processMousePressEvent( TQMouseEvent* e ) int button; switch( e->button()) { - case LeftButton: + case Qt::LeftButton: button = Button1; break; - case MidButton: + case Qt::MidButton: button = Button2; break; - case RightButton: + case Qt::RightButton: button = Button3; break; default: diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp index 3fd278360..e69b630a2 100644 --- a/kwin/geometry.cpp +++ b/kwin/geometry.cpp @@ -87,7 +87,7 @@ void Workspace::updateClientArea( bool force ) TQDesktopWidget *desktopwidget = KApplication::desktop(); int nscreens = desktopwidget -> numScreens (); // kdDebug () << "screens: " << nscreens << endl; - TQRect* new_wareas = new QRect[ numberOfDesktops() + 1 ]; + TQRect* new_wareas = new TQRect[ numberOfDesktops() + 1 ]; TQRect** new_sareas = new TQRect*[ numberOfDesktops() + 1]; TQRect* screens = new TQRect [ nscreens ]; TQRect desktopArea = desktopwidget -> geometry (); @@ -728,7 +728,7 @@ void Client::keepInArea( TQRect area, bool partial ) move( area.right() - width(), y() ); if ( geometry().bottom() > area.bottom() && height() < area.height() ) move( x(), area.bottom() - height() ); - if( !area.contains( geometry().topLeft() )) + if( !area.tqcontains( geometry().topLeft() )) { int tx = x(); int ty = y(); @@ -1122,7 +1122,7 @@ TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool nofra TQSize max_size = maxSize(); if( decoration != NULL ) { - TQSize decominsize = decoration->minimumSize(); + TQSize decominsize = decoration->tqminimumSize(); TQSize border_size( border_left + border_right, border_top + border_bottom ); if( border_size.width() > decominsize.width()) // just in case decominsize.setWidth( border_size.width()); @@ -1348,10 +1348,10 @@ void Client::getWmNormalHints() // 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.contains( orig_geometry )) + if( area.tqcontains( orig_geometry )) keepInArea( area ); area = workspace()->clientArea( WorkArea, this ); - if( area.contains( orig_geometry )) + if( area.tqcontains( orig_geometry )) keepInArea( area ); } } @@ -1502,7 +1502,7 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i updateFullScreenHack( TQRect( new_pos, TQSize( nw, nh ))); TQRect area = workspace()->clientArea( WorkArea, this ); if( !from_tool && ( !isSpecialWindow() || isToolbar()) && !isFullScreen() - && area.contains( orig_geometry )) + && area.tqcontains( orig_geometry )) keepInArea( area ); // this is part of the kicker-xinerama-hack... it should be @@ -1539,10 +1539,10 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i // 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.contains( orig_geometry )) + if( area.tqcontains( orig_geometry )) keepInArea( area ); area = workspace()->clientArea( WorkArea, this ); - if( area.contains( orig_geometry )) + if( area.tqcontains( orig_geometry )) keepInArea( area ); } } @@ -2248,7 +2248,7 @@ void Client::doDrawbound( const TQRect& geom, bool clear ) return; // done by decoration TQPainter p ( workspace()->desktopWidget() ); p.setPen( TQPen( Qt::white, 5 ) ); - p.setRasterOp( Qt::XorROP ); + p.setRasterOp( TQt::XorROP ); // the line is 5 pixel thick, so compensate for the extra two pixels // on outside (#88657) TQRect g = geom; @@ -2296,7 +2296,7 @@ class EatAllPaintEvents { protected: virtual bool eventFilter( TQObject* o, TQEvent* e ) - { return e->type() == TQEvent::Paint && o != geometryTip; } + { return e->type() == TQEvent::Paint && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(geometryTip); } }; static EatAllPaintEvents* eater = 0; @@ -2637,7 +2637,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root ) ( isResize() ? options->resizeMode : options->moveMode ) == Options::Transparent ) { clearbound(); // it's necessary to move the geometry tip when there's no outline - positionGeometryTip(); // shown, otherwise it would cause repaint problems in case + positionGeometryTip(); // shown, otherwise it would cause tqrepaint problems in case drawbound( moveResizeGeom ); // they overlap; the paint event will come after this, } // so the geometry tip will be painted above the outline } diff --git a/kwin/geometrytip.cpp b/kwin/geometrytip.cpp index 8577abfbc..e0d1b865c 100644 --- a/kwin/geometrytip.cpp +++ b/kwin/geometrytip.cpp @@ -20,8 +20,8 @@ GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ): setIndent(0); setLineWidth(1); setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel ); - setAlignment( AlignCenter | AlignTop ); - sizeHints = xSizeHints; + tqsetAlignment( AlignCenter | AlignTop ); + tqsizeHints = 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 (sizeHints) + if (tqsizeHints) { - if (sizeHints->flags & PResizeInc) + if (tqsizeHints->flags & PResizeInc) { - w = ( w - sizeHints->base_width ) / sizeHints->width_inc; - h = ( h - sizeHints->base_height ) / sizeHints->height_inc; + w = ( w - tqsizeHints->base_width ) / tqsizeHints->width_inc; + h = ( h - tqsizeHints->base_height ) / tqsizeHints->height_inc; } } diff --git a/kwin/geometrytip.h b/kwin/geometrytip.h index 6dac49f2f..8e8dc531a 100644 --- a/kwin/geometrytip.h +++ b/kwin/geometrytip.h @@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms. namespace KWinInternal { -class GeometryTip: public QLabel +class GeometryTip: public TQLabel { Q_OBJECT public: @@ -26,7 +26,7 @@ class GeometryTip: public QLabel void setGeometry( const TQRect& geom ); private: - const XSizeHints* sizeHints; + const XSizeHints* tqsizeHints; }; } // namespace diff --git a/kwin/group.cpp b/kwin/group.cpp index 0d543dc4a..e4fd46e2a 100644 --- a/kwin/group.cpp +++ b/kwin/group.cpp @@ -64,7 +64,7 @@ bool performTransiencyCheck() kdDebug() << "TC: " << *it1 << " in not in a group" << endl; ret = false; } - else if( !(*it1)->in_group->members().contains( *it1 )) + else if( !(*it1)->in_group->members().tqcontains( *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.contains( *it2 ) - && !Workspace::self()->desktops.contains( *it2 )) + && !Workspace::self()->clients.tqcontains( *it2 ) + && !Workspace::self()->desktops.tqcontains( *it2 )) { kdDebug() << "TC:" << *it1 << " has non-existent main client " << endl; kdDebug() << "TC2:" << *it2 << endl; // this may crash ret = false; continue; } - if( !(*it2)->transients_list.contains( *it1 )) + if( !(*it2)->transients_list.tqcontains( *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.contains( *it2 ) - && !Workspace::self()->desktops.contains( *it2 )) + && !Workspace::self()->clients.tqcontains( *it2 ) + && !Workspace::self()->desktops.tqcontains( *it2 )) { kdDebug() << "TC:" << *it1 << " has non-existent transient " << endl; kdDebug() << "TC2:" << *it2 << endl; // this may crash ret = false; continue; } - if( !(*it2)->mainClients().contains( *it1 )) + if( !(*it2)->mainClients().tqcontains( *it1 )) { kdDebug() << "TC:" << *it1 << " has transient " << *it2 << " but transient does not have it as a main client" << 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.contains( member_P )); + Q_ASSERT( _members.tqcontains( 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.contains( leader_client )); + assert( !_members.tqcontains( 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( qstrncmp( c1->resourceClass(), "xv", 2 ) == 0 && c1->resourceName() == "xv" ) - return qstrncmp( c2->resourceClass(), "xv", 2 ) == 0 && c2->resourceName() == "xv"; + if( tqstrncmp( c1->resourceClass(), "xv", 2 ) == 0 && c1->resourceName() == "xv" ) + return tqstrncmp( 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"; @@ -512,8 +512,8 @@ bool Client::sameAppWindowRoleMatch( const Client* c1, const Client* c2, bool ac || c1->group()->leaderClient() == c1 || c2->group()->leaderClient() == c2; #endif } - int pos1 = c1->windowRole().find( '#' ); - int pos2 = c2->windowRole().find( '#' ); + int pos1 = c1->windowRole().tqfind( '#' ); + int pos2 = c2->windowRole().tqfind( '#' ); if(( pos1 >= 0 && pos2 >= 0 ) || // hacks here @@ -835,7 +835,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined ) void Client::addTransient( Client* cl ) { TRANSIENCY_CHECK( this ); - assert( !transients_list.contains( cl )); + assert( !transients_list.tqcontains( 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.contains( cl )) + if( set.tqcontains( 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().contains( const_cast< Client* >( cl ))) + if( transients().tqcontains( const_cast< Client* >( cl ))) return true; if( !indirect ) return false; - if( set.contains( this )) + if( set.tqcontains( 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 5d1d96d85..67f197fd9 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.unicode(); + stream << btn.type.tqunicode(); stream << (int) btn.duplicate; stream << (int) btn.supported; setEncodedData( data ); @@ -123,7 +123,7 @@ TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color) ButtonSource::ButtonSource(TQWidget *parent, const char* name) : KListView(parent, name) { - setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); setResizeMode(TQListView::AllColumns); setDragEnabled(true); @@ -140,19 +140,19 @@ ButtonSource::~ButtonSource() { } -TQSize ButtonSource::sizeHint() const +TQSize ButtonSource::tqsizeHint() const { - // make the sizeHint height a bit smaller than the one of TQListView... + // make the tqsizeHint height a bit smaller than the one of TQListView... if ( cachedSizeHint().isValid() ) return cachedSizeHint(); constPolish(); - TQSize s( header()->sizeHint() ); + TQSize s( header()->tqsizeHint() ); if ( verticalScrollBar()->isVisible() ) - s.setWidth( s.width() + style().pixelMetric(TQStyle::PM_ScrollBarExtent) ); + s.setWidth( s.width() + tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) ); s += TQSize(frameWidth()*2,frameWidth()*2); // size hint: 4 lines of text... @@ -218,7 +218,7 @@ TQDragObject *ButtonSource::dragObject() if (i) { ButtonDrag *bd = new ButtonDrag(i->button(), viewport(), "button_drag"); - bd->setPixmap(bitmapPixmap(i->button().icon, colorGroup().foreground() )); + bd->setPixmap(bitmapPixmap(i->button().icon, tqcolorGroup().foreground() )); return bd; } @@ -306,15 +306,15 @@ void ButtonDropSite::clearRight() void ButtonDropSite::dragMoveEvent( TQDragMoveEvent* e ) { TQPoint p = e->pos(); - if (leftDropArea().contains(p) || rightDropArea().contains(p) || buttonAt(p) ) { + if (leftDropArea().tqcontains(p) || rightDropArea().tqcontains(p) || buttonAt(p) ) { e->accept(); // 2 pixel wide drop visualizer... TQRect r = contentsRect(); int x = -1; - if (leftDropArea().contains(p) ) { + if (leftDropArea().tqcontains(p) ) { x = leftDropArea().left(); - } else if (rightDropArea().contains(p) ) { + } else if (rightDropArea().tqcontains(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().contains(p) ) { + if (leftDropArea().tqcontains(p) ) { buttonList = &buttonsLeft; buttonPosition = buttonsLeft.end(); - } else if (rightDropArea().contains(p) ) { + } else if (rightDropArea().tqcontains(p) ) { buttonList = &buttonsRight; buttonPosition = buttonsRight.begin(); } else { @@ -446,9 +446,9 @@ bool ButtonDropSite::getItemIterator(ButtonDropSiteItem *item, ButtonList* &list if (!item) return false; - ButtonList::iterator it = buttonsLeft.find(item); // try the left list first... + ButtonList::iterator it = buttonsLeft.tqfind(item); // try the left list first... if (it == buttonsLeft.end() ) { - it = buttonsRight.find(item); // try the right list... + it = buttonsRight.tqfind(item); // try the right list... if (it == buttonsRight.end() ) { return false; // item hasn't been found in one of the list, return... } 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, colorGroup().foreground() ) ); + bd->setPixmap(bitmapPixmap(m_selected->button().icon, tqcolorGroup().foreground() ) ); bd->dragMove(); } } @@ -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.contains(p) ) { + if ( (*it)->rect.tqcontains(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.contains(p) ) { + if ( (*it)->rect.tqcontains(p) ) { return *it; } } @@ -572,7 +572,7 @@ bool ButtonDropSite::removeSelectedButton() delete m_selected; m_selected = 0; recalcItemGeometry(); - update(); // repaint... + update(); // tqrepaint... } return succ; @@ -581,9 +581,9 @@ bool ButtonDropSite::removeSelectedButton() void ButtonDropSite::drawButtonList(TQPainter *p, const ButtonList& btns, int offset) { for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) { - TQRect itemRect = (*it)->rect; - if (itemRect.isValid() ) { - (*it)->draw(p, colorGroup(), itemRect); + TQRect tqitemRect = (*it)->rect; + if (tqitemRect.isValid() ) { + (*it)->draw(p, tqcolorGroup(), tqitemRect); } offset += (*it)->width(); } @@ -675,11 +675,11 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name) m_factory(0) { TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); - setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); TQLabel* label = new TQLabel( this ); m_dropSite = new ButtonDropSite( this ); - label->setAlignment( int( TQLabel::WordBreak ) ); + label->tqsetAlignment( int( TQLabel::WordBreak ) ); label->setText( i18n( "To add or remove titlebar buttons, simply <i>drag</i> items " "between the available item list and the titlebar preview. Similarly, " "drag items within the titlebar preview to re-position them.") ); @@ -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.contains(b.type); + b.supported = m_supportedButtons.tqcontains(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.contains('R') ); + return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.tqcontains('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.contains('L') ); + return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.tqcontains('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.contains('B') ); + return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.tqcontains('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.contains('F') ); + return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.tqcontains('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.contains('X') ); + return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.tqcontains('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.contains('A') ); + return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.tqcontains('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.contains('I') ); + return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.tqcontains('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.contains('H') ); + return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.tqcontains('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.contains('S') ); + return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.tqcontains('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.contains('M') ); + return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.tqcontains('M') ); } else if (type == '_') { TQBitmap bmp(spacer_width, spacer_height, spacer_bits, true); bmp.setMask(bmp); - return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.contains('_') ); + return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.tqcontains('_') ); } else { success = false; return Button(); diff --git a/kwin/kcmkwin/kwindecoration/buttons.h b/kwin/kcmkwin/kwindecoration/buttons.h index 0fcbff085..909adfe87 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.h +++ b/kwin/kcmkwin/kwindecoration/buttons.h @@ -57,7 +57,7 @@ class Button bool supported; }; -class ButtonDrag : public QStoredDrag +class ButtonDrag : public TQStoredDrag { public: ButtonDrag( Button btn, TQWidget* parent, const char* name=0 ); @@ -91,7 +91,7 @@ class ButtonDropSiteItem /** * This is plugged into ButtonSource */ -class ButtonSourceItem : public QListViewItem +class ButtonSourceItem : public TQListViewItem { public: ButtonSourceItem(TQListView * parent, const Button& btn); @@ -117,7 +117,7 @@ class ButtonSource : public KListView ButtonSource(TQWidget *parent = 0, const char* name = 0); virtual ~ButtonSource(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void hideAllButtons(); void showAllButtons(); @@ -136,7 +136,7 @@ typedef TQValueList<ButtonDropSiteItem*> ButtonList; /** * This class renders and handles the demo titlebar dropsite */ -class ButtonDropSite: public QFrame +class ButtonDropSite: public TQFrame { Q_OBJECT @@ -189,7 +189,7 @@ class ButtonDropSite: public QFrame ButtonDropSiteItem *m_selected; }; -class ButtonPositionWidget : public QWidget +class ButtonPositionWidget : public TQWidget { Q_OBJECT diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp index 193450086..65c951893 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp @@ -97,7 +97,7 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c pluginLayout->addWidget(decorationList); TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage ); - pluginSettingsGrp->setColumnLayout( 0, Vertical ); + pluginSettingsGrp->setColumnLayout( 0, Qt::Vertical ); pluginSettingsGrp->setFlat( true ); pluginSettingsGrp->layout()->setMargin( 0 ); pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() ); @@ -112,13 +112,13 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." )); lBorder->hide(); cBorder->hide(); - TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() ); + TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->tqlayout() ); borderSizeLayout->addWidget(lBorder); borderSizeLayout->addWidget(cBorder); borderSizeLayout->addStretch(); pluginConfigWidget = new TQVBox(pluginSettingsGrp); - pluginSettingsGrp->layout()->add( pluginConfigWidget ); + pluginSettingsGrp->tqlayout()->add( pluginConfigWidget ); // Page 2 (Button Selector) TQWidget* buttonPage = new TQWidget( tabWidget ); @@ -154,8 +154,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c preview = new KDecorationPreview( this ); previewLayout->addWidget(preview); - preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); - tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + preview->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tabWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); // Page 3 (Window Shadows) TQHBox *inactiveShadowColourHBox, *shadowColourHBox; @@ -374,7 +374,7 @@ void KWinDecorationModule::findDecorations() { TQDir d(*it); if (d.exists()) - for (QFileInfoListIterator it(*d.entryInfoList()); it.current(); ++it) + for (TQFileInfoListIterator it(*d.entryInfoList()); it.current(); ++it) { TQString filename(it.current()->absFilePath()); if (KDesktopFile::isDesktopFile(filename)) @@ -640,7 +640,7 @@ void KWinDecorationModule::readConfig( KConfig* conf ) activeShadowSettings->setEnabled(shadowEnabled); inactiveShadowSettings->setEnabled(shadowEnabled); whichShadowSettings->setEnabled(shadowEnabled); - shadowColourButton->setColor(conf->readColorEntry("ShadowColour", &Qt::black)); + shadowColourButton->setColor(conf->readColorEntry("ShadowColour", &TQt::black)); shadowOpacitySlider->setValue((int)ceil(conf->readDoubleNumEntry("ShadowOpacity", 0.70) * 100)); shadowXOffsetSpinBox->setValue(conf->readNumEntry("ShadowXOffset", 0)); shadowYOffsetSpinBox->setValue(conf->readNumEntry("ShadowYOffset", 10)); @@ -649,7 +649,7 @@ void KWinDecorationModule::readConfig( KConfig* conf ) cbShadowTopMenus->setChecked(conf->readBoolEntry("ShadowTopMenus", false)); shadowThicknessSpinBox->setValue(conf->readNumEntry("ShadowThickness", 10)); cbInactiveShadow->setChecked(conf->readBoolEntry("InactiveShadowEnabled", false)); - inactiveShadowColourButton->setColor(conf->readColorEntry("InactiveShadowColour", &Qt::black)); + inactiveShadowColourButton->setColor(conf->readColorEntry("InactiveShadowColour", &TQt::black)); inactiveShadowOpacitySlider->setValue((int)ceil(conf->readDoubleNumEntry("InactiveShadowOpacity", 0.70) * 100)); inactiveShadowXOffsetSpinBox->setValue(conf->readNumEntry("InactiveShadowXOffset", 0)); inactiveShadowYOffsetSpinBox->setValue(conf->readNumEntry("InactiveShadowYOffset", 5)); diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp index c9a0174f4..ea894ecbc 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->setAlignment( AlignCenter ); + no_preview->tqsetAlignment( AlignCenter ); setMinimumSize( 100, 100 ); no_preview->resize( size()); @@ -127,15 +127,15 @@ void KDecorationPreview::positionPreviews() // Resize the active window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Active]->minimumSize() ); + .expandedTo( deco[Active]->tqminimumSize() ); geometry = TQRect( TQPoint( 0, titleBarHeight ), size ); - deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); + deco[Active]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) ); // Resize the inactive window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Inactive]->minimumSize() ); + .expandedTo( deco[Inactive]->tqminimumSize() ); geometry = TQRect( TQPoint( xoffset, 0 ), size ); - deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); + deco[Inactive]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) ); } void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active ) @@ -150,7 +150,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act } else { - TQMemArray< TQRect > rects = reg.rects(); + TQMemArray< TQRect > rects = reg.tqrects(); XRectangle* xrects = new XRectangle[ rects.count() ]; for( unsigned int i = 0; i < rects.count(); @@ -166,7 +166,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act delete[] xrects; } if( active ) - mask = reg; // keep shape of the active window for unobscuredRegion() + mask = reg; // keep tqshape of the active window for unobscuredRegion() } TQRect KDecorationPreview::windowGeometry( bool active ) const diff --git a/kwin/kcmkwin/kwindecoration/preview.h b/kwin/kcmkwin/kwindecoration/preview.h index 5604df587..2a753db69 100644 --- a/kwin/kcmkwin/kwindecoration/preview.h +++ b/kwin/kcmkwin/kwindecoration/preview.h @@ -30,7 +30,7 @@ class KDecorationPreviewBridge; class KDecorationPreviewOptions; class KDecorationPreview - : public QWidget + : public TQWidget { Q_OBJECT public: diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp index ac19a5d30..8c8a283f2 100644 --- a/kwin/kcmkwin/kwinoptions/main.cpp +++ b/kwin/kcmkwin/kwinoptions/main.cpp @@ -171,7 +171,7 @@ void KWinOptions::save() mConfig->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } @@ -244,7 +244,7 @@ void KActionsOptions::save() mConfig->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } diff --git a/kwin/kcmkwin/kwinoptions/mouse.cpp b/kwin/kcmkwin/kwinoptions/mouse.cpp index 6adba1f89..30c18383c 100644 --- a/kwin/kcmkwin/kwinoptions/mouse.cpp +++ b/kwin/kcmkwin/kwinoptions/mouse.cpp @@ -163,7 +163,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf combo->insertItem(i18n("Lower")); combo->insertItem(i18n("On All Desktops")); combo->insertItem(i18n("Nothing")); - combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hlayout->addWidget(combo); coTiDbl = combo; @@ -188,7 +188,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf comboW->insertItem(i18n("Move to Previous/Next Desktop")); comboW->insertItem(i18n("Change Opacity")); comboW->insertItem(i18n("Nothing")); - comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + comboW->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hlayoutW->addWidget(comboW); coTiAct4 = comboW; @@ -219,8 +219,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf if ( leftHandedMouse ) { - qSwap(strMouseButton1, strMouseButton3); - qSwap(txtButton1, txtButton3); + tqSwap(strMouseButton1, strMouseButton3); + tqSwap(txtButton1, txtButton3); } label = new TQLabel(strMouseButton1, grid); @@ -235,7 +235,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf label = new TQLabel(i18n("Active"), grid); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an active window.") ); @@ -256,7 +256,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf "<em>active</em> window."); // Be nice to left handed users - if ( leftHandedMouse ) qSwap(txtButton1, txtButton3); + if ( leftHandedMouse ) tqSwap(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 ) qSwap(txtButton1, txtButton3); + if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3); label = new TQLabel(i18n("Inactive"), grid); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an inactive window.") ); @@ -345,8 +345,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf if ( leftHandedMouse ) // Be nice to lefties { - qSwap(strMouseButton[0], strMouseButton[2]); - qSwap(txtButton[0], txtButton[2]); + tqSwap(strMouseButton[0], strMouseButton[2]); + tqSwap(txtButton[0], txtButton[2]); } createMaxButtonPixmaps(); @@ -356,14 +356,14 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf TQLabel * label = new TQLabel(strMouseButton[b], box); TQWhatsThis::add( label, txtButton[b] ); - label ->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + label ->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); coMax[b] = new ToolTipComboBox(box, tbl_Max); for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]); connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed())); TQWhatsThis::add( coMax[b], txtButton[b] ); - coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + coMax[b]->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); } connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); @@ -565,7 +565,7 @@ void KTitleBarActionsConfig::save() config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } } @@ -618,8 +618,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, if ( leftHandedMouse ) { - qSwap(strMouseButton1, strMouseButton3); - qSwap(txtButton1, txtButton3); + tqSwap(strMouseButton1, strMouseButton3); + tqSwap(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 ) qSwap(strWin1, strWin3); + if ( leftHandedMouse ) tqSwap(strWin1, strWin3); label = new TQLabel(strMouseButton1, grid); TQWhatsThis::add( label, strWin1 ); @@ -696,8 +696,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, if ( leftHandedMouse ) { - qSwap(strMouseButton1, strMouseButton3); - qSwap(strAll1, strAll3); + tqSwap(strMouseButton1, strMouseButton3); + tqSwap(strAll1, strAll3); } label = new TQLabel(strMouseButton1, grid); @@ -839,7 +839,7 @@ void KWindowActionsConfig::save() config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } } diff --git a/kwin/kcmkwin/kwinoptions/mouse.h b/kwin/kcmkwin/kwinoptions/mouse.h index b28437511..49591e5d8 100644 --- a/kwin/kcmkwin/kwinoptions/mouse.h +++ b/kwin/kcmkwin/kwinoptions/mouse.h @@ -30,7 +30,7 @@ class KConfig; #include <tqtooltip.h> -class ToolTipComboBox: public QComboBox +class ToolTipComboBox: public TQComboBox { Q_OBJECT diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp index cc8643af9..0f5939c6e 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->setAlignment(AlignTop|AlignHCenter); + //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -124,7 +124,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren fcsBox = new TQButtonGroup(i18n("Focus"),this); fcsBox->setColumnLayout( 0, Qt::Horizontal ); - TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(), + TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->tqlayout(), KDialog::spacingHint()); TQBoxLayout *cLay = new TQHBoxLayout(fLay); @@ -192,8 +192,8 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool))); fLay->addWidget(clickRaiseOn); -// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(), -// clickRaiseOn->sizeHint().width()) + 15); +// fLay->addColSpacing(0,QMAX(autoRaiseOn->tqsizeHint().width(), +// clickRaiseOn->tqsizeHint().width()) + 15); TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically" " come to the front when the mouse pointer has been over it for some time.") ); @@ -236,7 +236,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren kbdBox = new TQButtonGroup(i18n("Navigation"), this); kbdBox->setColumnLayout( 0, Qt::Horizontal ); - TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint()); + TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->tqlayout(), KDialog::spacingHint()); altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox ); kLay->addWidget( altTabPopup ); @@ -535,7 +535,7 @@ void KFocusConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } @@ -573,7 +573,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget * //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->setAlignment(AlignTop|AlignHCenter); + //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -762,7 +762,7 @@ void KAdvancedConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } @@ -831,7 +831,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare windowsBox = new TQButtonGroup(i18n("Windows"), this); windowsBox->setColumnLayout( 0, Qt::Horizontal ); - TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint()); + TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->tqlayout(), KDialog::spacingHint()); TQBoxLayout *bLay = new TQVBoxLayout; wLay->addLayout(bLay); @@ -856,7 +856,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare " its size.")); TQGridLayout *rLay = new TQGridLayout(2,3); - bLay->addLayout(rLay); + bLay->addLayout(TQT_TQLAYOUT(rLay)); rLay->setColStretch(0,0); rLay->setColStretch(1,1); @@ -866,7 +866,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare " windows are minimized or restored." ) ); rLay->addWidget(minimizeAnimOn,0,0); - minimizeAnimSlider = new TQSlider(0,10,10,0,TQSlider::Horizontal, windowsBox); + minimizeAnimSlider = new TQSlider(0,10,10,0,Qt::Horizontal, windowsBox); minimizeAnimSlider->setSteps(1, 1); // TQSlider::Below clashes with a X11/X.h #define #undef Below @@ -877,11 +877,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int))); minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox); - minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft); + minimizeAnimSlowLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignLeft); rLay->addWidget(minimizeAnimSlowLabel,1,1); minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox); - minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight); + minimizeAnimFastLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignRight); rLay->addWidget(minimizeAnimFastLabel,1,2); wtstr = i18n("Here you can set the speed of the animation shown when windows are" @@ -940,7 +940,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->setAlignment(AlignTop|AlignHCenter); + //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -1114,7 +1114,7 @@ void KMovingConfig::load( void ) //CT 13mar98 interactive placement // if( key.left(11) == "interactive") { // setPlacement(INTERACTIVE_PLACEMENT); -// int comma_pos = key.find(','); +// int comma_pos = key.tqfind(','); // if (comma_pos < 0) // interactiveTrigger->setValue(0); // else @@ -1219,7 +1219,7 @@ void KMovingConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } @@ -1614,7 +1614,7 @@ void KTranslucencyConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp index 1a497c8bc..c30ae24ff 100644 --- a/kwin/kcmkwin/kwinrules/detectwidget.cpp +++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp @@ -161,22 +161,22 @@ void DetectDialog::selectWindow() // use a dialog, so that all user input is blocked // use WX11BypassWM and moving away so that it's not actually visible // grab only mouse, so that keyboard can be used e.g. for switching windows - grabber = new TQDialog( NULL, NULL, true, WX11BypassWM ); + grabber = new TQDialog( NULL, NULL, true, (WFlags)WX11BypassWM ); grabber->move( -1000, -1000 ); grabber->show(); - grabber->grabMouse( crossCursor ); + grabber->grabMouse( tqcrossCursor ); grabber->installEventFilter( this ); } bool DetectDialog::eventFilter( TQObject* o, TQEvent* e ) { - if( o != grabber ) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(grabber) ) return false; if( e->type() != TQEvent::MouseButtonRelease ) return false; delete grabber; grabber = NULL; - if( static_cast< TQMouseEvent* >( e )->button() != LeftButton ) + if( TQT_TQMOUSEEVENT( e )->button() != Qt::LeftButton ) { emit detectionDone( false ); return true; diff --git a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui index 31cae3ef3..af4ca9670 100644 --- a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui +++ b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KWinInternal::DetectWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form3</cstring> </property> @@ -29,14 +29,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -44,7 +44,7 @@ <string>Extra role:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -52,7 +52,7 @@ <string>Class:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -60,7 +60,7 @@ <string>Role:</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>type_label</cstring> </property> @@ -68,7 +68,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -76,7 +76,7 @@ <string>Title:</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>class_label</cstring> </property> @@ -84,7 +84,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>role_label</cstring> </property> @@ -92,7 +92,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>title_label</cstring> </property> @@ -100,7 +100,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="7" column="1"> + <widget class="TQLabel" row="7" column="1"> <property name="name"> <cstring>machine_label</cstring> </property> @@ -108,7 +108,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -116,7 +116,7 @@ <string>Type:</string> </property> </widget> - <widget class="QLabel" row="6" column="1"> + <widget class="TQLabel" row="6" column="1"> <property name="name"> <cstring>extrarole_label</cstring> </property> @@ -124,7 +124,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>textLabel13</cstring> </property> @@ -146,7 +146,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -154,7 +154,7 @@ <string>Information About Selected Window</string> </property> </widget> - <widget class="QButtonGroup" row="8" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="8" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -165,7 +165,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>use_class</cstring> </property> @@ -179,7 +179,7 @@ <string>For selecting all windows belonging to a specific application, selecting only window class should usually work.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>use_role</cstring> </property> @@ -190,7 +190,7 @@ <string>For selecting a specific window in an application, both window class and window role should be selected. Window class will determine the application, and window role the specific window in the application; many applications do not provide useful window roles though.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>use_whole_class</cstring> </property> @@ -201,7 +201,7 @@ <string>With some (non-KDE) applications whole window class can be sufficient for selecting a specific window in an application, as they set whole window class to contain both application and window role.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>match_title</cstring> </property> diff --git a/kwin/kcmkwin/kwinrules/editshortcutbase.ui b/kwin/kcmkwin/kwinrules/editshortcutbase.ui index 3813ae589..7f03bb946 100644 --- a/kwin/kcmkwin/kwinrules/editshortcutbase.ui +++ b/kwin/kcmkwin/kwinrules/editshortcutbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EditShortcutBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EditShortcutBase</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -48,7 +48,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <cstring>shortcut</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -66,14 +66,14 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton1</cstring> </property> @@ -91,14 +91,14 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton2</cstring> </property> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp index 19b714311..90802c41d 100644 --- a/kwin/kcmkwin/kwinrules/kcm.cpp +++ b/kwin/kcmkwin/kwinrules/kcm.cpp @@ -44,7 +44,7 @@ KCMRules::KCMRules( TQWidget *parent, const char *name ) { TQVBoxLayout *layout = new TQVBoxLayout( this ); widget = new KCMRulesList( this ); - layout->addWidget( widget ); + layout->addWidget( TQT_TQWIDGET(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" ), @@ -68,7 +68,7 @@ void KCMRules::save() config.sync(); if( !kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } void KCMRules::defaults() diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp index b58c96239..1663d88af 100644 --- a/kwin/kcmkwin/kwinrules/main.cpp +++ b/kwin/kcmkwin/kwinrules/main.cpp @@ -151,7 +151,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who Rules* ret = new Rules; if( whole_app ) { - ret->description = i18n( "Application settings for %1" ).arg( wmclass_class ); + ret->description = i18n( "Application settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) ); // TODO maybe exclude some types? If yes, then also exclude them above // when searching. ret->types = NET::AllTypesMask; @@ -175,7 +175,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who } return ret; } - ret->description = i18n( "Window settings for %1" ).arg( wmclass_class ); + ret->description = i18n( "Window settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) ); if( type == NET::Unknown ) ret->types = NET::NormalMask; else @@ -248,7 +248,7 @@ static int edit( Window wid, bool whole_app ) } else if( edited_rule != orig_rule ) { - TQValueList< Rules* >::Iterator pos = rules.find( orig_rule ); + TQValueList< Rules* >::Iterator pos = rules.tqfind( orig_rule ); if( pos != rules.end()) *pos = edited_rule; else @@ -258,7 +258,7 @@ static int edit( Window wid, bool whole_app ) saveRules( rules ); if( !kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); return 0; } diff --git a/kwin/kcmkwin/kwinrules/ruleslistbase.ui b/kwin/kcmkwin/kwinrules/ruleslistbase.ui index c2abdaa9d..5fc5fd6ed 100644 --- a/kwin/kcmkwin/kwinrules/ruleslistbase.ui +++ b/kwin/kcmkwin/kwinrules/ruleslistbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KWinInternal::KCMRulesListBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>294</height> diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp index 2525644d9..7a82a8149 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp +++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp @@ -661,7 +661,7 @@ bool RulesWidget::finalCheck() all_types = false; if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types ) { - if( KMessageBox::warningContinueCancel( topLevelWidget(), + if( KMessageBox::warningContinueCancel( tqtopLevelWidget(), i18n( "You have specified the window class as unimportant.\n" "This means the settings will possibly apply to windows from all applications. " "If you really want to create a generic setting, it is recommended you at least " @@ -680,7 +680,7 @@ void RulesWidget::prepareWindowSpecific( WId window ) void RulesWidget::shortcutEditClicked() { - EditShortcutDialog dlg( topLevelWidget()); + EditShortcutDialog dlg( tqtopLevelWidget()); dlg.setShortcut( shortcut->text()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut()); @@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name ) void EditShortcut::editShortcut() { - ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget()); + ShortcutDialog dlg( KShortcut( shortcut->text()), tqtopLevelWidget()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut().toString()); } diff --git a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui index 01c1b9918..dbcdbb374 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui +++ b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KWinInternal::RulesWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form2</cstring> </property> @@ -19,11 +19,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabs</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -50,7 +50,7 @@ <cstring>description</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -61,7 +61,7 @@ <cstring>wmclass</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>212</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>211</width> <height>20</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>212</width> <height>20</height> @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>211</width> <height>20</height> @@ -242,7 +242,7 @@ <cstring>wmclass</cstring> </property> </widget> - <widget class="QCheckBox" row="3" column="4"> + <widget class="TQCheckBox" row="3" column="4"> <property name="name"> <cstring>whole_wmclass</cstring> </property> @@ -250,7 +250,7 @@ <string>Match w&hole window class</string> </property> </widget> - <widget class="QGroupBox" row="8" column="0" rowspan="1" colspan="5"> + <widget class="TQGroupBox" row="8" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>270</width> <height>20</height> @@ -296,7 +296,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>269</width> <height>20</height> @@ -307,7 +307,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -318,7 +318,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -387,7 +387,7 @@ <enum>Multi</enum> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -403,7 +403,7 @@ <cstring>title</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -419,7 +419,7 @@ <cstring>extra</cstring> </property> </widget> - <widget class="QLabel" row="8" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -470,7 +470,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -501,7 +501,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -543,7 +543,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -574,7 +574,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -616,7 +616,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -647,7 +647,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -656,7 +656,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -716,7 +716,7 @@ <string>0123456789-+,xX:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>enable_size</cstring> </property> @@ -724,7 +724,7 @@ <string>&Size</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>enable_position</cstring> </property> @@ -781,7 +781,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>maximizevert</cstring> </property> @@ -830,7 +830,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="4" column="2"> + <widget class="TQCheckBox" row="4" column="2"> <property name="name"> <cstring>fullscreen</cstring> </property> @@ -841,7 +841,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>enable_maximizehoriz</cstring> </property> @@ -849,7 +849,7 @@ <string>Maximized &horizontally</string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>maximizehoriz</cstring> </property> @@ -898,7 +898,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>enable_fullscreen</cstring> </property> @@ -944,7 +944,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>enable_maximizevert</cstring> </property> @@ -998,7 +998,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>enable_desktop</cstring> </property> @@ -1006,7 +1006,7 @@ <string>&Desktop</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>enable_shade</cstring> </property> @@ -1014,7 +1014,7 @@ <string>Sh&aded</string> </property> </widget> - <widget class="QCheckBox" row="7" column="2"> + <widget class="TQCheckBox" row="7" column="2"> <property name="name"> <cstring>shade</cstring> </property> @@ -1063,7 +1063,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="6" column="2"> + <widget class="TQCheckBox" row="6" column="2"> <property name="name"> <cstring>minimize</cstring> </property> @@ -1074,7 +1074,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>enable_minimize</cstring> </property> @@ -1163,7 +1163,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="8" column="0"> + <widget class="TQCheckBox" row="8" column="0"> <property name="name"> <cstring>enable_placement</cstring> </property> @@ -1181,7 +1181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -1228,7 +1228,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1239,7 +1239,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>enable_above</cstring> </property> @@ -1247,7 +1247,7 @@ <string>Keep &above</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>enable_below</cstring> </property> @@ -1255,7 +1255,7 @@ <string>Keep &below</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>enable_skippager</cstring> </property> @@ -1263,7 +1263,7 @@ <string>Skip pa&ger</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>enable_skiptaskbar</cstring> </property> @@ -1271,7 +1271,7 @@ <string>Skip &taskbar</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>enable_noborder</cstring> </property> @@ -1279,7 +1279,7 @@ <string>&No border</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>enable_acceptfocus</cstring> </property> @@ -1287,7 +1287,7 @@ <string>Accept &focus</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>enable_closeable</cstring> </property> @@ -1295,7 +1295,7 @@ <string>&Closeable</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>enable_opacityactive</cstring> </property> @@ -1347,7 +1347,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>171</width> <height>20</height> @@ -1364,7 +1364,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1381,7 +1381,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1398,7 +1398,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1415,7 +1415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1432,7 +1432,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1449,7 +1449,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1466,14 +1466,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>above</cstring> </property> @@ -1484,7 +1484,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>below</cstring> </property> @@ -1495,7 +1495,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>noborder</cstring> </property> @@ -1506,7 +1506,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>skiptaskbar</cstring> </property> @@ -1517,7 +1517,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="4" column="2"> + <widget class="TQCheckBox" row="4" column="2"> <property name="name"> <cstring>skippager</cstring> </property> @@ -1528,7 +1528,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="5" column="2"> + <widget class="TQCheckBox" row="5" column="2"> <property name="name"> <cstring>acceptfocus</cstring> </property> @@ -1539,7 +1539,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="6" column="2"> + <widget class="TQCheckBox" row="6" column="2"> <property name="name"> <cstring>closeable</cstring> </property> @@ -1796,7 +1796,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -1847,14 +1847,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>181</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="8" column="0"> + <widget class="TQCheckBox" row="8" column="0"> <property name="name"> <cstring>enable_opacityinactive</cstring> </property> @@ -1862,7 +1862,7 @@ <string>I&nactive opacity in %</string> </property> </widget> - <widget class="QCheckBox" row="9" column="0"> + <widget class="TQCheckBox" row="9" column="0"> <property name="name"> <cstring>enable_shortcut</cstring> </property> @@ -1911,7 +1911,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton" row="9" column="5"> + <widget class="TQPushButton" row="9" column="5"> <property name="name"> <cstring>shortcut_edit</cstring> </property> @@ -1929,7 +1929,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1940,7 +1940,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>enable_fsplevel</cstring> </property> @@ -2047,7 +2047,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>enable_type</cstring> </property> @@ -2055,7 +2055,7 @@ <string>Window &type</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>enable_moveresizemode</cstring> </property> @@ -2153,7 +2153,7 @@ <string>0123456789-+,xX:</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>enable_minsize</cstring> </property> @@ -2184,7 +2184,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>enable_maxsize</cstring> </property> @@ -2226,7 +2226,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>enable_ignoreposition</cstring> </property> @@ -2257,7 +2257,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="3"> + <widget class="TQCheckBox" row="3" column="3"> <property name="name"> <cstring>ignoreposition</cstring> </property> @@ -2278,14 +2278,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>160</height> </size> </property> </spacer> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>enable_strictgeometry</cstring> </property> @@ -2319,7 +2319,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="6" column="3"> + <widget class="TQCheckBox" row="6" column="3"> <property name="name"> <cstring>strictgeometry</cstring> </property> @@ -2330,7 +2330,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="7" column="3"> + <widget class="TQCheckBox" row="7" column="3"> <property name="name"> <cstring>disableglobalshortcuts</cstring> </property> @@ -2341,7 +2341,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>enable_disableglobalshortcuts</cstring> </property> diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp index ae31fc3e0..d348e48ff 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::fromLatin1( args->getOption( "applicationname" )); + TQString appname = TQString::tqfromLatin1( args->getOption( "applicationname" )); bool id_ok = false; Window id = args->getOption( "wid" ).toULong( &id_ok ); bool time_ok = false; @@ -71,7 +71,7 @@ int main( int argc, char* argv[] ) "<qt>Window with title \"<b>%2</b>\" is not responding. " "This window belongs to application <b>%1</b> (PID=%3, hostname=%4).<p>" "Do you wish to terminate this application? (All unsaved data in this application will be lost.)</qt>" ) - .arg( appname ).arg( caption ).arg( pid ).arg( hostname ); + .tqarg( appname ).tqarg( caption ).tqarg( pid ).tqarg( static_cast<const char *>(hostname) ); app.updateUserTimestamp( timestamp ); if( KMessageBox::warningYesNoWId( id, question, TQString::null, i18n("Terminate"), i18n("Keep Running") ) == KMessageBox::Yes ) { diff --git a/kwin/kompmgr/kompmgr.c b/kwin/kompmgr/kompmgr.c index 713752ee1..f65586be4 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 shaped*/ + Bool shapable; /* this will allow window managers to exclude windows if just the deco is tqshaped*/ unsigned int decoHash; Picture dimPicture; @@ -151,7 +151,7 @@ Bool synchronize; int composite_opcode; Bool disable_argb = False; -int shapeEvent; +int tqshapeEvent; /* 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_shape(Display *dpy, win *w, XRectangle *shape_damage) +damage_tqshape(Display *dpy, win *w, XRectangle *tqshape_damage) { set_ignore (dpy, NextRequest (dpy)); - XserverRegion region = XFixesCreateRegion (dpy, shape_damage, 1); + XserverRegion region = XFixesCreateRegion (dpy, tqshape_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, &shapeEvent, &dummy); + XShapeQueryExtension(dpy, &tqshapeEvent, &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 == shapeEvent) + else if (ev.type == tqshapeEvent) { 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_shape(dpy, w, &rect); + damage_tqshape(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 shaped shadows) + shaping support isn't that good so far (e.g. we lack tqshaped 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 fcb6d8383..3151b22e5 100644 --- a/kwin/layers.cpp +++ b/kwin/layers.cpp @@ -89,7 +89,7 @@ void Workspace::updateClientLayer( Client* c ) if( c->layer() == c->belongsToLayer()) return; StackingUpdatesBlocker blocker( this ); - c->invalidateLayer(); // invalidate, will be updated when doing restacking + c->tqinvalidateLayer(); // tqinvalidate, 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.contains( most_recently_raised ) && + if ( most_recently_raised && stacking_order.tqcontains( most_recently_raised ) && most_recently_raised->isShown( true ) && c->isOnCurrentDesktop()) topmost = most_recently_raised; else @@ -471,11 +471,11 @@ void Workspace::restackClientUnderActive( Client* c ) return; } - assert( unconstrained_stacking_order.contains( active_client )); + assert( unconstrained_stacking_order.tqcontains( 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 ); - unconstrained_stacking_order.insert( unconstrained_stacking_order.find( active_client ), c ); + unconstrained_stacking_order.insert( unconstrained_stacking_order.tqfind( active_client ), c ); } else { // put in the stacking order below _all_ windows belonging to the active application @@ -494,17 +494,17 @@ void Workspace::restackClientUnderActive( Client* c ) } } } - assert( unconstrained_stacking_order.contains( c )); + assert( unconstrained_stacking_order.tqcontains( 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 ].contains( active_client )) + if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].tqcontains( active_client )) { if( Client::belongToSameApplication( active_client, c )) { // put it after the active window if it's the same app focus_chain[ desktop ].remove( c ); - focus_chain[ desktop ].insert( focus_chain[ desktop ].find( active_client ), c ); + focus_chain[ desktop ].insert( focus_chain[ desktop ].tqfind( active_client ), c ); } else { // put it in focus_chain[currentDesktop()] after all windows belonging to the active applicationa @@ -523,12 +523,12 @@ void Workspace::restackClientUnderActive( Client* c ) } } // the same for global_focus_chain - if( c->wantsTabFocus() && global_focus_chain.contains( active_client )) + if( c->wantsTabFocus() && global_focus_chain.tqcontains( active_client )) { if( Client::belongToSameApplication( active_client, c )) { global_focus_chain.remove( c ); - global_focus_chain.insert( global_focus_chain.find( active_client ), c ); + global_focus_chain.insert( global_focus_chain.tqfind( active_client ), c ); } else { @@ -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.contains( (*it)->group()) + if( minimum_layer.tqcontains( (*it)->group()) && minimum_layer[ (*it)->group() ] == ActiveLayer && ( l == NormalLayer || l == AboveLayer )) { diff --git a/kwin/lib/kcommondecoration.cpp b/kwin/lib/kcommondecoration.cpp index 87541ad60..eabcc16b5 100644 --- a/kwin/lib/kcommondecoration.cpp +++ b/kwin/lib/kcommondecoration.cpp @@ -199,7 +199,7 @@ void KCommonDecoration::updateLayout() const if (*it) { if (!(*it)->isHidden() ) { moveWidget(x,y, *it); - x += layoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) ); + x += layoutMetric(LM_ButtonWidth, true, ::tqqt_cast<KCommonDecorationButton*>(*it) ); elementLayouted = true; } } else { @@ -221,7 +221,7 @@ void KCommonDecoration::updateLayout() const if (*it) { if (!(*it)->isHidden() ) { moveWidget(x,y, *it); - x += layoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) );; + x += layoutMetric(LM_ButtonWidth, true, ::tqqt_cast<KCommonDecorationButton*>(*it) );; elementLayouted = true; } } else { @@ -327,7 +327,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn = createButton(MenuButton); if (!btn) break; btn->setTipText(i18n("Menu") ); - btn->setRealizeButtons(LeftButton|RightButton); + btn->setRealizeButtons(Qt::LeftButton|Qt::RightButton); connect(btn, TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed())); connect(btn, TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased())); @@ -371,7 +371,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString if ((!m_button[MaxButton]) && isMaximizable()){ btn = createButton(MaxButton); if (!btn) break; - btn->setRealizeButtons(LeftButton|MidButton|RightButton); + btn->setRealizeButtons(Qt::LeftButton|Qt::MidButton|Qt::RightButton); const bool max = maximizeMode()==MaximizeFull; btn->setTipText(max?i18n("Restore"):i18n("Maximize") ); btn->setToggleButton(true); @@ -497,7 +497,7 @@ void KCommonDecoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize KCommonDecoration::minimumSize() const +TQSize KCommonDecoration::tqminimumSize() const { const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft)) +QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight)) @@ -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 repaint... + // because there is already "something" else triggering the tqrepaint... // widget()->update(); } @@ -685,7 +685,7 @@ void KCommonDecoration::resizeWidget(int w, int h, TQWidget *widget) const void KCommonDecoration::mouseDoubleClickEvent(TQMouseEvent *e) { - if( e->button() != LeftButton ) + if( e->button() != Qt::LeftButton ) return; int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom); @@ -819,24 +819,24 @@ void KCommonDecoration::updateWindowShape() bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e ) { - if( o != widget()) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch( e->type()) { case TQEvent::Resize: - resizeEvent(static_cast<TQResizeEvent*>(e) ); + resizeEvent(TQT_TQRESIZEEVENT(e) ); return true; case TQEvent::Paint: - paintEvent( static_cast< TQPaintEvent* >( e )); + paintEvent(TQT_TQPAINTEVENT( e )); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e )); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e )); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( static_cast< TQMouseEvent* >( e )); + processMousePressEvent(TQT_TQMOUSEEVENT( e )); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent(TQT_TQWHEELEVENT( e )); return true; default: return false; @@ -856,7 +856,7 @@ bool KCommonDecoration::isToolWindow() const TQRect KCommonDecoration::titleRect() const { int r_x, r_y, r_x2, r_y2; - widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); + TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); @@ -875,8 +875,8 @@ KCommonDecorationButton::KCommonDecorationButton(ButtonType type, KCommonDecorat : TQButton(parent->widget(), name), m_decoration(parent), m_type(type), - m_realizeButtons(LeftButton), - m_lastMouse(NoButton), + m_realizeButtons(Qt::LeftButton), + m_lastMouse(Qt::NoButton), m_isLeft(true) { setCursor(ArrowCursor); @@ -921,7 +921,7 @@ void KCommonDecorationButton::setSize(const TQSize &s) } } -TQSize KCommonDecorationButton::sizeHint() const +TQSize KCommonDecorationButton::tqsizeHint() const { return m_size; } @@ -950,7 +950,7 @@ void KCommonDecorationButton::mousePressEvent(TQMouseEvent* e) m_lastMouse = e->button(); // pass on event after changing button to LeftButton TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state()); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -960,7 +960,7 @@ void KCommonDecorationButton::mouseReleaseEvent(TQMouseEvent* e) m_lastMouse = e->button(); // pass on event after changing button to LeftButton TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state()); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } diff --git a/kwin/lib/kcommondecoration.h b/kwin/lib/kcommondecoration.h index f515a7da7..4dcaf51fb 100644 --- a/kwin/lib/kcommondecoration.h +++ b/kwin/lib/kcommondecoration.h @@ -177,7 +177,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration /** * This updates the window mask using the information provided by * cornerShape(). Edges which are aligned to screen corners are not - * shaped for better usability (remember to paint these areas in paintEvent(), too). + * tqshaped for better usability (remember to paint these areas in paintEvent(), too). * You normally don't want/need to reimplement updateWindowShape(). * @see cornerShape() */ @@ -202,7 +202,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration */ void updateLayout() const; /** - * Makes sure all buttons are repainted. + * Makes sure all buttons are tqrepainted. */ void updateButtons() const; /** @@ -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 minimumSize() const; + virtual TQSize tqminimumSize() const; virtual void maximizeChange(); virtual void desktopChange(); virtual void shadeChange(); @@ -287,10 +287,13 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration /** * Title bar buttons of KCommonDecoration need to inherit this class. */ -class KWIN_EXPORT KCommonDecorationButton : public QButton +class KWIN_EXPORT KCommonDecorationButton : public TQButton { friend class KCommonDecoration; + Q_OBJECT + TQ_OBJECT + public: KCommonDecorationButton(ButtonType type, KCommonDecoration *parent, const char *name); virtual ~KCommonDecorationButton(); @@ -343,7 +346,7 @@ class KWIN_EXPORT KCommonDecorationButton : public QButton */ ButtonState lastMousePress() const { return m_lastMouse; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void setToggleButton(bool toggle); diff --git a/kwin/lib/kdecoration.cpp b/kwin/lib/kdecoration.cpp index 97c8965e9..a8b78bee5 100644 --- a/kwin/lib/kdecoration.cpp +++ b/kwin/lib/kdecoration.cpp @@ -388,14 +388,14 @@ const TQFont& KDecorationOptions::font(bool active, bool small) const return(active ? d->activeFont : d->inactiveFont); } -const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const +const TQColorGroup& KDecorationOptions::tqcolorGroup(ColorType type, bool active) const { int idx = type + (active ? 0 : NUM_COLORS); if(d->cg[idx]) return(*d->cg[idx]); d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150), d->colors[idx].dark(), d->colors[idx].dark(120), - Qt::black, TQApplication::palette().active(). + Qt::black, TQApplication::tqpalette().active(). base()); return(*d->cg[idx]); } @@ -434,7 +434,7 @@ bool KDecorationOptions::moveResizeMaximizedWindows() const return d->move_resize_maximized_windows; } -KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick( Qt::ButtonState button ) const +KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick( TQt::ButtonState button ) const { return button == Qt::RightButton? d->OpMaxButtonRightClick : button == Qt::MidButton? d->OpMaxButtonMiddleClick : diff --git a/kwin/lib/kdecoration.h b/kwin/lib/kdecoration.h index f41f19041..7ce588142 100644 --- a/kwin/lib/kdecoration.h +++ b/kwin/lib/kdecoration.h @@ -205,7 +205,7 @@ public: * @param type The requested color type. * @param active Whether to return the color for active or inactive windows. */ - const TQColorGroup& colorGroup(ColorType type, bool active=true) const; + const TQColorGroup& tqcolorGroup(ColorType type, bool active=true) const; /** * Returns the active or inactive decoration font. * The changed flags for this setting is SettingFont. @@ -286,7 +286,7 @@ public: /** * @internal */ - WindowOperation operationMaxButtonClick( Qt::ButtonState button ) const; + WindowOperation operationMaxButtonClick( TQt::ButtonState button ) const; /** * @internal @@ -481,15 +481,15 @@ class KWIN_EXPORT KDecoration void performWindowOperation( WindowOperation op ); /** * If the decoration is non-rectangular, this function needs to be called - * to set the shape of the decoration. + * to set the tqshape of the decoration. * - * @param reg The shape of the decoration. + * @param reg The tqshape of the decoration. * @param mode The X11 values Unsorted, YSorted, YXSorted and YXBanded that specify * the sorting of the rectangles, default value is Unsorted. */ void setMask( const TQRegion& reg, int mode = 0 ); /** - * This convenience function resets the shape mask. + * This convenience function resets the tqshape mask. */ void clearMask(); // convenience /** @@ -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 repaints or resizes. Also, if the sizes returned + * This function mustn't do any tqrepaints 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 repaints, resizes or anything like that + // mustn't do any tqrepaints, 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 minimumSize() const = 0; + virtual TQSize tqminimumSize() const = 0; /** * This function is called whenever the window either becomes or stops being active. * Use isActive() to find out the current state. diff --git a/kwin/lib/kdecoration_plugins_p.cpp b/kwin/lib/kdecoration_plugins_p.cpp index 0490e4755..2e870eaf4 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.replace( "kwin3_", "kwin_" ); + catalogue.tqreplace( "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 7ad1aefbe..65fde37bc 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.contains( const_cast< KDecoration* >( deco )); + return _decorations.tqcontains( const_cast< KDecoration* >( deco )); } void KDecorationFactory::addDecoration( KDecoration* deco ) diff --git a/kwin/lib/kdecorationfactory.h b/kwin/lib/kdecorationfactory.h index 7396ad987..fb560c492 100644 --- a/kwin/lib/kdecorationfactory.h +++ b/kwin/lib/kdecorationfactory.h @@ -56,7 +56,7 @@ class KWIN_EXPORT KDecorationFactory * The argument specifies what has changed, using the SettingXXX masks. * It should be determined whether the decorations need to be completely * remade, in which case true should be returned, or whether only e.g. - * a repaint will be sufficient, in which case false should be returned, + * a tqrepaint will be sufficient, in which case false should be returned, * and resetDecorations() can be called to reset all decoration objects. * Note that true should be returned only when really necessary. */ diff --git a/kwin/main.cpp b/kwin/main.cpp index edceeb6bf..96cb793ba 100644 --- a/kwin/main.cpp +++ b/kwin/main.cpp @@ -225,7 +225,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) XCloseDisplay( dpy ); dpy = 0; - if ((pos = display_name.findRev('.')) != -1 ) + if ((pos = display_name.tqfindRev('.')) != -1 ) display_name.remove(pos,10); // 10 is enough to be sure we removed ".s" TQCString envir; diff --git a/kwin/manage.cpp b/kwin/manage.cpp index df385867a..dc05e5e2c 100644 --- a/kwin/manage.cpp +++ b/kwin/manage.cpp @@ -266,7 +266,7 @@ bool Client::manage( Window w, bool isMapped ) usePosition = true; if( !rules()->checkIgnoreGeometry( !usePosition )) { - bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::fromLatin1(resourceClass()))); + bool ignorePPosition = ( options->ignorePositionClasses.tqcontains(TQString::tqfromLatin1(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_shape = Shape::hasShape( window()); + is_tqshape = Shape::hasShape( window()); updateShape(); //CT extra check for stupid jdk 1.3.1. But should make sense in general @@ -573,9 +573,9 @@ void Client::embedClient( Window w, const XWindowAttributes &attr ) attr.depth, InputOutput, attr.visual, CWColormap | CWBackPixmap | CWBorderPixel, &swa ); - XDefineCursor( qt_xdisplay(), frame, arrowCursor.handle()); + XDefineCursor( qt_xdisplay(), frame, TQCursor(tqarrowCursor).handle()); // some apps are stupid and don't define their own cursor - set the arrow one for them - XDefineCursor( qt_xdisplay(), wrapper, arrowCursor.handle()); + XDefineCursor( qt_xdisplay(), wrapper, TQCursor(tqarrowCursor).handle()); XReparentWindow( qt_xdisplay(), client, wrapper, 0, 0 ); XSelectInput( qt_xdisplay(), frame, KeyPressMask | KeyReleaseMask | diff --git a/kwin/options.cpp b/kwin/options.cpp index cab703051..e6afd4a1d 100644 --- a/kwin/options.cpp +++ b/kwin/options.cpp @@ -95,7 +95,7 @@ unsigned long Options::updateSettings() placement = Placement::policyFromString( config->readEntry("Placement"), true ); xineramaPlacementScreen = KCLAMP( config->readNumEntry( "XineramaPlacementScreen", -1 ), - -1, qApp->desktop()->numScreens() - 1 ); + -1, tqApp->desktop()->numScreens() - 1 ); animateShade = config->readBoolEntry("AnimateShade", TRUE ); animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE ); @@ -195,11 +195,11 @@ unsigned long Options::updateSettings() // window drop shadows config->setGroup("Style"); - shadow_colour = config->readColorEntry("ShadowColour", &Qt::black); + shadow_colour = config->readColorEntry("ShadowColour", &TQt::black); shadow_docks = config->readBoolEntry("ShadowDocks", false); shadow_overrides = config->readBoolEntry("ShadowOverrides", false); shadow_topMenus = config->readBoolEntry("ShadowTopMenus", false); - shadow_inactive_colour = config->readColorEntry("InactiveShadowColour", &Qt::black); + shadow_inactive_colour = config->readColorEntry("InactiveShadowColour", &TQt::black); shadow_inactive_enabled = config->readBoolEntry("InactiveShadowEnabled", false); shadow_inactive_opacity = config->readDoubleNumEntry("InactiveShadowOpacity", 0.70); shadow_inactive_thickness = config->readNumEntry("InactiveShadowThickness", 5); @@ -379,7 +379,7 @@ int Options::electricBorderDelay() bool Options::checkIgnoreFocusStealing( const Client* c ) { - return ignoreFocusStealingClasses.contains(TQString::fromLatin1(c->resourceClass())); + return ignoreFocusStealingClasses.tqcontains(TQString::tqfromLatin1(c->resourceClass())); } Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta ) diff --git a/kwin/popupinfo.cpp b/kwin/popupinfo.cpp index f0e80640a..f2367b933 100644 --- a/kwin/popupinfo.cpp +++ b/kwin/popupinfo.cpp @@ -75,8 +75,8 @@ void PopupInfo::reset() void PopupInfo::paintEvent( TQPaintEvent* ) { TQPainter p( this ); - style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), - colorGroup(), TQStyle::Style_Default ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), + tqcolorGroup(), TQStyle::Style_Default ); paintContents(); } @@ -90,7 +90,7 @@ void PopupInfo::paintContents() TQPainter p( this ); TQRect r( 6, 6, width()-12, height()-12 ); - p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) ); + p.fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) ); /* p.setPen(Qt::white); diff --git a/kwin/popupinfo.h b/kwin/popupinfo.h index 734a44cbe..30ff76b30 100644 --- a/kwin/popupinfo.h +++ b/kwin/popupinfo.h @@ -20,7 +20,7 @@ namespace KWinInternal class Workspace; -class PopupInfo : public QWidget +class PopupInfo : public TQWidget { Q_OBJECT public: diff --git a/kwin/rules.cpp b/kwin/rules.cpp index cfcf4bc43..ed4a9a8b5 100644 --- a/kwin/rules.cpp +++ b/kwin/rules.cpp @@ -84,7 +84,7 @@ Rules::Rules( const TQString& str, bool temporary ) #define READ_MATCH_STRING( var, func ) \ var = cfg.readEntry( #var ) func; \ - var##match = (StringMatch) QMAX( FirstStringMatch, QMIN( LastStringMatch, cfg.readNumEntry( #var "match" ))); + var##match = (StringMatch) TQMAX( FirstStringMatch, TQMIN( LastStringMatch, cfg.readNumEntry( #var "match" ))); #define READ_SET_RULE( var, type, func ) \ var = func ( cfg.read##type##Entry( #var )); \ @@ -1038,7 +1038,7 @@ void Workspace::discardUsedWindowRules( Client* c, bool withdrawn ) it != rules.end(); ) { - if( c->rules()->contains( *it )) + if( c->rules()->tqcontains( *it )) { updated = true; (*it)->discardUsed( withdrawn ); diff --git a/kwin/rules.h b/kwin/rules.h index 584e6a952..bf1943de7 100644 --- a/kwin/rules.h +++ b/kwin/rules.h @@ -40,7 +40,7 @@ class WindowRules WindowRules(); void update( Client* ); void discardTemporary(); - bool contains( const Rules* rule ) const; + bool tqcontains( const Rules* rule ) const; void remove( Rules* rule ); Placement::Policy checkPlacement( Placement::Policy placement ) const; TQRect checkGeometry( TQRect rect, bool init = false ) const; @@ -284,15 +284,15 @@ WindowRules::WindowRules() } inline -bool WindowRules::contains( const Rules* rule ) const +bool WindowRules::tqcontains( const Rules* rule ) const { - return qFind( rules.begin(), rules.end(), rule ) != rules.end(); + return tqFind( rules.begin(), rules.end(), rule ) != rules.end(); } inline void WindowRules::remove( Rules* rule ) { - TQValueVector< Rules* >::Iterator pos = qFind( rules.begin(), rules.end(), rule ); + TQValueVector< Rules* >::Iterator pos = tqFind( rules.begin(), rules.end(), rule ); if( pos != rules.end()) rules.erase( pos ); } diff --git a/kwin/sm.cpp b/kwin/sm.cpp index 31cada7e0..045d4f924 100644 --- a/kwin/sm.cpp +++ b/kwin/sm.cpp @@ -259,13 +259,13 @@ bool Workspace::windowRoleMatch( const TQCString& role1, const TQCString& role2 { if( role1.isEmpty() && role2.isEmpty()) return true; - int pos1 = role1.find( '#' ); - int pos2 = role2.find( '#' ); + int pos1 = role1.tqfind( '#' ); + int pos2 = role2.tqfind( '#' ); bool ret; if( pos1 < 0 || pos2 < 0 || pos1 != pos2 ) ret = role1 == role2; else - ret = qstrncmp( role1, role2, pos1 ) == 0; + ret = tqstrncmp( 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 = qApp->argv()[ 0 ]; + propvalue[ 3 ].value = tqApp->argv()[ 0 ]; props[ 3 ].name = const_cast< char* >( SmProgram ); props[ 3 ].type = const_cast< char* >( SmARRAY8 ); props[ 3 ].num_vals = 1; @@ -416,7 +416,7 @@ SessionSaveDoneHelper::SessionSaveDoneHelper() SmProp* p[ 5 ] = { &props[ 0 ], &props[ 1 ], &props[ 2 ], &props[ 3 ], &props[ 4 ] }; SmcSetProperties( conn, 5, p ); notifier = new TQSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )), - TQSocketNotifier::Read, this ); + TQSocketNotifier::Read, TQT_TQOBJECT(this) ); connect( notifier, TQT_SIGNAL( activated( int )), TQT_SLOT( processData())); } diff --git a/kwin/tabbox.cpp b/kwin/tabbox.cpp index a79c10233..6d78b4242 100644 --- a/kwin/tabbox.cpp +++ b/kwin/tabbox.cpp @@ -43,7 +43,7 @@ namespace KWinInternal extern TQPixmap* kwin_get_menu_pix_hack(); TabBox::TabBox( Workspace *ws, const char *name ) - : TQFrame( 0, name, Qt::WNoAutoErase ), current_client( NULL ), wspace(ws) + : TQFrame( 0, name, WNoAutoErase ), current_client( NULL ), wspace(ws) { setFrameStyle(TQFrame::StyledPanel | TQFrame::Plain); setLineWidth(2); @@ -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.contains( modal )) + else if( !list.tqcontains( modal )) add = modal; else { @@ -273,7 +273,7 @@ void TabBox::nextPrev( bool next) client = 0; break; } - } while ( client && !clients.contains( client )); + } while ( client && !clients.tqcontains( client )); setCurrentClient( client ); } else if( mode() == DesktopMode ) @@ -375,7 +375,7 @@ void TabBox::drawContents( TQPainter * ) pix.fill(this, 0, 0); TQPainter p; - p.begin(&pix, this); + p.tqbegin(&pix, this); TQPixmap* menu_pix = kwin_get_menu_pix_hack(); @@ -402,7 +402,7 @@ void TabBox::drawContents( TQPainter * ) { // draw highlight background if ( (*it) == current_client ) - p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); // draw icon TQPixmap icon; @@ -439,11 +439,11 @@ void TabBox::drawContents( TQPainter * ) // draw text if ( (*it) == current_client ) - p.setPen(colorGroup().highlightedText()); + p.setPen(tqcolorGroup().highlightedText()); else if( (*it)->isMinimized()) { - TQColor c1 = colorGroup().text(); - TQColor c2 = colorGroup().background(); + TQColor c1 = tqcolorGroup().text(); + TQColor c2 = tqcolorGroup().background(); // from kicker's TaskContainer::blendColors() int r1, g1, b1; int r2, g2, b2; @@ -458,10 +458,10 @@ void TabBox::drawContents( TQPainter * ) p.setPen(TQColor( r1, g1, b1 )); } else - p.setPen(colorGroup().text()); + p.setPen(tqcolorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, - Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, s); + Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, s); y += lineHeight; } @@ -496,13 +496,13 @@ void TabBox::drawContents( TQPainter * ) { // draw highlight background if ( iDesktop == desk ) // current desktop - p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); p.save(); // draw "icon" (here: number of desktop) - p.fillRect(x+5, y+2, iconWidth, iconHeight, colorGroup().base()); - p.setPen(colorGroup().text()); + p.fillRect(x+5, y+2, iconWidth, iconHeight, tqcolorGroup().base()); + p.setPen(tqcolorGroup().text()); p.drawRect(x+5, y+2, iconWidth, iconHeight); // draw desktop-number @@ -514,12 +514,12 @@ void TabBox::drawContents( TQPainter * ) // draw desktop name text if ( iDesktop == desk ) - p.setPen(colorGroup().highlightedText()); + p.setPen(tqcolorGroup().highlightedText()); else - p.setPen(colorGroup().text()); + p.setPen(tqcolorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, - Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, + Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, workspace()->desktopName(iDesktop)); // show mini icons from that desktop aligned to each other @@ -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( !geometry().contains( pos )) + if( !tqgeometry().tqcontains( pos )) { workspace()->closeTabBox(); // click outside closes tab return; @@ -1229,7 +1229,7 @@ void Workspace::tabBoxKeyRelease( const XKeyEvent& ev ) int Workspace::nextDesktopFocusChain( int iDesktop ) const { - int i = desktop_focus_chain.find( iDesktop ); + int i = desktop_focus_chain.tqfind( iDesktop ); if( i >= 0 && i+1 < (int)desktop_focus_chain.size() ) return desktop_focus_chain[i+1]; else if( desktop_focus_chain.size() > 0 ) @@ -1240,7 +1240,7 @@ int Workspace::nextDesktopFocusChain( int iDesktop ) const int Workspace::previousDesktopFocusChain( int iDesktop ) const { - int i = desktop_focus_chain.find( iDesktop ); + int i = desktop_focus_chain.tqfind( iDesktop ); if( i-1 >= 0 ) return desktop_focus_chain[i-1]; else if( desktop_focus_chain.size() > 0 ) @@ -1257,7 +1257,7 @@ Client* Workspace::nextFocusChainClient( Client* c ) const { if ( global_focus_chain.isEmpty() ) return 0; - ClientList::ConstIterator it = global_focus_chain.find( c ); + ClientList::ConstIterator it = global_focus_chain.tqfind( c ); if ( it == global_focus_chain.end() ) return global_focus_chain.last(); if ( it == global_focus_chain.begin() ) @@ -1274,7 +1274,7 @@ Client* Workspace::previousFocusChainClient( Client* c ) const { if ( global_focus_chain.isEmpty() ) return 0; - ClientList::ConstIterator it = global_focus_chain.find( c ); + ClientList::ConstIterator it = global_focus_chain.tqfind( c ); if ( it == global_focus_chain.end() ) return global_focus_chain.first(); ++it; @@ -1291,7 +1291,7 @@ Client* Workspace::nextStaticClient( Client* c ) const { if ( !c || clients.isEmpty() ) return 0; - ClientList::ConstIterator it = clients.find( c ); + ClientList::ConstIterator it = clients.tqfind( c ); if ( it == clients.end() ) return clients.first(); ++it; @@ -1307,7 +1307,7 @@ Client* Workspace::previousStaticClient( Client* c ) const { if ( !c || clients.isEmpty() ) return 0; - ClientList::ConstIterator it = clients.find( c ); + ClientList::ConstIterator it = clients.tqfind( c ); if ( it == clients.end() ) return clients.last(); if ( it == clients.begin() ) diff --git a/kwin/tabbox.h b/kwin/tabbox.h index 926635e7d..d77633125 100644 --- a/kwin/tabbox.h +++ b/kwin/tabbox.h @@ -25,7 +25,7 @@ namespace KWinInternal class Workspace; class Client; -class TabBox : public QFrame +class TabBox : public TQFrame { Q_OBJECT public: diff --git a/kwin/tools/decobenchmark/main.cpp b/kwin/tools/decobenchmark/main.cpp index d0d165005..ca3ce11d2 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', 'repaint', 'caption', 'resize', 'recreation')", 0 }, + { "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 }, { "+repetitions", "Number of test repetitions.", 0 }, { 0, 0, 0 } }; @@ -117,7 +117,7 @@ int main(int argc, char** argv) Tests test; if (t == "all") test = AllTests; - else if (t == "repaint") + else if (t == "tqrepaint") test = RepaintTest; else if (t == "caption") test = CaptionTest; diff --git a/kwin/tools/decobenchmark/preview.cpp b/kwin/tools/decobenchmark/preview.cpp index 3cbcdcb5f..e4dfd0ec1 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 << " repaints..." << endl; + kdDebug() << "start " << n << " tqrepaints..." << endl; bridge->setCaption("Deco Benchmark"); deco->captionChange(); positionPreviews(0); for (int i = 0; i < n; ++i) { - deco->widget()->repaint(); + deco->widget()->tqrepaint(); kapp->processEvents(); } } @@ -79,7 +79,7 @@ void KDecorationPreview::performCaptionTest(int n) for (int i = 0; i < n; ++i) { bridge->setCaption(caption.arg(i) ); deco->captionChange(); - deco->widget()->repaint(); + deco->widget()->tqrepaint(); kapp->processEvents(); } } @@ -127,7 +127,7 @@ void KDecorationPreview::positionPreviews(int shrink) if ( !deco ) return; - TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->minimumSize()*/; + TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->tqminimumSize()*/; TQRect geometry(TQPoint(10, 10), size); deco->widget()->setGeometry(geometry); diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp index 2821658c2..50e495496 100644 --- a/kwin/useractions.cpp +++ b/kwin/useractions.cpp @@ -229,7 +229,7 @@ void Workspace::desktopPopupAboutToShow() id = desk_popup->insertItem( basic_name .arg(i) - .arg( desktopName(i).replace( '&', "&&" )), + .arg( desktopName(i).tqreplace( '&', "&&" )), 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->sizeHint(); + TQSize size = client_keys_dialog->tqsizeHint(); TQPoint pos = c->pos() + c->clientPos(); if( pos.x() + size.width() >= r.right()) pos.setX( r.right() - size.width()); @@ -1044,8 +1044,8 @@ void Workspace::showWindowMenu( const TQRect &pos, Client* cl ) else { TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop()); - clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/ - int popupHeight = p->sizeHint().height(); + clientPopupAboutToShow(); // needed for tqsizeHint() to be correct :-/ + int popupHeight = p->tqsizeHint().height(); if (y + popupHeight < area.height()) p->exec( TQPoint( x, y ) ); else @@ -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.contains( '(' ) && !cut.contains( ')' ) && !cut.contains( ' ' )) + if( !cut.tqcontains( '(' ) && !cut.tqcontains( ')' ) && !cut.tqcontains( ' ' )) { if( workspace()->shortcutAvailable( KShortcut( cut ), this )) setShortcutInternal( KShortcut( cut )); diff --git a/kwin/utils.cpp b/kwin/utils.cpp index 33bdd6299..67c3aa1c9 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 shaped window are an extension to X -int Shape::kwin_shape_version = 0; -int Shape::kwin_shape_event = 0; +// Necessary since tqshaped window are an extension to X +int Shape::kwin_tqshape_version = 0; +int Shape::kwin_tqshape_event = 0; -// does the window w need a shape combine mask around it? +// does the window w need a tqshape combine mask around it? bool Shape::hasShape( WId w) { int xws, yws, xbs, ybs; @@ -61,21 +61,21 @@ bool Shape::hasShape( WId w) return boundingShaped != 0; } -int Shape::shapeEvent() +int Shape::tqshapeEvent() { - return kwin_shape_event; + return kwin_tqshape_event; } void Shape::init() { - kwin_shape_version = 0; + kwin_tqshape_version = 0; int dummy; - if( !XShapeQueryExtension(qt_xdisplay(), &kwin_shape_event, &dummy)) + if( !XShapeQueryExtension(qt_xdisplay(), &kwin_tqshape_event, &dummy)) return; int major, minor; if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor )) return; - kwin_shape_version = major * 0x10 + minor; + kwin_tqshape_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 b1b2b2e2c..4521eeaa7 100644 --- a/kwin/utils.h +++ b/kwin/utils.h @@ -111,14 +111,14 @@ enum ShadeMode class Shape { public: - 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 available() { return kwin_tqshape_version > 0; } + static int version() { return kwin_tqshape_version; } // as 16*major+minor, i.e. two hex digits static bool hasShape( WId w); - static int shapeEvent(); + static int tqshapeEvent(); static void init(); private: - static int kwin_shape_version; - static int kwin_shape_event; + static int kwin_tqshape_version; + static int kwin_tqshape_event; }; // compile with XShape older than 1.0 diff --git a/kwin/wm-spec/x351.html b/kwin/wm-spec/x351.html index 882f63fbf..2e827fbc1 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 shape) to all desktops, with +desktop-sized window (no tqshape) to all desktops, with _NET_WM_WINDOW_TYPE_DESKTOP. This makes the desktop focusable and greatly simplifies implementation of the file manager. It is also faster than -managing lots of small shaped windows. The file manager draws the background +managing lots of small tqshaped windows. The file manager draws the background on this window. There should be a root property with a window handle for use in applications that want to draw the background (xearth). </P diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index 2d4eea005..448732963 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -167,7 +167,7 @@ Workspace::Workspace( bool restore ) new TQWidget( 0, "desktop_widget", - Qt::WType_Desktop | Qt::WPaintUnclipped + (WFlags)(TQt::WType_Desktop | TQt::WPaintUnclipped) ); kapp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later @@ -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.contains( c )) + if( !unconstrained_stacking_order.tqcontains( c )) unconstrained_stacking_order.append( c ); - if( !stacking_order.contains( c )) // it'll be updated later, and updateToolWindows() requires + if( !stacking_order.tqcontains( 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.contains( c ) || desktops.contains( c )); + Q_ASSERT( clients.tqcontains( c ) || desktops.tqcontains( c )); clients.remove( c ); desktops.remove( c ); unconstrained_stacking_order.remove( c ); @@ -641,7 +641,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change ) else focus_chain[ i ].prepend( c ); } - else if( !focus_chain[ i ].contains( c )) + else if( !focus_chain[ i ].tqcontains( 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 ].contains( c )) + else if( !focus_chain[ i ].tqcontains( 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.contains( c )) + else if( !global_focus_chain.tqcontains( c )) { if( active_client != NULL && active_client != c && !global_focus_chain.isEmpty() && global_focus_chain.last() == active_client ) @@ -1000,7 +1000,7 @@ void Workspace::slotReconfigure() topmenu_selection->release(); lostTopMenuSelection(); } - topmenu_height = 0; // invalidate used menu height + topmenu_height = 0; // tqinvalidate used menu height if( managingTopMenus()) { updateTopMenuGeometry(); @@ -1039,7 +1039,7 @@ void Workspace::loadDesktopSettings() int n = c->readNumEntry("Number", 4); number_of_desktops = n; delete workarea; - workarea = new QRect[ n + 1 ]; + workarea = new TQRect[ n + 1 ]; delete screenarea; screenarea = NULL; rootInfo->setNumberOfDesktops( number_of_desktops ); @@ -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 ) repaints during desktop switching + Reduces desktop ( wallpaper ) tqrepaints during desktop switching */ class ObscuringWindows { @@ -1271,7 +1271,7 @@ bool Workspace::setCurrentDesktop( int new_desktop ) { // Search in focus chain if ( movingClient != NULL && active_client == movingClient - && focus_chain[currentDesktop()].contains( active_client ) + && focus_chain[currentDesktop()].tqcontains( active_client ) && active_client->isShown( true ) && active_client->isOnCurrentDesktop()) { c = active_client; // the requestFocus below will fail, as the client is already active @@ -1314,8 +1314,8 @@ bool Workspace::setCurrentDesktop( int new_desktop ) // If input: chain = { 1, 2, 3, 4 } and current_desktop = 3, // Output: chain = { 3, 1, 2, 4 }. // kdDebug(1212) << TQString("Switching to desktop #%1, at focus_chain[currentDesktop()] index %2\n") -// .arg(currentDesktop()).arg(desktop_focus_chain.find( currentDesktop() )); - for( int i = desktop_focus_chain.find( currentDesktop() ); i > 0; i-- ) +// .arg(currentDesktop()).arg(desktop_focus_chain.tqfind( currentDesktop() )); + for( int i = desktop_focus_chain.tqfind( currentDesktop() ); i > 0; i-- ) desktop_focus_chain[i] = desktop_focus_chain[i-1]; desktop_focus_chain[0] = currentDesktop(); @@ -1562,7 +1562,7 @@ int Workspace::numScreens() const { if( !options->xineramaEnabled ) return 0; - return qApp->desktop()->numScreens(); + return tqApp->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 qApp->desktop()->screenNumber( activeClient()->geometry().center()); + return tqApp->desktop()->screenNumber( activeClient()->geometry().center()); return active_screen; } - return qApp->desktop()->screenNumber( TQCursor::pos()); + return tqApp->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 = qApp->desktop()->screenNumber( mousepos ); + active_screen = tqApp->desktop()->screenNumber( mousepos ); } TQRect Workspace::screenGeometry( int screen ) const { if (( !options->xineramaEnabled ) || (kapp->desktop()->numScreens() < 2)) - return qApp->desktop()->geometry(); - return qApp->desktop()->screenGeometry( screen ); + return tqApp->desktop()->geometry(); + return tqApp->desktop()->screenGeometry( screen ); } int Workspace::screenNumber( TQPoint pos ) const { if( !options->xineramaEnabled ) return 0; - return qApp->desktop()->screenNumber( pos ); + return tqApp->desktop()->screenNumber( pos ); } void Workspace::sendClientToScreen( Client* c, int screen ) @@ -1669,7 +1669,7 @@ void Workspace::calcDesktopLayout(int &x, int &y) const */ bool Workspace::addSystemTrayWin( WId w ) { - if ( systemTrayWins.contains( w ) ) + if ( systemTrayWins.tqcontains( 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.contains( w ) ) + if ( !systemTrayWins.tqcontains( w ) ) return FALSE; if( check ) { @@ -1798,7 +1798,7 @@ void Workspace::slotGrabWindow() int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), active_client->frameId(), ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost shape of the window; + //The ShapeBounding region is the outermost tqshape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region @@ -1816,7 +1816,7 @@ void Workspace::slotGrabWindow() //Get the masked away area. TQRegion maskedAway = bbox - contents; - TQMemArray<TQRect> maskedAwayRects = maskedAway.rects(); + TQMemArray<TQRect> maskedAwayRects = maskedAway.tqrects(); //Construct a bitmap mask from the rectangles TQBitmap mask( snapshot.width(), snapshot.height()); @@ -1906,7 +1906,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation { if ( !w ) return state; - TQWidget* widget = TQWidget::find( w ); + TQWidget* widget = TQWidget::tqfind( w ); if ( (!widget || widget->inherits("QToolButton") ) && !findClient( WindowMatchPredicate( w )) ) { int x, y; @@ -2381,7 +2381,7 @@ void Workspace::raiseElectricBorders() void Workspace::addTopMenu( Client* c ) { assert( c->isTopMenu()); - assert( !topmenus.contains( c )); + assert( !topmenus.tqcontains( 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.contains( c )); + assert( topmenus.tqcontains( 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.sizeHint().height(); + topmenu_height = tmpmenu.tqsizeHint().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.contains("Started",false)) + if (output.tqcontains("Started",false)) ; // don't do anything, just pass to the connection release - else if (output.contains("Can't open display",false)) + else if (output.tqcontains("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.contains("No render extension",false)) + else if (output.tqcontains("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.contains("No composite extension",false)) + else if (output.tqcontains("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.contains("No damage extension",false)) + else if (output.tqcontains("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.contains("No XFixes extension",false)) + else if (output.tqcontains("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 |