diff --git a/clients/test/test.cpp b/clients/test/test.cpp index 69ddb05798..34439a4af7 100644 --- a/clients/test/test.cpp +++ b/clients/test/test.cpp @@ -268,7 +268,7 @@ bool Decoration::animateMinimize(bool iconify) for (int step = 0; step < stepCount; step++) { - r.moveBy(dx, dy); + r.translate(dx, dy); r.setWidth(r.width() - 2 * dx); r.setHeight(r.height() - 2 * dy); diff --git a/geometry.cpp b/geometry.cpp index a44d8dffde..f072a46241 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -118,25 +118,25 @@ void Workspace::updateClientArea( bool force ) i <= numberOfDesktops(); ++i ) { - new_wareas[ i ] = new_wareas[ i ].intersect( r ); + new_wareas[ i ] = new_wareas[ i ].intersected( r ); for( int iS = 0; iS < nscreens; iS ++ ) new_sareas[ i ][ iS ] = - new_sareas[ i ][ iS ].intersect( + new_sareas[ i ][ iS ].intersected( (*it)->adjustedClientArea( desktopArea, screens[ iS ] ) ); } else { - new_wareas[ (*it)->desktop() ] = new_wareas[ (*it)->desktop() ].intersect( r ); + new_wareas[ (*it)->desktop() ] = new_wareas[ (*it)->desktop() ].intersected( r ); for( int iS = 0; iS < nscreens; iS ++ ) { // kDebug () << "adjusting new_sarea: " << screens[ iS ]; new_sareas[ (*it)->desktop() ][ iS ] = - new_sareas[ (*it)->desktop() ][ iS ].intersect( + new_sareas[ (*it)->desktop() ][ iS ].intersected( (*it)->adjustedClientArea( desktopArea, screens[ iS ] ) ); } @@ -161,7 +161,7 @@ void Workspace::updateClientArea( bool force ) for( int i = 1; i <= numberOfDesktops(); ++i ) - new_wareas[ i ] = new_wareas[ i ].intersect( topmenu_area ); + new_wareas[ i ] = new_wareas[ i ].intersected( topmenu_area ); } bool changed = force; diff --git a/popupinfo.cpp b/popupinfo.cpp index 883b5375f4..adc862a507 100644 --- a/popupinfo.cpp +++ b/popupinfo.cpp @@ -117,9 +117,9 @@ void PopupInfo::paintContents() p.setPen(Qt::white); p.drawText( r, AlignCenter, m_infoString ); p.setPen(Qt::black); - r.moveBy( -1, -1 ); + r.translate( -1, -1 ); p.drawText( r, AlignCenter, m_infoString ); - r.moveBy( -1, 0 ); + r.translate( -1, 0 ); */ p.drawText( r, Qt::AlignCenter, m_infoString ); } diff --git a/scene.cpp b/scene.cpp index 8903a9449d..6bbd712fb7 100644 --- a/scene.cpp +++ b/scene.cpp @@ -371,7 +371,7 @@ bool Scene::Window::isVisible() const return true; // Unmanaged is always visible // TODO there may be transformations, so ignore this for now return !toplevel->geometry() - .intersect( QRect( 0, 0, displayWidth(), displayHeight())) + .intersected( QRect( 0, 0, displayWidth(), displayHeight())) .isEmpty(); } diff --git a/scene_basic.cpp b/scene_basic.cpp index b99d6d1c20..32ba2d6f32 100644 --- a/scene_basic.cpp +++ b/scene_basic.cpp @@ -54,7 +54,7 @@ void SceneBasic::paint( QRegion, ToplevelList windows ) it != windows.end(); ++it ) { - QRect r = (*it)->geometry().intersect( QRect( 0, 0, displayWidth(), displayHeight())); + QRect r = (*it)->geometry().intersected( QRect( 0, 0, displayWidth(), displayHeight())); if( !r.isEmpty()) { Pixmap pix = (*it)->windowPixmap();