Changeset 6048 for branches/qt-gui_qt4/src/core/mainwin.cpp

Timestamp:

01/15/08 07:13:45 (10 months ago)

Author:

erijo

Message:

Enable KDE4 support.

Files:

• branches/qt-gui_qt4/src/core/mainwin.cpp (modified) (10 diffs)

branches/qt-gui_qt4/src/core/mainwin.cpp

@@ -27 +27 @@
 
 #ifdef USE_KDE
-#include <kapp.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <kstandarddirs.h>
-#include <kwin.h>
-#include <kiconloader.h>
-#include <kurl.h>
-#include <kpassivepopup.h>
+#include <KDE/KApplication>
+#include <KDE/KGlobal>
+#include <KDE/KGlobalSettings>
+#include <KDE/KStandardDirs>
+#include <KDE/KWindowSystem>
+#include <KDE/KIconLoader>
+#include <KDE/KUrl>
+#include <KDE/KPassivePopup>
 #else
 #include <QApplication>
@@ -105 +105 @@
 
 #ifdef USE_KDE
-    #include "licqkimiface.h"
-    #include "dcopclient.h"
+// TODO
+// #include "licqkimiface.h"
+// #include "dcopclient.h"
 #endif
 
@@ -256 +257 @@
 
 #ifdef USE_KDE
+  /* TODO
   kdeIMInterface = new LicqKIMIface(KApplication::dcopClient()->appId(), this);
   connect(kdeIMInterface,
@@ -271 +273 @@
       SIGNAL(addUser(const char*, unsigned long)),
       SLOT(addUser(const char*, unsigned long)));
+  */
 #endif
 
@@ -276 +279 @@
   {
 #ifdef USE_KDE
-    kdeIMInterface->addProtocol((*_ppit)->Name(), (*_ppit)->PPID());
+    // TODO
+    // kdeIMInterface->addProtocol((*_ppit)->Name(), (*_ppit)->PPID());
 #endif
     if ((*_ppit)->PPID() != LICQ_PPID) // XXX To be removed later
@@ -316 +320 @@
     show();
 #ifdef USE_KDE
-    KWin::setOnDesktop(winId(), KWin::currentDesktop());
+    KWindowSystem::setOnDesktop(winId(), KWindowSystem::currentDesktop());
 #endif
     if (isMaximized())
@@ -581 +585 @@
     case USER_STATUS:
 #ifdef USE_KDE
-      kdeIMInterface->userStatusChanged(id, ppid);
+      // TODO
+      // kdeIMInterface->userStatusChanged(id, ppid);
 #endif
     case USER_BASIC:
@@ -635 +640 @@
           alias.replace(QChar('>'), "&gt;");
 
-          QString msg(tr("%1 is online")).arg("<b>" + alias + "</b>");
+          QString msg(tr("%1 is online").arg("<b>" + alias + "</b>"));
           QPixmap px = IconManager::instance()->iconForStatus(u->StatusFull(), u->IdString(), u->PPID());
-          KPassivePopup::message("Licq", msg, px, LicqGui::instance()->dockIcon(), NULL, 4000);
+          KPassivePopup::message("Licq", msg, px, LicqGui::instance()->dockIcon(), 4000);
         }
 #endif
@@ -939 +944 @@
 
 #ifdef USE_KDE
-    // let KDE IM interface know about the new protocol
-    kdeIMInterface->addProtocol(QString(pName), nPPID);
+  // TODO
+  // let KDE IM interface know about the new protocol
+  // kdeIMInterface->addProtocol(QString(pName), nPPID);
 #endif
 }
@@ -1006 +1012 @@
 
 #ifdef USE_KDE
-  kdeIMInterface->removeProtocol(_nPPID);
+  // TODO
+  // kdeIMInterface->removeProtocol(_nPPID);
 #endif
 }