From 7c0341daeef9c975b0e736b9d8a52b9649c6a06c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 3 Jan 2020 12:51:20 +0100
Subject: uic: Fix empty strings for Python

Introduce a constant in the language namespace.

Fixes: PYSIDE-1174
Change-Id: Ic3e58580b20c1d9a6ddf97f20709a3046d4b6f0c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 src/tools/uic/cpp/cppwriteinitialization.cpp | 12 +++++-------
 src/tools/uic/shared/language.cpp            |  3 +++
 src/tools/uic/shared/language.h              |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 570a61a1f1..4fbf01262b 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
@@ -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;
             }
         }
     }
@@ -2451,10 +2451,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);
diff --git a/src/tools/uic/shared/language.cpp b/src/tools/uic/shared/language.cpp
index 235a8ed2fc..987d51e30c 100644
--- a/src/tools/uic/shared/language.cpp
+++ b/src/tools/uic/shared/language.cpp
@@ -49,6 +49,7 @@ void setLanguage(Language l)
         qualifier = QLatin1String("::");
         self = QLatin1String("");  // for testing: change to "this->";
         eol = QLatin1String(";\n");
+        emptyString = QLatin1String("QString()");
         encoding = Encoding::Utf8;
         break;
     case Language::Python:
@@ -59,6 +60,7 @@ void setLanguage(Language l)
         qualifier = QLatin1String(".");
         self = QLatin1String("self.");
         eol = QLatin1String("\n");
+        emptyString = QLatin1String("\"\"");
         encoding = Encoding::Unicode;
         break;
     }
@@ -71,6 +73,7 @@ QString qtQualifier;
 QString qualifier;
 QString self;
 QString eol;
+QString emptyString;
 
 QString cppQualifier = QLatin1String("::");
 QString cppTrue = QLatin1String("true");
diff --git a/src/tools/uic/shared/language.h b/src/tools/uic/shared/language.h
index fc8af9715b..7b019ec8fc 100644
--- a/src/tools/uic/shared/language.h
+++ b/src/tools/uic/shared/language.h
@@ -49,6 +49,7 @@ extern QString qtQualifier;
 extern QString qualifier;
 extern QString self;
 extern QString eol;
+extern QString emptyString;
 
 extern QString cppQualifier;
 extern QString cppTrue;
-- 
cgit v1.2.3