1 files changed, 22 insertions, 19 deletions

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 0349061089..5290abf9f6 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -731,7 +731,7 @@ void WriteInitialization::acceptWidget(DomWidget *node)
         if (const DomProperty *picon = attributes.value(QLatin1String("icon")))
             icon = QLatin1String(", ") + iconCall(picon); // Side effect: Writes icon definition
         m_output << m_indent << parentWidget << language::derefPointer << "addTab("
-            << varName << icon << ", " << "QString())" << language::eol;
+            << varName << icon << ", " << language::emptyString << ')' << language::eol;
 
         autoTrOutput(ptitleString, pageDefaultString) << m_indent << parentWidget
             << language::derefPointer << "setTabText(" << parentWidget
@@ -824,8 +824,8 @@ void WriteInitialization::acceptWidget(DomWidget *node)
                     qPrintable(m_option.messagePrefix()),
                     name.toLatin1().data());
         } else {
-            m_output << m_indent << varName << language::derefPointer << "raise()"
-                << language::eol;
+            m_output << m_indent << varName << language::derefPointer
+                << (language::language() != Language::Python ? "raise()" : "raise_()") << language::eol;
         }
     }
 }
@@ -1612,7 +1612,7 @@ QString WriteInitialization::writeFontProperties(const DomFont *f)
     }
     if (f->hasElementWeight() && f->elementWeight() > 0) {
         m_output << m_indent << fontName << ".setWeight("
-            << f->elementWeight() << ");" << Qt::endl;
+            << f->elementWeight() << ")" << language::eol;
     }
     if (f->hasElementStrikeOut()) {
          m_output << m_indent << fontName << ".setStrikeOut("
@@ -2086,7 +2086,7 @@ void WriteInitialization::initializeComboBox(DomWidget *w)
             m_output << iconValue << ", ";
 
         if (needsTranslation(text->elementString())) {
-            m_output << "QString())" << language::eol;
+            m_output << language::emptyString << ')' << language::eol;
             m_refreshOut << m_indent << varName << language::derefPointer
                 << "setItemText(" << i << ", " << trCall(text->elementString())
                 << ')' << language::eol;
@@ -2288,7 +2288,7 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w)
             if (str && str->text().isEmpty()) {
                 m_output << m_indent << varName << language::derefPointer
                     << "headerItem()" << language::derefPointer << "setText("
-                    << i << ", QString())" << language::eol;
+                    << i << ", " << language::emptyString << ')' << language::eol;
             }
         }
     }
@@ -2304,7 +2304,7 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w)
 
     QString tempName = disableSorting(w, varName);
 
-    QList<Item *> items = initializeTreeWidgetItems(w->elementItem());
+    const auto items = initializeTreeWidgetItems(w->elementItem());
     for (int i = 0; i < items.count(); i++) {
         Item *itm = items[i];
         itm->writeSetupUi(varName);
@@ -2326,10 +2326,10 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w)
     conditions an item is needed needs to be done bottom-up, the whole process makes
     two passes, storing the intermediate result in a recursive StringInitializerListMap.
 */
-QList<WriteInitialization::Item *> WriteInitialization::initializeTreeWidgetItems(const QVector<DomItem *> &domItems)
+WriteInitialization::Items WriteInitialization::initializeTreeWidgetItems(const QVector<DomItem *> &domItems)
 {
     // items
-    QList<Item *> items;
+    Items items;
     const int numDomItems = domItems.size();
     items.reserve(numDomItems);
 
@@ -2357,7 +2357,7 @@ QList<WriteInitialization::Item *> WriteInitialization::initializeTreeWidgetItem
         // AbstractFromBuilder saves flags last, so they always end up in the last column's map.
         addQtFlagsInitializer(item, map, QLatin1String("flags"));
 
-        const QList<Item *> subItems = initializeTreeWidgetItems(domItem->elementItem());
+        const auto subItems = initializeTreeWidgetItems(domItem->elementItem());
         for (Item *subItem : subItems)
             item->addChild(subItem);
     }
@@ -2372,9 +2372,11 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
     const auto &columns = w->elementColumn();
 
     if (!columns.empty()) {
-        m_output << m_indent << "if (" << varName << language::derefPointer << "columnCount() < "
-            << columns.size() << ")\n"
-            << m_dindent << varName << language::derefPointer << "setColumnCount("
+        m_output << m_indent << "if (" << varName << language::derefPointer
+            << "columnCount() < " << columns.size() << ')';
+        if (language::language() == Language::Python)
+            m_output << ':';
+        m_output << '\n' << m_dindent << varName << language::derefPointer << "setColumnCount("
             << columns.size() << ')' << language::eol;
     }
 
@@ -2400,8 +2402,11 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
     const auto &rows = w->elementRow();
 
     if (!rows.isEmpty()) {
-        m_output << m_indent << "if (" << varName << language::derefPointer << "rowCount() < " << rows.size() << ")\n"
-            << m_dindent << varName << language::derefPointer << "setRowCount("
+        m_output << m_indent << "if (" << varName << language::derefPointer
+            << "rowCount() < " << rows.size() << ')';
+        if (language::language() == Language::Python)
+            m_output << ':';
+        m_output << '\n' << m_dindent << varName << language::derefPointer << "setRowCount("
             << rows.size() << ')' << language::eol;
     }
 
@@ -2451,10 +2456,8 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
 
 QString WriteInitialization::trCall(const QString &str, const QString &commentHint, const QString &id) const
 {
-    if (str.isEmpty()) {
-        return language::language() == Language::Cpp
-            ? QLatin1String("QString()") : QLatin1String("\"\"");
-    }
+    if (str.isEmpty())
+        return language::emptyString;
 
     QString result;
     QTextStream ts(&result);