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

Timestamp:

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

Author:

erijo

Message:

Enable KDE4 support.

Files:

• branches/qt-gui_qt4/src/core/licqgui.cpp (modified) (3 diffs)

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

@@ -37 +37 @@
 #include <QTranslator>
 
+#ifdef USE_KDE
+#include <KDE/KStandardDirs>
+#include <KDE/KToolInvocation>
+#include <KDE/KUrl>
+#endif
+
 #if defined(Q_WS_X11)
 #include <QX11Info>
@@ -131 +137 @@
 LicqGui* LicqGui::myInstance = NULL;
 
-LicqGui::LicqGui(int& argc, char** argv)
-#ifdef USE_KDE
-  : KApplication(argc, argv, "licq"),
-#else
-  : QApplication(argc, argv),
+LicqGui::LicqGui(int& argc, char** argv) :
+#ifndef USE_KDE
+  QApplication(argc, argv),
 #endif
   myStartHidden(false),
@@ -1047 +1051 @@
 {
 #ifdef USE_KDE
-  KApplication* app = static_cast<KApplication*>(qApp);
   if (url.startsWith("mailto:"))
-    app->invokeMailer(KURL(url));
+    KToolInvocation::invokeMailer(KUrl(url));
   else
   // If no URL viewer is set, use KDE default
   if (!myLicqDaemon->getUrlViewer())
-    app->invokeBrowser(url);
+    KToolInvocation::invokeBrowser(url);
   else
 #else