[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

stop trying to be clever


  M +1 -1      kstobject.h   1.18
  M +2 -2      ksttoplevelview.cpp   1.2
  M +5 -1      ksttoplevelview.h   1.2


--- kdeextragear-2/kst/kst/kstobject.h  #1.17:1.18
@@ -31,5 +31,5 @@ class KstObjectPrivate;
 
 // BINARY COMPATIBILITY IS NOT YET GUARANTEED
-class KstObject : public KstShared, public virtual QObject, public KstRWLock {
+class KstObject : public KstShared, public QObject, public KstRWLock {
 public:
   KstObject();

--- kdeextragear-2/kst/kst/ksttoplevelview.cpp  #1.1:1.2
@@ -20,9 +20,9 @@
 #include <qpainter.h>
 
-KstTopLevelView::KstTopLevelView(QWidget *parent, const char *name, WFlags w) : KstViewObject(), QWidget(parent, name, w) {
+KstTopLevelView::KstTopLevelView(QWidget *parent, const char *name, WFlags w) : KstViewObject(), _w(new QWidget(parent, name, w)) {
 }
 
 
-KstTopLevelView::KstTopLevelView(QDomElement& e, QWidget *parent, const char *name, WFlags w) : KstViewObject(e), QWidget(parent, name, w) {
+KstTopLevelView::KstTopLevelView(QDomElement& e, QWidget *parent, const char *name, WFlags w) : KstViewObject(e), _w(new QWidget(parent, name, w)) {
 }
 

--- kdeextragear-2/kst/kst/ksttoplevelview.h  #1.1:1.2
@@ -22,5 +22,5 @@
 #include <qwidget.h>
 
-class KstTopLevelView : public virtual KstViewObject, public virtual QWidget {
+class KstTopLevelView : public KstViewObject {
   Q_OBJECT
   public:
@@ -32,7 +32,11 @@ class KstTopLevelView : public virtual K
     virtual void save(QTextStream& ts);
 
+    QWidget *widget() const { return _w; }
+
   public slots:
     virtual void paint(QPainter& p);
 
+  private:
+    QWidget *_w;
 };