From 5d4cda3e2ff39e956cf09724305b03525063fb22 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Sat, 18 Oct 2014 13:03:41 +0200
Subject: [PATCH] kdelibs4support--

---
 src/ColorSchemeEditor.cpp  | 7 +++----
 src/ColorSchemeManager.cpp | 1 -
 src/Part.cpp               | 1 -
 src/ProcessInfo.cpp        | 1 -
 src/ProfileReader.cpp      | 1 -
 src/ProfileWriter.cpp      | 1 -
 src/SessionController.cpp  | 1 -
 7 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/ColorSchemeEditor.cpp b/src/ColorSchemeEditor.cpp
index ca622916d..89c32f1be 100644
--- a/src/ColorSchemeEditor.cpp
+++ b/src/ColorSchemeEditor.cpp
@@ -29,7 +29,7 @@
 #include <QtGui/QIcon>
 
 // KDE
-#include <KColorDialog>
+#include <QColorDialog>
 #include <KWindowSystem>
 #include <KFileDialog>
 #include <KUrlCompletion>
@@ -159,9 +159,8 @@ void ColorSchemeEditor::editColorItem(QTableWidgetItem* item)
     }
 
     QColor color = item->background().color();
-    int result = KColorDialog::getColor(color);
-
-    if (result == KColorDialog::Accepted) {
+    color = QColorDialog::getColor();
+    if ( color.isValid() ) {
         item->setBackground(color);
 
         int colorSchemeRow = item->row();
diff --git a/src/ColorSchemeManager.cpp b/src/ColorSchemeManager.cpp
index 24d71dbbc..d8b03fba2 100644
--- a/src/ColorSchemeManager.cpp
+++ b/src/ColorSchemeManager.cpp
@@ -29,7 +29,6 @@
 #include <QtCore/QDir>
 
 // KDE
-#include <KGlobal>
 #include <KConfig>
 #include <KLocalizedString>
 #include <QDebug>
diff --git a/src/Part.cpp b/src/Part.cpp
index 6cea6268b..7d20f8ed2 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -31,7 +31,6 @@
 #include <KActionCollection>
 #include <KLocale>
 #include <KPluginFactory>
-#include <KGlobal>
 #include <KLocalizedString>
 #include <kde_file.h>
 #include <QDebug>
diff --git a/src/ProcessInfo.cpp b/src/ProcessInfo.cpp
index bca982d45..c49da64f8 100644
--- a/src/ProcessInfo.cpp
+++ b/src/ProcessInfo.cpp
@@ -40,7 +40,6 @@
 
 // KDE
 #include <KConfigGroup>
-#include <KGlobal>
 #include <KSharedConfig>
 #include <KUser>
 #include <QDebug>
diff --git a/src/ProfileReader.cpp b/src/ProfileReader.cpp
index 9739b388b..1241503cd 100644
--- a/src/ProfileReader.cpp
+++ b/src/ProfileReader.cpp
@@ -28,7 +28,6 @@
 // KDE
 #include <KConfig>
 #include <KConfigGroup>
-#include <KGlobal>
 
 // Konsole
 #include "ShellCommand.h"
diff --git a/src/ProfileWriter.cpp b/src/ProfileWriter.cpp
index 8420919c8..4b548ae71 100644
--- a/src/ProfileWriter.cpp
+++ b/src/ProfileWriter.cpp
@@ -28,7 +28,6 @@
 // KDE
 #include <KConfig>
 #include <KConfigGroup>
-#include <KGlobal>
 
 // Konsole
 #include "ShellCommand.h"
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index b04b965c5..a616c59b5 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -52,7 +52,6 @@
 #include <KStringHandler>
 #include <KSharedConfig>
 #include <KConfigGroup>
-#include <KGlobal>
 
 #include <kdeversion.h>
 #include <KCodecAction>