[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [picmi] src/gui: Port to QColorDialog
From:       Jakob Gruber <jakob.gruber () gmail ! com>
Date:       2015-07-15 13:42:37
Message-ID: E1ZFMxJ-0006mw-5j () scm ! kde ! org
[Download RAW message or body]

Git commit b20d23584682be6d7352830ba21d9d0b6b13986a by Jakob Gruber, on behalf of Montel Laurent.
Committed on 15/07/2015 at 09:23.
Pushed by gruber into branch 'master'.

Port to QColorDialog

M  +5    -3    src/gui/settingswindow.cpp

http://commits.kde.org/picmi/b20d23584682be6d7352830ba21d9d0b6b13986a

diff --git a/src/gui/settingswindow.cpp b/src/gui/settingswindow.cpp
index 750d9bf..75f13a7 100644
--- a/src/gui/settingswindow.cpp
+++ b/src/gui/settingswindow.cpp
@@ -20,7 +20,7 @@
 #include "ui_settingswindow.h"
 
 #include <assert.h>
-#include <kcolordialog.h>
+#include <QColorDialog>
 #include <kfiledialog.h>
 #include <klocalizedstring.h>
 
@@ -51,7 +51,8 @@ SettingsWindow::~SettingsWindow()
 void SettingsWindow::selectSolvedColor()
 {
     QColor color(m_font_color_solved);
-    if (KColorDialog::getColor(color, this) != QDialog::Accepted) {
+    color = QColorDialog::getColor(color, this);
+    if ( color.isValid() ) {
         return;
     }
     m_font_color_solved = color.name();
@@ -61,7 +62,8 @@ void SettingsWindow::selectSolvedColor()
 void SettingsWindow::selectUnsolvedColor()
 {
     QColor color(m_font_color_unsolved);
-    if (KColorDialog::getColor(color, this) != QDialog::Accepted) {
+    color = QColorDialog::getColor(color, this);
+    if ( color.isValid() ) {
         return;
     }
     m_font_color_unsolved = color.name();

[prev in list] [next in list] [prev in thread] [next in thread]