Fix in extdatetime.h: overloaded ExtDateTime::fromString() functions

were ambiguous; fixed by removing a default parameter from one of them.

KPlotWidget must be derived from QFrame rather than QWidget, otherwise
it is not usable in Qt designer.  In designer, you place a custom widget
by using the widget's baseclass, and then "promoting" it.  However,
designer does not provide a QWidget!  So, it would seem that custom
widgets cannot be derived directly from QWidget.  This may be a bug in
designer.

CCMAIL: kde-edu@kde.org
CCMAIL: kstars-devel@kde.org

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=489303

diff --git a/extdate/extdatetime.h b/extdate/extdatetime.h
index e117cbbe206f84de2573367d7f18b8c013a62beb..3dc85d860b4805862b619f861b578ffff35de284 100644 (file)
--- a/extdate/extdatetime.h
+++ b/extdate/extdatetime.h
@@ -167,7 +167,7 @@ public:
     static ExtDateTime currentDateTime( Qt::TimeSpec );
 #ifndef QT_NO_DATESTRING
     static ExtDateTime fromString( const QString& s );
-    static ExtDateTime fromString( const QString& s, Qt::DateFormat f = Qt::TextDate );
+    static ExtDateTime fromString( const QString& s, Qt::DateFormat f );
 #endif
 private:
     ExtDate  d;

diff --git a/kdeeduplot/kplotwidget.cpp b/kdeeduplot/kplotwidget.cpp
index 9a1855b46f687cdb6acaec23a7236a7ee05beb00..cdb11d707a0e393ca0370456cffad767882879c0 100644 (file)
--- a/kdeeduplot/kplotwidget.cpp
+++ b/kdeeduplot/kplotwidget.cpp
@@ -28,7 +28,7 @@
 #include "kplotobject.h"
 
 KPlotWidget::KPlotWidget( double x1, double x2, double y1, double y2, QWidget *parent )
- : QWidget( parent, Qt::WNoAutoErase ),
+ : QFrame( parent ),
    dXtick(0.0), dYtick(0.0),
    nmajX(0), nminX(0), nmajY(0), nminY(0),
    ShowTickMarks( true ), ShowTickLabels( true ), ShowGrid( false )

diff --git a/kdeeduplot/kplotwidget.h b/kdeeduplot/kplotwidget.h
index 2b465765059ee64bcce6375c0195b11d27ce03a5..87bf0894c059fbc646aaedfee0f615f518bdd4ab 100644 (file)
--- a/kdeeduplot/kplotwidget.h
+++ b/kdeeduplot/kplotwidget.h
@@ -18,10 +18,9 @@
 #ifndef KPLOTWIDGET_H
 #define KPLOTWIDGET_H
 
-#include <qcolor.h>
-#include <qrect.h>
-#include <qwidget.h>
-#include <qlist.h>
+#include <QFrame>
+#include <QList>
+
 #include "kplotaxis.h"
 
 #define BIGTICKSIZE 10
@@ -45,7 +44,7 @@ class KPlotObject;
  * @version 1.1
  */
 
-class KDE_EXPORT KPlotWidget : public QWidget {
+class KDE_EXPORT KPlotWidget : public QFrame {
        Q_OBJECT
 public:
        /**