fix colordialog

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
@@ -20,24 +20,26 @@
 
 #include <qdialog.h>
 #include <qpainter.h>
 #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)
 {
   // 2000-10-15 (putzer): fixes broken keyboard usage
   connect (this, SIGNAL(clicked()), this, SLOT(chooseColor()));
 }
 
 KColorButton::KColorButton( const QColor &c, QWidget *parent,
-			    const char *name )
+          const char *name )
   : QPushButton( parent, name ), col(c), dragFlag(false)
 {
 
   // 2000-10-15 (putzer): fixes broken keyboard usage
   connect (this, SIGNAL(clicked()), this, SLOT(chooseColor()));
 }
@@ -70,15 +72,15 @@ void KColorButton::drawButtonLabel( QPainter *painter )
     painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol );
   }
 }
 
 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
@@ -1,13 +1,15 @@
 #ifndef MINIKDE_KCOLORDIALOG_H
 #define MINIKDE_KCOLORDIALOG_H
 
 #include <qcolor.h>
+#include <opie/colordialog.h>
 
-class KColorDialog
+class KColorDialog : OColorDialog
 {
+    Q_OBJECT
   public:
     enum { Accepted };
   
     static int getColor( const QColor & );
 };