Diffstat (limited to 'noncore/apps/tinykate/libkate/microkde') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp index 7be5af5..1320cbc 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp +++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | |||
@@ -23,10 +23,9 @@ | |||
23 | #include <qdrawutil.h> | 23 | #include <qdrawutil.h> |
24 | #include <qapplication.h> | 24 | #include <qapplication.h> |
25 | #include <kglobalsettings.h> | 25 | #include <kglobalsettings.h> |
26 | //#include "kcolordialog.h" | ||
27 | #include "kcolorbtn.h" | 26 | #include "kcolorbtn.h" |
28 | 27 | ||
29 | #include <opie/colordialog.h> | 28 | #include <opie2/qcolordialog.h> |
30 | 29 | ||
31 | KColorButton::KColorButton( QWidget *parent, const char *name ) | 30 | KColorButton::KColorButton( QWidget *parent, const char *name ) |
32 | : QPushButton( parent, name ), dragFlag(false) | 31 | : QPushButton( parent, name ), dragFlag(false) |
@@ -58,10 +57,10 @@ void KColorButton::drawButtonLabel( QPainter *painter ) | |||
58 | int w = r.width(); | 57 | int w = r.width(); |
59 | int h = r.height(); | 58 | int h = r.height(); |
60 | int b = 5; | 59 | int b = 5; |
61 | 60 | ||
62 | QColor lnCol = colorGroup().text(); | 61 | QColor lnCol = colorGroup().text(); |
63 | QColor fillCol = isEnabled() ? col : backgroundColor(); | 62 | QColor fillCol = isEnabled() ? col : backgroundColor(); |
64 | 63 | ||
65 | if ( isDown() ) { | 64 | if ( isDown() ) { |
66 | qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 ); | 65 | qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 ); |
67 | b++; | 66 | b++; |
@@ -75,7 +74,7 @@ void KColorButton::drawButtonLabel( QPainter *painter ) | |||
75 | 74 | ||
76 | void KColorButton::chooseColor() | 75 | void KColorButton::chooseColor() |
77 | { | 76 | { |
78 | QColor newCol=OColorDialog::getColor( col); | 77 | QColor newCol=QColorDialog::getColor( col); |
79 | if( newCol != QDialog::Rejected ) | 78 | if( newCol != QDialog::Rejected ) |
80 | { | 79 | { |
81 | col=newCol; | 80 | col=newCol; |