From 69c4b97be2df727a3cdd3b6f70ab6e39f37d0052 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 6 May 2011 09:33:45 +0200
Subject: QtUiTools: Remove Q3Support.

Remove special handling of Q3ButtonGroup in form builder.
---
 tools/uilib/abstractformbuilder.cpp | 17 +----------------
 tools/uilib/formbuilder.cpp         | 17 -----------------
 2 files changed, 1 insertion(+), 33 deletions(-)

(limited to 'tools')

diff --git a/tools/uilib/abstractformbuilder.cpp b/tools/uilib/abstractformbuilder.cpp
index e850df8f37..4d142bd09f 100644
--- a/tools/uilib/abstractformbuilder.cpp
+++ b/tools/uilib/abstractformbuilder.cpp
@@ -2255,21 +2255,6 @@ void QAbstractFormBuilder::saveComboBoxExtraInfo(QComboBox *comboBox, DomWidget
     ui_widget->setElementItem(ui_items);
 }
 
-// Return the buttongroups assigned to a button except the internal one
-// (with empty object name) used by Q3ButtonGroup.
-static inline const QButtonGroup *formButtonGroup(const QAbstractButton *widget)
-{
-    const QButtonGroup *buttonGroup = widget->group();
-    if (!buttonGroup)
-        return 0;
-    if (buttonGroup->objectName().isEmpty()) {
-        if (const QWidget *parent = widget->parentWidget())
-            if (!qstrcmp(parent->metaObject()->className(), "Q3ButtonGroup"))
-                return 0;
-    }
-    return buttonGroup;
-}
-
 /*!
     \internal
     \since 4.5
@@ -2278,7 +2263,7 @@ static inline const QButtonGroup *formButtonGroup(const QAbstractButton *widget)
 void QAbstractFormBuilder::saveButtonExtraInfo(const QAbstractButton *widget, DomWidget *ui_widget, DomWidget *)
 {
     typedef QList<DomProperty*> DomPropertyList;
-    if (const QButtonGroup *buttonGroup = formButtonGroup(widget)) {
+    if (const QButtonGroup *buttonGroup = widget->group()) {
         DomPropertyList attributes = ui_widget->elementAttribute();
         DomString *domString = new DomString();
         domString->setText(buttonGroup->objectName());
diff --git a/tools/uilib/formbuilder.cpp b/tools/uilib/formbuilder.cpp
index 592b1f15f7..6e8ebcb975 100644
--- a/tools/uilib/formbuilder.cpp
+++ b/tools/uilib/formbuilder.cpp
@@ -268,23 +268,6 @@ QLayout *QFormBuilder::createLayout(const QString &layoutName, QObject *parent,
 
     if (l) {
         l->setObjectName(name);
-        if (parentLayout) {
-            QWidget *w = qobject_cast<QWidget *>(parentLayout->parent());
-            if (w && w->inherits("Q3GroupBox")) {
-                l->setContentsMargins(w->style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
-                                    w->style()->pixelMetric(QStyle::PM_LayoutTopMargin),
-                                    w->style()->pixelMetric(QStyle::PM_LayoutRightMargin),
-                                    w->style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
-                QGridLayout *grid = qobject_cast<QGridLayout *>(l);
-                if (grid) {
-                    grid->setHorizontalSpacing(-1);
-                    grid->setVerticalSpacing(-1);
-                } else {
-                    l->setSpacing(-1);
-                }
-                l->setAlignment(Qt::AlignTop);
-            }
-        }
     } else {
         qWarning() << QCoreApplication::translate("QFormBuilder", "The layout type `%1' is not supported.").arg(layoutName);
     }
-- 
cgit v1.2.3