diff --git a/clients/PORTING b/clients/PORTING
index 9a5fb9f6b3..4b6d3483d5 100644
--- a/clients/PORTING
+++ b/clients/PORTING
@@ -79,7 +79,7 @@ inline const KDecorationOptions* options() { return KDecoration::options(); }
 =====
 - Options for colors need 'Color' prepended (e.g. 'ColorButtonBg').
 - Replace miniIcon() with getting the right pixmap from icon() (usually
-    'icon().pixmap( QIconSet::Small, QIconSet::Normal )' ).
+    'icon().pixmap( QIcon::Small, QIcon::Normal )' ).
 - Replace stickyChange() with desktopChange(), and test isOnAllDesktops().
 - Replace Sticky with OnAllDestops.
 - Replace iconify with minimize.
diff --git a/clients/keramik/keramik.cpp b/clients/keramik/keramik.cpp
index 01125a51de..c84b614810 100644
--- a/clients/keramik/keramik.cpp
+++ b/clients/keramik/keramik.cpp
@@ -516,10 +516,10 @@ void KeramikHandler::addHeight (int height, QPixmap *&pix) {
 void KeramikHandler::flip( QPixmap *&pix1, QPixmap *&pix2 )
 {
 	// Flip the pixmaps horizontally
-	QPixmap *tmp = new QPixmap( pix1->transformed( QWMatrix(-1,0,0,1,pix1->width(),0) ) );
+	QPixmap *tmp = new QPixmap( pix1->transformed( QMatrix(-1,0,0,1,pix1->width(),0) ) );
 
 	delete pix1;
-	pix1 = new QPixmap( pix2->transformed( QWMatrix(-1,0,0,1,pix2->width(),0) ) );
+	pix1 = new QPixmap( pix2->transformed( QMatrix(-1,0,0,1,pix2->width(),0) ) );
 
 	delete pix2;
 	pix2 = tmp;
@@ -529,7 +529,7 @@ void KeramikHandler::flip( QPixmap *&pix1, QPixmap *&pix2 )
 void KeramikHandler::flip( QPixmap *&pix )
 {
 	// Flip the pixmap horizontally
-	QPixmap *tmp = new QPixmap( pix->transformed( QWMatrix(-1,0,0,1,pix->width(),0) ) );
+	QPixmap *tmp = new QPixmap( pix->transformed( QMatrix(-1,0,0,1,pix->width(),0) ) );
 	delete pix;
 	pix = tmp;
 }
diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp
index 4e8289e06c..390f9b8490 100644
--- a/clients/kwmtheme/kwmthemeclient.cpp
+++ b/clients/kwmtheme/kwmthemeclient.cpp
@@ -446,7 +446,7 @@ void KWMThemeClient::paintEvent( QPaintEvent *)
 		 w4, h4);
 
     QPixmap pm;
-    QWMatrix m;
+    QMatrix m;
     int n,s,w;
     //top
     pm = *framePixmaps[FrameTop];
@@ -626,7 +626,7 @@ void KWMThemeClient::doShape()
         p.fillRect(width()-w4,height()-h4,w4,h4,color1);
 
     QPixmap pm;
-    QWMatrix m;
+    QMatrix m;
     int n,s,w;
     //top
     if (framePixmaps[FrameTop]->mask())