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

Timestamp:

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

Author:

erijo

Message:

Enable KDE4 support.

Files:

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

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);