author | mickeyl <mickeyl> | 2003-08-10 15:32:49 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-08-10 15:32:49 (UTC) |
commit | 371c96fa4b2b85bceb8bb91862d355fc14bb971d (patch) (side-by-side diff) | |
tree | e2f5321dfc0515dbbd0c91cb43af03a9a79dcd39 /noncore | |
parent | fda68d1a33f1fbe4d34e7db635a841422da8d284 (diff) | |
download | opie-371c96fa4b2b85bceb8bb91862d355fc14bb971d.zip opie-371c96fa4b2b85bceb8bb91862d355fc14bb971d.tar.gz opie-371c96fa4b2b85bceb8bb91862d355fc14bb971d.tar.bz2 |
BUILDFIX: merging this with BRANCH did the wrong thing.
-rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | 13 |
1 files changed, 7 insertions, 6 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 ) @@ -75,7 +77,6 @@ void KColorButton::chooseColor() { - if( KColorDialog::getColor( col) == QDialog::Rejected ) + QColor newCol=OColorDialog::getColor( col); + if( newCol != QDialog::Rejected ) { - return; - } - + col=newCol; repaint( false ); @@ -83,2 +84,2 @@ void KColorButton::chooseColor() } - +} |