Merge from BRANCH_1_0

2 files changed, 7 insertions, 11 deletions

diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
index 976f1db..5d21f15 100644
--- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
+++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
@@ -25,7 +25,5 @@
 #include <kglobalsettings.h>
-//#include "kcolordialog.h"
+#include "kcolordialog.h"
 #include "kcolorbtn.h"
 
-#include <opie/colordialog.h>
-
 KColorButton::KColorButton( QWidget *parent, const char *name )
@@ -38,3 +36,3 @@ KColorButton::KColorButton( QWidget *parent, const char *name )
 KColorButton::KColorButton( const QColor &c, QWidget *parent,
-          const char *name )
+                            const char *name )
   : QPushButton( parent, name ), col(c), dragFlag(false)
@@ -77,9 +75,9 @@ void KColorButton::chooseColor()
 {
-  QColor newCol=OColorDialog::getColor( col);
-  if( newCol != QDialog::Rejected )
+  if( KColorDialog::getColor( col) == QDialog::Rejected )
   {
-  col=newCol;
+    return;
+  }
+
   repaint( false );
   emit changed( col );
-  }
 }
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h
index 1d5c27e..0f831cd 100644
--- a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h
+++ b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h
@@ -4,7 +4,5 @@
 #include <qcolor.h>
-#include <opie/colordialog.h>
 
-class KColorDialog : OColorDialog
+class KColorDialog
 {
-    Q_OBJECT
   public: