diff options
Diffstat (limited to 'kwin/clients')
-rw-r--r-- | kwin/clients/b2/b2client.cpp | 2 | ||||
-rw-r--r-- | kwin/clients/keramik/embedtool.cpp | 4 | ||||
-rw-r--r-- | kwin/clients/keramik/keramik.cpp | 4 | ||||
-rw-r--r-- | kwin/clients/kwmtheme/kwmthemeclient.cpp | 2 | ||||
-rw-r--r-- | kwin/clients/plastik/plastikclient.cpp | 22 | ||||
-rw-r--r-- | kwin/clients/quartz/quartz.cpp | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp index ae010e830..adb594282 100644 --- a/kwin/clients/b2/b2client.cpp +++ b/kwin/clients/b2/b2client.cpp @@ -1391,7 +1391,7 @@ void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e) void B2Titlebar::wheelEvent(TQWheelEvent *e) { - if (client->isSetShade() || TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) + if (client->isSetShade() || TQT_TQRECT_OBJECT(rect()).contains(e->pos())) client->titlebarMouseWheelOperation( e->delta()); } diff --git a/kwin/clients/keramik/embedtool.cpp b/kwin/clients/keramik/embedtool.cpp index 415862842..d1cbd78fd 100644 --- a/kwin/clients/keramik/embedtool.cpp +++ b/kwin/clients/keramik/embedtool.cpp @@ -100,7 +100,7 @@ void KeramikEmbedder::embed( const char *name ) TQString codename( basename ); TQImage image( name ); - codename = codename.tqreplace( TQRegExp("[^a-zA-Z0-9]"), "_" ); + codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" ); stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t"; stream.setf( TQTextStream::hex | TQTextStream::right ); @@ -200,7 +200,7 @@ void KeramikEmbedder::writeIndex() stream << "\t\t\tm_inst = NULL;\n"; stream << "\t\t}\n\n"; stream << "\t\tTQImage *image( const TQString &name ) const {\n"; - stream << "\t\t\treturn db->tqfind( name );\n"; + stream << "\t\t\treturn db->find( 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 2d5f111c8..089c7ed69 100644 --- a/kwin/clients/keramik/keramik.cpp +++ b/kwin/clients/keramik/keramik.cpp @@ -1657,14 +1657,14 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e ) { if ( e->button() == Qt::LeftButton - && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) ) + && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) titlebarDblClickOperation(); } void KeramikClient::wheelEvent( TQWheelEvent *e ) { if (isSetShade() - || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) ) + || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp index 0293d47c4..9f51c0edf 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.cpp +++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp @@ -752,7 +752,7 @@ void KWMThemeClient::showEvent(TQShowEvent *) void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if (e->button() == LeftButton && titlebar->geometry().tqcontains( e->pos() ) ) + if (e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } diff --git a/kwin/clients/plastik/plastikclient.cpp b/kwin/clients/plastik/plastikclient.cpp index 61dfdaba7..0e72ff59c 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.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTileTop, active, toolWindow) ); } } @@ -291,7 +291,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeLeft > 0) { tempRect.setRect(r_x, r_y, borderLeft, titleEdgeTop+titleHeight+titleEdgeBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarLeft, active, toolWindow) ); titleMarginLeft = borderLeft; } @@ -301,7 +301,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeRight > 0) { tempRect.setRect(borderRightLeft, r_y, borderRight, titleEdgeTop+titleHeight+titleEdgeBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarRight, active, toolWindow) ); titleMarginRight = borderRight; } @@ -312,7 +312,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(Rtitle.width() > 0) { m_captionRect = captionRect(); // also update m_captionRect! - if (m_captionRect.isValid() && region.tqcontains(m_captionRect) ) + if (m_captionRect.isValid() && region.contains(m_captionRect) ) { painter.drawTiledPixmap(m_captionRect, caption); } @@ -320,14 +320,14 @@ void PlastikClient::paintEvent(TQPaintEvent *e) // left to the title tempRect.setRect(r_x+titleMarginLeft, m_captionRect.top(), m_captionRect.left() - (r_x+titleMarginLeft), m_captionRect.height() ); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTile, active, toolWindow) ); } // right to the title tempRect.setRect(m_captionRect.right()+1, m_captionRect.top(), (r_x2-titleMarginRight) - m_captionRect.right(), m_captionRect.height() ); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTile, active, toolWindow) ); } @@ -337,7 +337,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(borderLeft > 0 && sideHeight > 0) { tempRect.setCoords(r_x, titleEdgeBottomBottom+1, borderLeftRight, borderBottomTop-1); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderLeftTile, active, toolWindow) ); } } @@ -346,7 +346,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(borderRight > 0 && sideHeight > 0) { tempRect.setCoords(borderRightLeft, titleEdgeBottomBottom+1, r_x2, borderBottomTop-1); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderRightTile, active, toolWindow) ); } } @@ -358,19 +358,19 @@ void PlastikClient::paintEvent(TQPaintEvent *e) int r = r_x2; tempRect.setRect(r_x, borderBottomTop, borderLeft, borderBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomLeft, active, toolWindow) ); l = tempRect.right()+1; } tempRect.setRect(borderRightLeft, borderBottomTop, borderLeft, borderBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomRight, active, toolWindow) ); r = tempRect.left()-1; } tempRect.setCoords(l, borderBottomTop, r, r_y2); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomTile, active, toolWindow) ); } } diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp index 4c4a883b6..2bb0205ae 100644 --- a/kwin/clients/quartz/quartz.cpp +++ b/kwin/clients/quartz/quartz.cpp @@ -207,7 +207,7 @@ void QuartzHandler::readConfig() extraSlim = conf.readBoolEntry( "UseQuartzExtraSlim", false ); // A small hack to make the on all desktops button look nicer - onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().tqcontains( 'S' ); + onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().contains( 'S' ); if ( TQApplication::reverseLayout() ) onAllDesktopsButtonOnLeft = !onAllDesktopsButtonOnLeft; switch(options()->preferredBorderSize(this)) { |