Diffstat (limited to 'noncore/apps/tinykate/libkate/microkde') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | 12 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolordialog.h | 4 |
2 files changed, 10 insertions, 6 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 @@ -23,9 +23,11 @@ #include <qdrawutil.h> #include <qapplication.h> #include <kglobalsettings.h> -#include "kcolordialog.h" +//#include "kcolordialog.h" #include "kcolorbtn.h" +#include <opie/colordialog.h> + KColorButton::KColorButton( QWidget *parent, const char *name ) : QPushButton( parent, name ), dragFlag(false) { @@ -73,12 +75,12 @@ void KColorButton::drawButtonLabel( QPainter *painter ) 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 ); } +} diff --git a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h index 0f831cd..1d5c27e 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h +++ b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h @@ -2,9 +2,11 @@ #define MINIKDE_KCOLORDIALOG_H #include <qcolor.h> +#include <opie/colordialog.h> -class KColorDialog +class KColorDialog : OColorDialog { + Q_OBJECT public: enum { Accepted }; |