summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-08-10 15:32:49 (UTC)
committer mickeyl <mickeyl>2003-08-10 15:32:49 (UTC)
commit371c96fa4b2b85bceb8bb91862d355fc14bb971d (patch) (side-by-side diff)
treee2f5321dfc0515dbbd0c91cb43af03a9a79dcd39
parentfda68d1a33f1fbe4d34e7db635a841422da8d284 (diff)
downloadopie-371c96fa4b2b85bceb8bb91862d355fc14bb971d.zip
opie-371c96fa4b2b85bceb8bb91862d355fc14bb971d.tar.gz
opie-371c96fa4b2b85bceb8bb91862d355fc14bb971d.tar.bz2
BUILDFIX: merging this with BRANCH did the wrong thing.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
index 5d21f15..7be5af5 100644
--- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
+++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
@@ -25,5 +25,7 @@
#include <kglobalsettings.h>
-#include "kcolordialog.h"
+//#include "kcolordialog.h"
#include "kcolorbtn.h"
+#include <opie/colordialog.h>
+
KColorButton::KColorButton( QWidget *parent, const char *name )
@@ -36,3 +38,3 @@ KColorButton::KColorButton( QWidget *parent, const char *name )
KColorButton::KColorButton( const QColor &c, QWidget *parent,
- const char *name )
+ const char *name )
: QPushButton( parent, name ), col(c), dragFlag(false)
@@ -75,10 +77,9 @@ void KColorButton::chooseColor()
{
- if( KColorDialog::getColor( col) == QDialog::Rejected )
+ QColor newCol=OColorDialog::getColor( col);
+ if( newCol != QDialog::Rejected )
{
- return;
- }
-
+ col=newCol;
repaint( false );
emit changed( col );
+ }
}
-