[Uml-devel] KDE/kdesdk

[Stephan Binner]

SVN commit 659742 by binner:

port to new api


 M  +2 -2      kbabel/catalogmanager/catalogmanager.cpp  
 M  +1 -1      kbabel/catalogmanager/catalogmanagerapp.h  
 M  +1 -1      kbabel/catalogmanager/catalogmanagerview.cpp  
 M  +3 -3      kbabel/catalogmanager/main.cpp  
 M  +5 -5      kbabel/kbabel/kbabel.cpp  
 M  +1 -1      kbabel/kbabel/kbabelinterface.h  
 M  +3 -3      kbabel/kbabel/kbabelview.cpp  
 M  +1 -1      kbabel/kbabel/main.cpp  
 M  +1 -1      kbabel/kbabeldict/kbabeldictbox.cpp  
 M  +1 -1      kbabel/kbabeldict/main.cpp  
 M  +1 -1      kioslave/svn/svnhelper/kio_svn_helper.h  
 M  +4 -4      scripts/qt4/adapt-to-kde4-api.pl  
 M  +1 -1      umbrello/umbrello/main.cpp  


--- trunk/KDE/kdesdk/kbabel/catalogmanager/catalogmanager.cpp #659741:659742
@@ -79,7 +79,7 @@
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <ktoolbar.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <kxmlguifactory.h>
 
 #include <qfileinfo.h>
@@ -172,7 +172,7 @@
    connect(_catalogManager, SIGNAL(selectedChanged(uint)),
            this, SLOT(selectedChanged(uint)));
 #ifdef Q_OS_UNIX
-   KWM::setIcons(winId(),BarIcon("catalogmanager",32)
+   KWindowSystem::setIcons(winId(),BarIcon("catalogmanager",32)
            ,SmallIcon("catalogmanager"));
 #endif
    QHBoxLayout* hBoxL = new QHBoxLayout();
--- trunk/KDE/kdesdk/kbabel/catalogmanager/catalogmanagerapp.h #659741:659742
@@ -40,7 +40,7 @@
 #include "version.h"
 
 #include <kapplication.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 //Added by qt3to4:
 
 class CatalogManagerInterface : public  QObject 
--- trunk/KDE/kdesdk/kbabel/catalogmanager/catalogmanagerview.cpp #659741:659742
@@ -76,7 +76,7 @@
 #include <kaction.h>
 #include <kfiledialog.h>
 #include <kio/netaccess.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <kdeversion.h>
 #include <ktemporaryfile.h>
 
--- trunk/KDE/kdesdk/kbabel/catalogmanager/main.cpp #659741:659742
@@ -49,7 +49,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <kxmlguiwindow.h>
 
 #include <qfile.h>
@@ -81,7 +81,7 @@
     {
 	_view->raise();
 #ifdef Q_OS_UNIX
-	KWM::activateWindow(_view->winId());
+	KWindowSystem::activateWindow(_view->winId());
 #endif
     }
 }
@@ -148,7 +148,7 @@
 	_view->show();
 	_view->raise();
 #ifdef Q_OS_UNIX
-	KWM::activateWindow(_view->winId());
+	KWindowSystem::activateWindow(_view->winId());
 #endif
 	args->clear();
     }
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabel.cpp #659741:659742
@@ -88,7 +88,7 @@
 #include <qprogressbar.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <kaction.h>
 #include <kstandardaction.h>
 #include <k3spelldlg.h>
@@ -1143,7 +1143,7 @@
    if(view)
    {
 #ifdef Q_OS_UNIX
-       KWM::activateWindow(view->topLevelWidget()->winId());
+       KWindowSystem::activateWindow(view->topLevelWidget()->winId());
 #endif
        return;
    }
@@ -1165,7 +1165,7 @@
    {
         kDebug(KBABEL) << "there is a such view" << endl;
 #ifdef Q_OS_UNIX
-       KWM::activateWindow(view->topLevelWidget()->winId());
+       KWindowSystem::activateWindow(view->topLevelWidget()->winId());
 #endif
        return;
    }
@@ -1368,7 +1368,7 @@
 
     _prefDialog->raise();
 #ifdef Q_OS_UNIX
-    KWM::activateWindow(_prefDialog->winId());
+    KWindowSystem::activateWindow(_prefDialog->winId());
 #endif
 }
 
@@ -1957,7 +1957,7 @@
 
     _projectDialog->raise();
 #ifdef Q_OS_UNIX
-    KWM::activateWindow(_projectDialog->winId());
+    KWindowSystem::activateWindow(_projectDialog->winId());
 #endif
 }
 
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelinterface.h #659741:659742
@@ -3,7 +3,7 @@
 #ifndef KBABELINTERFACE_H
 #define KBABELINTERFACE_H
 
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <QByteArray>
 #include <kurl.h>
 #include <kbabel.h>
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelview.cpp #659741:659742
@@ -82,7 +82,7 @@
 #include <ktemporaryfile.h>
 #include <k3spell.h>
 #include <k3sconfig.h>
-#include <kwm.h>
+#include <kwindowsytem.h>
 #include <kstandardshortcut.h>
 #include <k3urldrag.h>
 #include <kglobalsettings.h>
@@ -1091,7 +1091,7 @@
    if(checkIfModified && !url.isEmpty() && cu==url)
    {
 #ifdef Q_OS_UNIX
-       KWM::activateWindow(topLevelWidget()->winId());
+       KWindowSystem::activateWindow(topLevelWidget()->winId());
 #endif
        return;
    }
@@ -1132,7 +1132,7 @@
 	   }
 	   else {
 #ifdef Q_OS_UNIX
-	        KWM::activateWindow(v->topLevelWidget()->winId());
+	        KWindowSystem::activateWindow(v->topLevelWidget()->winId());
 #endif
         	return;
 	   }
--- trunk/KDE/kdesdk/kbabel/kbabel/main.cpp #659741:659742
@@ -48,7 +48,7 @@
 #include <kmessagebox.h>
 #include <kuniqueapplication.h>
 
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <QtDBus/QtDBus>
 
 #include <qfile.h>
--- trunk/KDE/kdesdk/kbabel/kbabeldict/kbabeldictbox.cpp #659741:659742
@@ -53,7 +53,7 @@
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <kservicetypetrader.h>
 
 #include <qclipboard.h>
--- trunk/KDE/kdesdk/kbabel/kbabeldict/main.cpp #659741:659742
@@ -38,7 +38,7 @@
 #include <kcursor.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 
 #include <qtimer.h>
 
--- trunk/KDE/kdesdk/kioslave/svn/svnhelper/kio_svn_helper.h #659741:659742
@@ -22,7 +22,7 @@
 
 #include <kapplication.h>
 #include <kio/job.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <qstringlist.h>
 #include "ui_subversioncheckout.h"
 #include "ui_subversionswitch.h"
--- trunk/KDE/kdesdk/scripts/qt4/adapt-to-kde4-api.pl #659741:659742
@@ -135,10 +135,10 @@
     s!#include <kstddirs.h>!#include <kstandarddirs.h>!;
     s!#include <kcodecs.h>!#include <kcodecs.h>!;
 
-    s!#include <kwin.h>!#include <kwm.h>!;
-    s!#include <kwinmodule.h>!#include <kwm.h>!;
-    s!\bKWin\b!KWM!g;
-    s!\bKWinModule\b!KWM!g;
+    s!#include <kwin.h>!#include <kwindowsystem.h>!;
+    s!#include <kwinmodule.h>!#include <kwindowsystem.h>!;
+    s!\bKWin\b!KWindowSystem!g;
+    s!\bKWinModule\b!KWindowSystem!g;
 
     # kde3support
     s!#include <kactivelabel.h>!#include <k3activelabel.h>!;
--- trunk/KDE/kdesdk/umbrello/umbrello/main.cpp #659741:659742
@@ -19,7 +19,7 @@
 #include <klocale.h>
 #include <ktip.h>
 #include <kdebug.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 
 // app includes
 #include "uml.h"