Diffstat (limited to 'noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp index 5d21f15..976f1db 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,3 @@ void KColorButton::chooseColor() } +} |