summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid E. Narvaez <[email protected]>2015-06-05 13:14:10 -0400
committerDavid E. Narvaez <[email protected]>2015-06-05 13:14:10 -0400
commitf1618ade2febe1aac01e65c26afbb2e77ca43b41 (patch)
tree8b65f9d37c426415c9ea1a77bdff4800670bea6d
parent346ee863fe7ec1bc31220a0f68d918faae32e802 (diff)
Migrated to QColorDialog
-rw-r--r--modes/popup/builtinobjectactionsprovider.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/modes/popup/builtinobjectactionsprovider.cc b/modes/popup/builtinobjectactionsprovider.cc
index 0d535fe..ab5797b 100644
--- a/modes/popup/builtinobjectactionsprovider.cc
+++ b/modes/popup/builtinobjectactionsprovider.cc
@@ -32,10 +32,10 @@
#include "../../objects/object_drawer.h"
#include "../../objects/point_imp.h"
+#include <QColorDialog>
#include <QPen>
#include <QRect>
-#include <KColorDialog>
#include <KIconEngine>
#include <KLocale>
@@ -238,8 +238,8 @@ bool BuiltinObjectActionsProvider::executeAction(
{
if ( os.size() == 1 )
color = os.front()->drawer()->color();
- int result = KColorDialog::getColor( color, &w );
- if ( result != KColorDialog::Accepted ) return true;
+ color = QColorDialog::getColor( color, &w );
+ if ( !color.isValid() ) return true;
}
KigCommand* kc = new KigCommand( doc, i18n( "Change Object Color" ) );
assert( color.isValid() );