| author | mickeyl <mickeyl> | 2003-08-10 15:32:49 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-08-10 15:32:49 (UTC) |
| commit | 371c96fa4b2b85bceb8bb91862d355fc14bb971d (patch) (unidiff) | |
| 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 @@ | |||
| 25 | #include <kglobalsettings.h> | 25 | #include <kglobalsettings.h> |
| 26 | #include "kcolordialog.h" | 26 | //#include "kcolordialog.h" |
| 27 | #include "kcolorbtn.h" | 27 | #include "kcolorbtn.h" |
| 28 | 28 | ||
| 29 | #include <opie/colordialog.h> | ||
| 30 | |||
| 29 | KColorButton::KColorButton( QWidget *parent, const char *name ) | 31 | KColorButton::KColorButton( QWidget *parent, const char *name ) |
| @@ -75,7 +77,6 @@ void KColorButton::chooseColor() | |||
| 75 | { | 77 | { |
| 76 | if( KColorDialog::getColor( col) == QDialog::Rejected ) | 78 | QColor newCol=OColorDialog::getColor( col); |
| 79 | if( newCol != QDialog::Rejected ) | ||
| 77 | { | 80 | { |
| 78 | return; | 81 | col=newCol; |
| 79 | } | ||
| 80 | |||
| 81 | repaint( false ); | 82 | repaint( false ); |
| @@ -83,2 +84,2 @@ void KColorButton::chooseColor() | |||
| 83 | } | 84 | } |
| 84 | 85 | } | |