rever some uitools changes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/uitools/formbuilder.cpp b/src/uitools/formbuilder.cpp
index 9cef734..2938df0 100644 (file)
--- a/src/uitools/formbuilder.cpp
+++ b/src/uitools/formbuilder.cpp
@@ -282,6 +282,22 @@ QLayout *QFormBuilder::createLayout(const QString &layoutName, QObject *parent,
 /*!
     \internal
 */
+bool QFormBuilder::addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout)
+{
+    return QAbstractFormBuilder::addItem(ui_item, item, layout);
+}
+
+/*!
+    \internal
+*/
+bool QFormBuilder::addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget)
+{
+    return QAbstractFormBuilder::addItem(ui_widget, widget, parentWidget);
+}
+
+/*!
+    \internal
+*/
 QWidget *QFormBuilder::widgetByName(QWidget *topLevel, const QString &name)
 {
     Q_ASSERT(topLevel);
@@ -333,6 +349,14 @@ void QFormBuilder::createConnections(DomConnections *ui_connections, QWidget *wi
 /*!
     \internal
 */
+QWidget *QFormBuilder::create(DomUI *ui, QWidget *parentWidget)
+{
+    return QAbstractFormBuilder::create(ui, parentWidget);
+}
+
+/*!
+    \internal
+*/
 QLayout *QFormBuilder::create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget)
 {
     QFormBuilderExtra *fb = QFormBuilderExtra::instance(this);
@@ -365,6 +389,30 @@ QLayout *QFormBuilder::create(DomLayout *ui_layout, QLayout *layout, QWidget *pa
 }
 
 /*!
+    \internal
+*/
+QLayoutItem *QFormBuilder::create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget)
+{
+    return QAbstractFormBuilder::create(ui_layoutItem, layout, parentWidget);
+}
+
+/*!
+    \internal
+*/
+QAction *QFormBuilder::create(DomAction *ui_action, QObject *parent)
+{
+    return QAbstractFormBuilder::create(ui_action, parent);
+}
+
+/*!
+    \internal
+*/
+QActionGroup *QFormBuilder::create(DomActionGroup *ui_action_group, QObject *parent)
+{
+    return QAbstractFormBuilder::create(ui_action_group, parent);
+}
+
+/*!
     Returns the list of paths the form builder searches for plugins.
 
     \sa addPluginPath()

diff --git a/src/uitools/formbuilder.h b/src/uitools/formbuilder.h
index e2bdc76..bfe6e20 100644 (file)
--- a/src/uitools/formbuilder.h
+++ b/src/uitools/formbuilder.h
@@ -73,14 +73,21 @@ public:
     QList<QDesignerCustomWidgetInterface*> customWidgets() const;
 
 protected:
+    virtual QWidget *create(DomUI *ui, QWidget *parentWidget);
     virtual QWidget *create(DomWidget *ui_widget, QWidget *parentWidget);
     virtual QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget);
+    virtual QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget);
+    virtual QAction *create(DomAction *ui_action, QObject *parent);
+    virtual QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent);
 
     virtual QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name);
     virtual QLayout *createLayout(const QString &layoutName, QObject *parent, const QString &name);
 
     virtual void createConnections(DomConnections *connections, QWidget *widget);
 
+    virtual bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout);
+    virtual bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget);
+
     virtual void updateCustomWidgets();
     virtual void applyProperties(QObject *o, const QList<DomProperty*> &properties);
 

diff --git a/src/uitools/quiloader.cpp b/src/uitools/quiloader.cpp
index f890340..45184d3 100644 (file)
--- a/src/uitools/quiloader.cpp
+++ b/src/uitools/quiloader.cpp
@@ -442,7 +442,7 @@ QWidget *FormBuilderPrivate::create(DomUI *ui, QWidget *parentWidget)
     m_class = ui->elementClass().toUtf8();
     m_trwatch = 0;
     setTextBuilder(new TranslatingTextBuilder(trEnabled, m_class));
-    return QAbstractFormBuilder::create(ui, parentWidget);
+    return QFormBuilder::create(ui, parentWidget);
 }
 
 QWidget *FormBuilderPrivate::create(DomWidget *ui_widget, QWidget *parentWidget)