uic/Python: Fix tab stop/Z-Order and buddy handling

The code compared the attribute names of the properties against the
m_registeredWidgets hash which contained the qualified names
(self.widget) and thus reported errors without actually generating
anything.

Replace the m_registeredWidgets hash by a lookup of the attribute name
in the m_widgets hash and add a function widgetVariableName()
returning the qualified variable name for an attribute name and use
that for the checks.

Remove unused m_registeredActions hash and rename some variables to
make it clearer.

Task-number: PYSIDE-797
Change-Id: Id31d95c1141d21c51eb85bcd8f8fc63486eb36a5
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
 
 
 
 
 
 

1 files changed, 9 insertions, 3 deletions

diff --git a/src/tools/uic/driver.h b/src/tools/uic/driver.h
index 36336007b2..45ec23b4aa 100644
--- a/src/tools/uic/driver.h
+++ b/src/tools/uic/driver.h
@@ -84,17 +84,23 @@ public:
     // Find a group by its non-uniqified name
     const DomButtonGroup *findButtonGroup(const QString &attributeName) const;
 
-    const DomWidget *widgetByName(const QString &name) const;
-    const DomActionGroup *actionGroupByName(const QString &name) const;
-    const DomAction *actionByName(const QString &name) const;
+    const DomWidget *widgetByName(const QString &attributeName) const;
+    QString widgetVariableName(const QString &attributeName) const;
+    const DomActionGroup *actionGroupByName(const QString &attributeName) const;
+    const DomAction *actionByName(const QString &attributeName) const;
 
     bool useIdBasedTranslations() const { return m_idBasedTranslations; }
     void setUseIdBasedTranslations(bool u) { m_idBasedTranslations = u; }
 
 private:
     template <class DomClass> using DomObjectHash = QHash<const DomClass *, QString>;
+    template <class DomClass> using DomObjectHashConstIt =
+        typename DomObjectHash<DomClass>::ConstIterator;
 
     template <class DomClass>
+    DomObjectHashConstIt<DomClass> findByAttributeNameIt(const DomObjectHash<DomClass> &domHash,
+                                                         const QString &name) const;
+    template <class DomClass>
     const DomClass *findByAttributeName(const DomObjectHash<DomClass> &domHash,
                                         const QString &name) const;
     template <class DomClass>