-rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolordialog.h | 4 |
2 files changed, 11 insertions, 7 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 @@ | |||
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 ) |
@@ -36,3 +38,3 @@ KColorButton::KColorButton( QWidget *parent, const char *name ) | |||
36 | KColorButton::KColorButton( const QColor &c, QWidget *parent, | 38 | KColorButton::KColorButton( const QColor &c, QWidget *parent, |
37 | const char *name ) | 39 | const char *name ) |
38 | : QPushButton( parent, name ), col(c), dragFlag(false) | 40 | : QPushButton( parent, name ), col(c), dragFlag(false) |
@@ -75,9 +77,9 @@ 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 ); |
82 | emit changed( col ); | 83 | emit changed( col ); |
84 | } | ||
83 | } | 85 | } |
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 | |||
@@ -4,5 +4,7 @@ | |||
4 | #include <qcolor.h> | 4 | #include <qcolor.h> |
5 | #include <opie/colordialog.h> | ||
5 | 6 | ||
6 | class KColorDialog | 7 | class KColorDialog : OColorDialog |
7 | { | 8 | { |
9 | Q_OBJECT | ||
8 | public: | 10 | public: |