Changeset 6048

Timestamp:

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

Author:

erijo

Message:

Enable KDE4 support.

Location:

branches/qt-gui_qt4

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/config/general.cpp (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/licqgui.cpp (modified) (3 diffs)
• src/core/licqgui.h (modified) (1 diff)
• src/core/mainwin.cpp (modified) (10 diffs)
• src/core/messagebox.cpp (modified) (3 diffs)
• src/core/plugin.cpp (modified) (2 diffs)
• src/dialogs/filedlg.cpp (modified) (1 diff)
• src/dialogs/logwindow.cpp (modified) (2 diffs)
• src/dialogs/plugindlg.cpp (modified) (2 diffs)
• src/dialogs/userinfodlg.cpp (modified) (2 diffs)
• src/helpers/support.cpp (modified) (2 diffs)
• src/settings/events.cpp (modified) (11 diffs)
• src/settings/events.h (modified) (2 diffs)
• src/settings/general.cpp (modified) (1 diff)
• src/userevents/usereventcommon.cpp (modified) (1 diff)
• src/userevents/usereventcommon.h (modified) (2 diffs)
• src/userevents/usereventtabdlg.cpp (modified) (2 diffs)
• src/userevents/usersendchatevent.cpp (modified) (1 diff)
• src/userevents/usersendcommon.cpp (modified) (2 diffs)
• src/userevents/usersendfileevent.cpp (modified) (3 diffs)
• src/userevents/userviewevent.cpp (modified) (2 diffs)

branches/qt-gui_qt4/CMakeLists.txt

@@ -70 +70 @@
 set(QT_MIN_VERSION "4.3.0")
 
-find_package(Qt4 REQUIRED)
+# Check for Qt unless WITH_KDE is requested
+if (NOT WITH_KDE)
+  find_package(Qt4 REQUIRED)
+else (NOT WITH_KDE)
+  find_package(KDE4 REQUIRED)
+  set(USE_KDE ${KDE4_FOUND})
+
+  # FindKDE4Internal adds "-Wl,--no-undefined" to the linker command
+  # line. This doesn't work for use, since all symbols from the daemon
+  # are undefined. So we remove it.
+  string(REPLACE "-Wl,--no-undefined" ""
+    CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
+
+  # FindKDE4Internal adds "-fvisibility=hidden" to the compiler
+  # command line. This hides symbols in the plugin that the daemon
+  # looks for. So we remove it.
+  string(REPLACE "-fvisibility=hidden" ""
+    CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
+  add_definitions(${KDE4_DEFINITIONS})
+  link_directories(${KDE4_LIB_DIR})
+
+  include_directories(${KDE4_INCLUDE_DIR})
+  set(LIBRARIES ${LIBRARIES}
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KIO_LIBS})
+endif (NOT WITH_KDE)
+
 include_directories(${QT_INCLUDE_DIR}
   ${QT_QTCORE_INCLUDE_DIR}
@@ -89 +117 @@
   set(LIBRARIES ${LIBRARIES} ${GPGME_LIBRARIES})
 endif (GPGME_FOUND)
-
-
-# Optional, check for KDE4
-if (WITH_KDE)
-  message(FATAL_ERROR "KDE4 not yet supported. Please compile without KDE support.")
-  find_package(KDE4 REQUIRED)
-  set(USE_KDE ${KDE4_FOUND})
-
-  add_definitions(${KDE4_DEFINITIONS})
-  link_directories(${KDE4_LIB_DIR})
-  include_directories(${KDE4_INCLUDE_DIR})
-  set(LIBRARIES ${LIBRARIES} kdeui kio kabc)
-endif (WITH_KDE)
 
 

branches/qt-gui_qt4/src/config/general.cpp

@@ -25 +25 @@
 #include <QApplication>
 #include <QDesktopWidget>
+
+#ifdef USE_KDE
+#include <KDE/KGlobalSettings>
+#endif
 
 #include <licq_file.h>

branches/qt-gui_qt4/src/core/CMakeLists.txt

@@ -10 +10 @@
 
 # KDE specific stuff
-if (WITH_KDE)
-  list(APPEND core_SRCS licqkimiface.cpp wrap_kde_malloc.cpp)
+# if (WITH_KDE)
+#   list(APPEND core_SRCS licqkimiface.cpp wrap_kde_malloc.cpp)
 
-  kde4_add_dcop_skels(core_SRCS kimiface.h)
-  kde4_add_dcop_stubs(core_SRCS kimiface.h)
-endif (WITH_KDE)
+#   kde4_add_dcop_skels(core_SRCS kimiface.h)
+#   kde4_add_dcop_stubs(core_SRCS kimiface.h)
+# endif (WITH_KDE)
 
 string(REGEX REPLACE ".cpp" ".h" core_HDRS "${core_SRCS}")

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

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

@@ -24 +24 @@
 
 #ifdef USE_KDE
-#include <kapp.h>
+#include <KDE/KApplication>
 #else
 #include <QApplication>

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
 }

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

@@ -37 +37 @@
 
 #ifdef USE_KDE
-#include <kapp.h>
-#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <KDE/KApplication>
+#include <KDE/KIconLoader>
+#include <KDE/KMessageBox>
 #endif
 
@@ -65 +65 @@
 #ifdef USE_KDE
   result = (KMessageBox::questionYesNo(q, szQuery, QMessageBox::tr("Licq Question"),
-        szBtn1, szBtn2, QString::null, false) == KMessageBox::Yes);
+        KGuiItem(szBtn1), KGuiItem(szBtn2)) == KMessageBox::Yes);
   // The user must confirm his decision!
-  if (result == true && bConfirmYes && szConfirmYes)
-    result = (KMessageBox::questionYesNo(q, szConfirmYes, QMessageBox::tr("Licq Question"),
-          QMessageBox::tr("Yes"), QMessageBox::tr("No"), QString::null, false) == KMessageBox::Yes);
-  else if (result == false && bConfirmNo && szConfirmNo)
-    result = (KMessageBox::questionYesNo(q, szConfirmNo, QMessageBox::tr("Licq Question"),
-          QMessageBox::tr("Yes"), QMessageBox::tr("No"), QString::null, false) == KMessageBox::Yes);
+  if (result == true && bConfirmYes && !szConfirmYes.isEmpty())
+    result = (KMessageBox::questionYesNo(q, szConfirmYes,
+          QMessageBox::tr("Licq Question")) == KMessageBox::Yes);
+  else if (result == false && bConfirmNo && !szConfirmNo.isEmpty())
+    result = (KMessageBox::questionYesNo(q, szConfirmNo,
+          QMessageBox::tr("Licq Question")) == KMessageBox::Yes);
 #else
   result = (QMessageBox::question(q, QMessageBox::tr("Licq Question"), szQuery,
@@ -407 +407 @@
   }
 
-  QPixmap icon = KApplication::kApplication()->iconLoader()->loadIcon(iconName,
-    KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
+  QPixmap icon = KIconLoader::global()->loadIcon(iconName,
+    KIconLoader::NoGroup, KIconLoader::SizeMedium, KIconLoader::DefaultState,
+    QStringList(), 0, true);
   if (icon.isNull())
     icon = QMessageBox::standardIcon(type);

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

@@ -24 +24 @@
 #include <QString>
 #include <QStyleFactory>
+
+#ifdef USE_KDE
+#include <KDE/KCmdLineArgs>
+#endif
 
 #include <licq_log.h>
@@ -120 +124 @@
   // Don't use the KDE crash handler (drkonqi).
   setenv("KDE_DEBUG", "true", 0);
+
+  KCmdLineArgs::init(myArgc, myArgv,
+                     "licq", "qt4-gui",
+                     ki18n(LP_Name()), VERSION);
 #endif
 

branches/qt-gui_qt4/src/dialogs/filedlg.cpp

@@ -252 +252 @@
   QString d;
 #ifdef USE_KDE
-  d = KFileDialog::getExistingDirectory(QString(QDir::homeDirPath()), this);
+  d = KFileDialog::getExistingDirectory(QString(QDir::homePath()), this);
 #else
   d = QFileDialog::getExistingDirectory(this, QString(), QDir::homePath());

branches/qt-gui_qt4/src/dialogs/logwindow.cpp

@@ -34 +34 @@
 
 #ifdef USE_KDE
-#include <kfiledialog.h>
+#include <KDE/KFileDialog>
 #else
 #include <QFileDialog>
@@ -122 +122 @@
 
 #ifdef USE_KDE
-  KURL u = KFileDialog::getSaveURL(QString(QDir::homePath() + "/licq.log"),
+  KUrl u = KFileDialog::getSaveUrl(QString(QDir::homePath() + "/licq.log"),
       QString::null, this);
   fn = u.path();

branches/qt-gui_qt4/src/dialogs/plugindlg.cpp

@@ -312 +312 @@
     (*sit).remove(0, 5);
     (*sit).truncate((*sit).length() - 3);
-    if (::find(lLoadedSPlugins.begin(), lLoadedSPlugins.end(), (*sit).toStdString()) != lLoadedSPlugins.end())
+    if (::find(lLoadedSPlugins.begin(), lLoadedSPlugins.end(),
+               (*sit).toAscii().constData()) != lLoadedSPlugins.end())
       continue;
 
@@ -363 +364 @@
     (*sit).remove(0, 9);
     (*sit).truncate((*sit).length() - 3);
-    if (::find(lLoadedPPlugins.begin(), lLoadedPPlugins.end(), (*sit).toStdString()) != lLoadedPPlugins.end())
+    if (::find(lLoadedPPlugins.begin(), lLoadedPPlugins.end(),
+               (*sit).toAscii().constData()) != lLoadedPPlugins.end())
       continue;
 

branches/qt-gui_qt4/src/dialogs/userinfodlg.cpp

@@ -45 +45 @@
 
 #ifdef USE_KDE
-#include <kfiledialog.h>
+#include <KDE/KFileDialog>
 #include <kdeversion.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseedialog.h>
-#include "licqkimiface.h"
-#define USE_KABC
+
+// TODO
+//#include <kabc/stdaddressbook.h>
+//#include <kabc/addressee.h>
+//#include <kabc/addresseedialog.h>
+//#include "licqkimiface.h"
+//#define USE_KABC
 #else
 #include <QFileDialog>
@@ -2130 +2132 @@
     {
 #ifdef USE_KDE
-      Filename = KFileDialog::getOpenFileName(QString::null,
+      Filename = KFileDialog::getOpenFileName(KUrl(),
           "Images (*.bmp *.jpg *.jpeg *.jpe *.gif)", this,
           tr("Select your picture"));

branches/qt-gui_qt4/src/helpers/support.cpp

@@ -25 +25 @@
 
 #if defined(USE_KDE)
-#include <kwin.h>
+#include <KDE/KWindowSystem>
 #endif
 
@@ -49 +49 @@
 
 #if defined(USE_KDE)
-  KWin::setOnAllDesktops(win, stick);
+  KWindowSystem::setOnAllDesktops(win, stick);
 #elif defined(Q_WS_X11)
 

branches/qt-gui_qt4/src/settings/events.cpp

@@ -29 +29 @@
 #include <QVBoxLayout>
 
+#ifdef USE_KDE
+#include <KDE/KUrlRequester>
+#include <QLineEdit>
+#endif
+
 #include <licq_icqd.h>
 #include <licq_onevent.h>
@@ -159 +164 @@
   laySndTopRow->addWidget(lblSndPlayer);
 
-  edtSndPlayer = new KURLRequester();
+  edtSndPlayer = new KUrlRequester();
   edtSndPlayer->setToolTip(lblSndPlayer->toolTip());
   lblSndPlayer->setBuddy(edtSndPlayer);
@@ -171 +176 @@
   lblSndMsg->setToolTip(tr("Parameter for received messages"));
   layEventParams->addWidget(lblSndMsg, 0, 0);
-  edtSndMsg = new KURLRequester();
+  edtSndMsg = new KUrlRequester();
   edtSndMsg->setToolTip(lblSndMsg->toolTip());
   lblSndMsg->setBuddy(edtSndMsg);
@@ -179 +184 @@
   lblSndUrl->setToolTip(tr("Parameter for received URLs"));
   layEventParams->addWidget(lblSndUrl, 1, 0);
-  edtSndUrl = new KURLRequester();
+  edtSndUrl = new KUrlRequester();
   edtSndUrl->setToolTip(lblSndUrl->toolTip());
   lblSndUrl->setBuddy(edtSndUrl);
@@ -187 +192 @@
   lblSndChat->setToolTip(tr("Parameter for received chat requests"));
   layEventParams->addWidget(lblSndChat, 2, 0);
-  edtSndChat = new KURLRequester();
+  edtSndChat = new KUrlRequester();
   edtSndChat->setToolTip(lblSndChat->toolTip());
   lblSndChat->setBuddy(edtSndChat);
@@ -195 +200 @@
   lblSndFile->setToolTip(tr("Parameter for received file transfers"));
   layEventParams->addWidget(lblSndFile, 3, 0);
-  edtSndFile = new KURLRequester();
+  edtSndFile = new KUrlRequester();
   edtSndFile->setToolTip(lblSndFile->toolTip());
   lblSndFile->setBuddy(edtSndFile);
@@ -203 +208 @@
   lblSndNotify->setToolTip(tr("Parameter for online notification"));
   layEventParams->addWidget(lblSndNotify, 4, 0);
-  edtSndNotify = new KURLRequester();
+  edtSndNotify = new KUrlRequester();
   edtSndNotify->setToolTip(lblSndNotify->toolTip());
   lblSndNotify->setBuddy(edtSndNotify);
@@ -211 +216 @@
   lblSndSysMsg->setToolTip(tr("Parameter for received system messages"));
   layEventParams->addWidget(lblSndSysMsg, 5, 0);
-  edtSndSysMsg = new KURLRequester();
+  edtSndSysMsg = new KUrlRequester();
   edtSndSysMsg->setToolTip(lblSndSysMsg->toolTip());
   lblSndSysMsg->setBuddy(edtSndSysMsg);
@@ -219 +224 @@
   lblSndMsgSent->setToolTip(tr("Parameter for sent messages"));
   layEventParams->addWidget(lblSndMsgSent, 6, 0);
-  edtSndMsgSent = new KURLRequester();
+  edtSndMsgSent = new KUrlRequester();
   edtSndMsgSent->setToolTip(lblSndMsgSent->toolTip());
   lblSndMsgSent->setBuddy(edtSndMsgSent);
@@ -303 +308 @@
   chkOnEvents->setChecked(oem->CommandType() != ON_EVENT_IGNORE);
   oem->Lock();
-  edtSndPlayer->setURL(oem->Command());
-  edtSndMsg->setURL(oem->Parameter(ON_EVENT_MSG));
-  edtSndUrl->setURL(oem->Parameter(ON_EVENT_URL));
-  edtSndChat->setURL(oem->Parameter(ON_EVENT_CHAT));
-  edtSndFile->setURL(oem->Parameter(ON_EVENT_FILE));
-  edtSndNotify->setURL(oem->Parameter(ON_EVENT_NOTIFY));
-  edtSndSysMsg->setURL(oem->Parameter(ON_EVENT_SYSMSG));
-  edtSndMsgSent->setURL(oem->Parameter(ON_EVENT_MSGSENT));
+  edtSndPlayer->setUrl(KUrl(oem->Command()));
+  edtSndMsg->setUrl(KUrl(oem->Parameter(ON_EVENT_MSG)));
+  edtSndUrl->setUrl(KUrl(oem->Parameter(ON_EVENT_URL)));
+  edtSndChat->setUrl(KUrl(oem->Parameter(ON_EVENT_CHAT)));
+  edtSndFile->setUrl(KUrl(oem->Parameter(ON_EVENT_FILE)));
+  edtSndNotify->setUrl(KUrl(oem->Parameter(ON_EVENT_NOTIFY)));
+  edtSndSysMsg->setUrl(KUrl(oem->Parameter(ON_EVENT_SYSMSG)));
+  edtSndMsgSent->setUrl(KUrl(oem->Parameter(ON_EVENT_MSGSENT)));
   oem->Unlock();
   //TODO make general for all plugins
@@ -357 +362 @@
   oem->SetCommandType(chkOnEvents->isChecked() ? ON_EVENT_RUN : ON_EVENT_IGNORE);
 
-  QString txtSndPlayer = edtSndPlayer->url();
-  QString txtSndMsg = edtSndMsg->url();
-  QString txtSndUrl = edtSndUrl->url();
-  QString txtSndChat = edtSndChat->url();
-  QString txtSndFile = edtSndFile->url();
-  QString txtSndNotify = edtSndNotify->url();
-  QString txtSndSysMsg = edtSndSysMsg->url();
-  QString txtSndMsgSent = edtSndMsgSent->url();
+  QString txtSndPlayer = edtSndPlayer->url().pathOrUrl();
+  QString txtSndMsg = edtSndMsg->url().pathOrUrl();
+  QString txtSndUrl = edtSndUrl->url().pathOrUrl();
+  QString txtSndChat = edtSndChat->url().pathOrUrl();
+  QString txtSndFile = edtSndFile->url().pathOrUrl();
+  QString txtSndNotify = edtSndNotify->url().pathOrUrl();
+  QString txtSndSysMsg = edtSndSysMsg->url().pathOrUrl();
+  QString txtSndMsgSent = edtSndMsgSent->url().pathOrUrl();
 
   const char* oemparams[8] = {

branches/qt-gui_qt4/src/settings/events.h

@@ -33 +33 @@
 
 #ifdef USE_KDE
-class KURLRequester;
+class KUrlRequester;
+class QLineEdit;
 #else
 #include <QLineEdit>
-class KURLRequester : public QLineEdit
+class KUrl
 {
 public:
-  KURLRequester(QWidget* parent=0, const char* /* name */ = NULL)
+  KUrl(const char* url) : myUrl(url) {}
+  KUrl(const QString& url) : myUrl(url) {}
+  QString pathOrUrl() const { return myUrl; }
+
+private:
+  QString myUrl;
+};
+
+class KUrlRequester : public QLineEdit
+{
+public:
+  KUrlRequester(QWidget* parent=0, const char* /* name */ = NULL)
     : QLineEdit(parent) {};
-  void setURL(const QString& url) { setText(url); }
-  QString url() const { return text(); }
+  void setUrl(const KUrl& url) { setText(url.pathOrUrl()); }
+  KUrl url() const { return KUrl(text()); }
 };
 #endif
@@ -121 +133 @@
   QLabel* lblSndSysMsg;
   QLabel* lblSndMsgSent;
-  KURLRequester* edtSndPlayer;
-  KURLRequester* edtSndMsg;
-  KURLRequester* edtSndChat;
-  KURLRequester* edtSndUrl;
-  KURLRequester* edtSndFile;
-  KURLRequester* edtSndNotify;
-  KURLRequester* edtSndSysMsg;
-  KURLRequester* edtSndMsgSent;
+  KUrlRequester* edtSndPlayer;
+  KUrlRequester* edtSndMsg;
+  KUrlRequester* edtSndChat;
+  KUrlRequester* edtSndUrl;
+  KUrlRequester* edtSndFile;
+  KUrlRequester* edtSndNotify;
+  KUrlRequester* edtSndSysMsg;
+  KUrlRequester* edtSndMsgSent;
 };
 

branches/qt-gui_qt4/src/settings/general.cpp

@@ -35 +35 @@
 #include <QVBoxLayout>
 
+#ifdef USE_KDE
+#include <KDE/KFontDialog>
+#endif
+
 #include <licq_constants.h>
 

branches/qt-gui_qt4/src/userevents/usereventcommon.cpp

@@ -384 +384 @@
 void UserEventCommon::