Changeset 561 for trunk/tools/designer/src/lib/uilib/formbuilderextra.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/lib/uilib/formbuilderextra.cpp (modified) (7 diffs)

trunk/tools/designer/src/lib/uilib/formbuilderextra.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt Designer of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -66 +66 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QFormBuilderExtra::QFormBuilderExtra() :
     m_layoutWidget(false),
@@ -82 +99 @@
 {
     m_buddies.clear();
-    m_rootWidget = 0;
+    m_parentWidget = 0;
+    m_parentWidgetIsSet = false;
 #ifndef QT_FORMBUILDER_NO_SCRIPT
     m_FormScriptRunner.clearErrors();
-    m_customWidgetScriptHash.clear();
 #endif
+
     m_buttonGroups.clear();
 }
@@ -137 +155 @@
 }
 
-const QPointer<QWidget> &QFormBuilderExtra::rootWidget() const
-{
-    return m_rootWidget;
-}
-
-void QFormBuilderExtra::setRootWidget(const QPointer<QWidget> &w)
-{
-    m_rootWidget = w;
+const QPointer<QWidget> &QFormBuilderExtra::parentWidget() const
+{
+    return m_parentWidget;
+}
+
+bool QFormBuilderExtra::parentWidgetIsSet() const
+{
+    return m_parentWidgetIsSet;
+}
+
+void QFormBuilderExtra::setParentWidget(const QPointer<QWidget> &w)
+{
+    // Parent widget requires special handling of the geometry property.
+    m_parentWidget = w;
+    m_parentWidgetIsSet = true;
 }
 
@@ -153 +178 @@
 }
 
-void QFormBuilderExtra::storeCustomWidgetScript(const QString &className, const QString &script)
-{
-    m_customWidgetScriptHash.insert(className, script);
-}
-
 QString QFormBuilderExtra::customWidgetScript(const QString &className) const
 {
-    const CustomWidgetScriptHash::const_iterator it = m_customWidgetScriptHash.constFind(className);
-    if ( it == m_customWidgetScriptHash.constEnd())
-        return QString();
-    return it.value();
+    const Hash.constFind(className);
+    if (Hash.constEnd())
+        return ;
+    return ();
 }
 
 #endif
 
-void QFormBuilderExtra::storeCustomWidgetBaseClass(const QString &className, const QString &baseClassName)
-{
-    m_customWidgetBaseClassHash.insert(className, baseClassName);
+void QFormBuilderExtra::storeCustomWidgetData(const QString &className, const DomCustomWidget *d)
+{
+    if (d)
+        m_customWidgetDataHash.insert(className, CustomWidgetData(d));
 }
 
 QString QFormBuilderExtra::customWidgetBaseClass(const QString &className) const
 {
-    const QHash<QString, QString>::const_iterator it = m_customWidgetBaseClassHash.constFind(className);
-    if (it == m_customWidgetBaseClassHash.constEnd())
-        return QString();
-    return it.value();
-}
-
-void QFormBuilderExtra::storeCustomWidgetAddPageMethod(const QString &className, const QString &ct)
-{
-    m_customWidgetAddPageMethodHash.insert(className, ct);
+    const QHash<QString, CustomWidgetData>::const_iterator it = m_customWidgetDataHash.constFind(className);
+    if (it != m_customWidgetDataHash.constEnd())
+            return it.value().baseClass;
+    return QString();
 }
 
 QString QFormBuilderExtra::customWidgetAddPageMethod(const QString &className) const
 {
-    const QHash<QString, QString>::const_iterator it = m_customWidgetAddPageMethodHash.constFind(className);
-    if (it == m_customWidgetAddPageMethodHash.constEnd())
-        return QString();
-    return it.value();
+    const QHash<QString, CustomWidgetData>::const_iterator it = m_customWidgetDataHash.constFind(className);
+    if (it != m_customWidgetDataHash.constEnd())
+        return it.value().addPageMethod;
+    return QString();
+}
+
+bool QFormBuilderExtra::isCustomWidgetContainer(const QString &className) const
+{
+    const QHash<QString, CustomWidgetData>::const_iterator it = m_customWidgetDataHash.constFind(className);
+    if (it != m_customWidgetDataHash.constEnd())
+        return it.value().isContainer;
+    return false;
 }