[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/plugins/forms/widgets
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2010-04-02 17:09:34
Message-ID: 20100402170934.2D544AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1110281 by staniek:

don't use KexiDBFormBase


 M  +6 -6      kexidbform.cpp  
 M  +3 -10     kexidbform.h  
 M  +1 -1      kexidbsubform.cpp  


--- trunk/koffice/kexi/plugins/forms/widgets/kexidbform.cpp #1110280:1110281
@@ -113,7 +113,7 @@
 //========================
 
 KexiDBForm::KexiDBForm(QWidget *parent, KexiDataAwareObjectInterface* dataAwareObject)
-        : KexiDBFormBase(parent)
+        : QWidget(parent)
         , KexiFormDataItemInterface()
         , d(new Private())
 {
@@ -670,7 +670,7 @@
 //  kDebug() << "e->type()==QEvent::FocusOut " << watched->className() << " " <<watched->name();
 //  UNSET_FOCUS_USING_REASON(watched, static_cast<QFocusEvent*>(e)->reason());
     }
-    return KexiDBFormBase::eventFilter(watched, e);
+    return QWidget::eventFilter(watched, e);
 }
 
 bool KexiDBForm::valueIsNull()
@@ -725,13 +725,13 @@
 
 void KexiDBForm::dragMoveEvent(QDragMoveEvent *e)
 {
-    KexiDBFormBase::dragMoveEvent(e);
+    QWidget::dragMoveEvent(e);
     emit handleDragMoveEvent(e);
 }
 
 void KexiDBForm::dropEvent(QDropEvent *e)
 {
-    KexiDBFormBase::dropEvent(e);
+    QWidget::dropEvent(e);
     emit handleDropEvent(e);
 }
 
@@ -741,7 +741,7 @@
     //! @todo?
         
     if (form() && form()->state() == KFormDesigner::Form::WidgetInserting) { //exception
-        KexiDBFormBase::setCursor(cursor);
+        QWidget::setCursor(cursor);
     }
 }*/
 
@@ -761,7 +761,7 @@
   if (!unclipped)
     clearWFlags( WPaintUnclipped );
   p.end();
-  KexiDBFormBase::paintEvent(e);
+  QWidget::paintEvent(e);
 }
 */
 
--- trunk/koffice/kexi/plugins/forms/widgets/kexidbform.h #1110280:1110281
@@ -31,18 +31,11 @@
 #include <formeditor/FormWidgetInterface.h>
 #include "kexiformdataiteminterface.h"
 
-#ifdef KEXI_USE_GRADIENT_WIDGET
-#include <kexigradientwidget.h>
-# define KexiDBFormBase KexiGradientWidget
-#else
-# define KexiDBFormBase QWidget
-#endif
-
 class KexiDataAwareObjectInterface;
 class KexiFormScrollView;
 
 //! @short A DB-aware form widget, acting as form's toplevel widget
-class KEXIFORMUTILS_EXPORT KexiDBForm : public KexiDBFormBase,
+class KEXIFORMUTILS_EXPORT KexiDBForm : public QWidget,
                                         public KFormDesigner::FormWidget,
                                         public KexiFormDataItemInterface,
                                         public KFormDesigner::FormWidgetInterface
@@ -119,12 +112,12 @@
 
     //! @internal for sizeInternal property
     QSize sizeInternal() const {
-        return KexiDBFormBase::size();
+        return QWidget::size();
     }
 
     //! @internal for sizeInternal property
     void resizeInternal(const QSize& s) {
-        KexiDBFormBase::resize(s);
+        QWidget::resize(s);
     }
 
 signals:
--- trunk/koffice/kexi/plugins/forms/widgets/kexidbsubform.cpp #1110280:1110281
@@ -110,7 +110,7 @@
 
     // we create the container widget
     delete m_widget;
-    m_widget = new KexiDBFormBase(viewport());
+    m_widget = new QWidget(viewport());
     m_widget->setObjectName("KexiDBSubForm_widget");
     m_widget->show();
     addChild(m_widget);
[prev in list] [next in list] [prev in thread] [next in thread]