generic: replace KColorDialog with QColorDialog

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

kate/part/dialogs/katedialogs.cpp

@@ -63,7 +63,6 @@
 #include <kcharsets.h>
 #include <kcolorbutton.h>
 #include <kcolorcombo.h>
-#include <kcolordialog.h>
 #include <kcombobox.h>
 #include <kconfig.h>
 #include <kdebug.h>

kate/part/schema/katecolortreewidget.cpp

@@ -23,13 +23,14 @@
 #include <QtGui/QStyledItemDelegate>
 #include <QtGui/QPainter>
 #include <QtGui/QHeaderView>
+#include <QtGui/QColorDialog>
 
 #include <klocale.h>
 #include <kconfiggroup.h>
 #include <kdebug.h>
-#include <kcolordialog.h>
 #include <kcolorscheme.h>
 #include <kcolorutils.h>
+#include <kdialog.h>
 
 #include <QDebug>
 #include <QEvent>
@@ -267,7 +268,8 @@ bool KateColorTreeWidget::edit(const QModelIndex& index, EditTrigger trigger, QE
     QColor color = item->useDefaultColor() ? item->defaultColor() : item->color();
 
     if (index.column() == 1) {
-      if (KColorDialog::getColor(color, item->defaultColor(), this) == QDialog::Accepted) {
+      color = QColorDialog::getColor(color, this, KDialog::makeStandardCaption(i18n("Select Color"), this));
+      if (color.isValid()) {
         item->setUseDefaultColor(false);
         item->setColor(color);
         viewport()->update();

kate/part/schema/katestyletreewidget.cpp

@@ -26,13 +26,14 @@
 #include <QtGui/QAction>
 #include <QtGui/QStyledItemDelegate>
 #include <QtGui/QHeaderView>
+#include <QtGui/QColorDialog>
 
 #include <klocale.h>
 #include <kicon.h>
 #include <kcolorscheme.h>
 #include <kmenu.h>
 #include <kmessagebox.h>
-#include <kcolordialog.h>
+#include <kdialog.h>
 
 #include "kateconfig.h"
 #include "kateextendedattribute.h"
@@ -638,7 +639,11 @@ void KateStyleTreeWidgetItem::setColor( int column )
     d = defaultStyle->selectedBackground().color();
   }
 
-  if ( KColorDialog::getColor( c, d, treeWidget() ) != QDialog::Accepted) return;
+  if (!c.isValid()) {
+    c = d;
+  }
+  c = QColorDialog::getColor( c, treeWidget(), KDialog::makeStandardCaption(i18n("Select Color"), treeWidget()) );
+  if (!c.isValid()) return;
 
   bool def = ! c.isValid();
 

kcontrol/colors/colorscm.cpp

@@ -28,11 +28,12 @@
 #include <QtGui/QStackedWidget>
 #include <QtGui/QPainter>
 #include <QtGui/QBitmap>
-#include <QtDBus/QtDBus>
+#include <QtGui/QColorDialog>
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusConnection>
 
 #include <KAboutData>
 #include <KColorButton>
-#include <KColorDialog>
 #include <KDebug>
 #include <KFileDialog>
 #include <KGlobal>
@@ -456,8 +457,8 @@ void KColorCm::variesClicked()
     // find which button was changed
     const int row = sender()->objectName().toInt();
 
-    QColor color;
+    QColor color = QColorDialog::getColor(color, this, KDialog::makeStandardCaption(i18n("Select Color"), this));
-    if(KColorDialog::getColor(color, this ) != QDialog::Rejected )
+    if(color.isValid())
     {
         changeColor(row, color);
         m_stackedWidgets[row - 9]->setCurrentIndex(0);

kdialog/kdialog.cpp

@@ -21,6 +21,7 @@
 //
 
 #include <QtCore/qdatetime.h>
+#include <QtGui/qcolordialog.h>
 #include <kdebug.h>
 #include "widgets.h"
 
@@ -33,7 +34,6 @@
 #include <kfiledialog.h>
 #include <kfileitem.h>
 #include <kicondialog.h>
-#include <kcolordialog.h>
 #include <kwindowsystem.h>
 #include <kiconloader.h>
 #include <klocale.h>
@@ -746,22 +746,25 @@ static int directCommand(KCmdLineArgs *args)
 
     // --getcolor
     if (args->isSet("getcolor")) {
-        KColorDialog dlg((QWidget*)0L, true);
+        QColorDialog dlg((QWidget*)0L);
+        dlg.setModal(true);
 
+        QColor defaultColor;
         if (args->isSet("default")) {
             defaultEntry = args->getOption("default");
-            dlg.setColor(defaultEntry);
+            defaultColor = QColor(defaultEntry);
+            dlg.setCurrentColor(defaultColor);
         }
         Widgets::handleXGeometry(&dlg);
         kapp->setTopWidget(&dlg);
-        dlg.setCaption(title.isEmpty() ? i18nc("@title:window", "Choose Color") : title);
+        dlg.setWindowTitle(title.isEmpty() ? KDialog::makeStandardCaption(i18nc("@title:window", "Choose Color")) : title);
 
-        if (dlg.exec() == KColorDialog::Accepted) {
+        if (dlg.exec() == QColorDialog::Accepted) {
             QString result;
-            if (dlg.color().isValid()) {
+            if (dlg.currentColor().isValid()) {
-                result = dlg.color().name();
+                result = dlg.currentColor().name();
             } else {
-                result = dlg.defaultColor().name();
+                result = defaultColor.name();
             }
             cout << result.toLocal8Bit().data() << endl;
             return 0;

konsole/src/ColorSchemeEditor.cpp

@@ -20,12 +20,12 @@
 // Own
 #include "ColorSchemeEditor.h"
 
-// Qt
+// Katie
-#include <QtGui/QFontMetrics>
 #include <QtCore/QFileInfo>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QColorDialog>
 
 // KDE
-#include <KColorDialog>
 #include <KWindowSystem>
 #include <KFileDialog>
 #include <KUrlCompletion>
@@ -139,9 +139,9 @@ void ColorSchemeEditor::editColorItem(QTableWidgetItem* item)
     }
 
     QColor color = item->background().color();
-    int result = KColorDialog::getColor(color);
+    color = QColorDialog::getColor(color, nullptr, KDialog::makeStandardCaption(i18n("Select Color"), nullptr));
 
-    if (result == KColorDialog::Accepted) {
+    if (color.isValid()) {
         item->setBackground(color);
 
         int colorSchemeRow = item->row();

ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp

@@ -20,7 +20,7 @@
 */
 
 #include <kacceleratormanager.h>
-#include <kcolordialog.h>
+#include <kdialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <knuminput.h>
@@ -39,6 +39,7 @@
 #include <QtGui/QPixmap>
 #include <QtGui/QPushButton>
 #include <QtGui/QTreeView>
+#include <QtGui/QColorDialog>
 
 #include <limits>
 
@@ -452,14 +453,16 @@ void FancyPlotterSettings::editSensor()
 
   SensorModelEntry sensor = mModel->sensor( index );
 
-  KColorDialog dialog(this, true);
+  QColorDialog dialog(this);
+  dialog.setModal(true);
+  dialog.setWindowTitle(KDialog::makeStandardCaption(i18n("Select Color"), this));
   connect(&dialog, SIGNAL(colorSelected(QColor)), this, SLOT(setColorForSelectedItem(QColor)));
   QColor color = sensor.color();
-  dialog.setColor(color);
+  dialog.setCurrentColor(color);
   int result = dialog.exec();
 
-  if ( result == KColorDialog::Accepted )
+  if ( result == QColorDialog::Accepted )
-    sensor.setColor( dialog.color() );
+    sensor.setColor( dialog.currentColor() );
   //If it's not accepted, make sure we set the color back to how it was
   mModel->setSensor( sensor, index );
 }

qguiplatformplugin_kde/qguiplatformplugin_kde.cpp

@@ -28,13 +28,11 @@
 #include <KConfigGroup>
 #include <KIcon>
 #include <KFileDialog>
-#include <KColorDialog>
 #include <KDebug>
 #include <QtCore/QHash>
 #include <QtCore/QTextStream>
 #include <QtCore/QTimer>
 #include <QtGui/QFileDialog>
-#include <QtGui/QColorDialog>
 #include <QtGui/QApplication>
 #include <QtGui/QToolButton>
 #include <QtGui/QToolBar>
@@ -129,32 +127,7 @@ private Q_SLOTS:
     }
 };
 
-class KColorDialogBridge : public KColorDialog
-{
-public:
-    KColorDialogBridge(QColorDialog* original_ = 0L) : KColorDialog(original_, true) , original(original_)
-    {
-        connect(this, SIGNAL(colorSelected(QColor)), original, SIGNAL(currentColorChanged(QColor)));
-    }
-
-    QColorDialog *original;
-
-    virtual void accept()
-    {
-        KColorDialog::accept();
-        original->setCurrentColor(color());
-        QMetaObject::invokeMethod(original, "accept"); //workaround protected
-    }
-
-    virtual void reject()
-    {
-        KColorDialog::reject();
-        QMetaObject::invokeMethod(original, "reject"); //workaround protected
-    }
-};
-
 Q_DECLARE_METATYPE(KFileDialogBridge *)
-Q_DECLARE_METATYPE(KColorDialogBridge *)
 
 class KQGuiPlatformPlugin : public QGuiPlatformPlugin
 {
@@ -339,43 +312,6 @@ public: // File Dialog integration
         return ret;
     }
 
-public: // ColorDialog
-#define K_CD(QCD) KColorDialogBridge *kdecd = qvariant_cast<KColorDialogBridge *>(QCD->property("_k_bridge"))
-    void colorDialogDelete(QColorDialog *qcd) final
-    {
-        K_CD(qcd);
-        delete kdecd;
-
-    }
-
-    bool colorDialogSetVisible(QColorDialog *qcd, bool visible) final
-    {
-        K_CD(qcd);
-        if (!kdecd) {
-            kdecd = new KColorDialogBridge(qcd);
-            kdecd->setColor(qcd->currentColor());
-            if (qcd->options() & QColorDialog::NoButtons) {
-                kdecd->setButtons(KDialog::None);
-            }
-            kdecd->setModal(qcd->isModal());
-            qcd->setProperty("_k_bridge", QVariant::fromValue(kdecd));
-        }
-        if (visible) {
-            kdecd->setCaption(qcd->windowTitle());
-            kdecd->setAlphaChannelEnabled(qcd->options() & QColorDialog::ShowAlphaChannel);
-        }
-        kdecd->setVisible(visible);
-        return true;
-    }
-
-    void colorDialogSetCurrentColor(QColorDialog *qcd, const QColor &color) final
-    {
-        K_CD(qcd);
-        if (kdecd) {
-            kdecd->setColor(color);
-        }
-    }
-
 private slots:
     void init()
     {