uic: Adapt connection syntax to Python

Extend WriteInitialization::findDeclaration() to return the class name
(on this occasion preparing for generating Qt 5 connection syntax) and
add a helper function for formatting the connection.

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

2 files changed, 27 insertions, 0 deletions

diff --git a/src/tools/uic/shared/language.cpp b/src/tools/uic/shared/language.cpp
index d05f3c935f..fe44f95285 100644
--- a/src/tools/uic/shared/language.cpp
+++ b/src/tools/uic/shared/language.cpp
@@ -384,4 +384,21 @@ void _formatStackVariable(QTextStream &str, const char *className, QStringView v
     }
 }
 
+void formatConnection(QTextStream &str, const SignalSlot &sender, const SignalSlot &receiver)
+{
+    switch (language()) {
+    case Language::Cpp:
+        str << "QObject::connect(" << sender.name << ", SIGNAL("<< sender.signature
+            << "), " << receiver.name << ", SLOT("<< receiver.signature << "))";
+        break;
+    case Language::Python:
+        str << sender.name << '.'
+            << sender.signature.leftRef(sender.signature.indexOf(QLatin1Char('(')))
+            << ".connect(" << receiver.name << '.'
+            << receiver.signature.leftRef(receiver.signature.indexOf(QLatin1Char('(')))
+            << ')';
+        break;
+    }
+}
+
 } // namespace language
diff --git a/src/tools/uic/shared/language.h b/src/tools/uic/shared/language.h
index a1c871a549..eb50a2db7f 100644
--- a/src/tools/uic/shared/language.h
+++ b/src/tools/uic/shared/language.h
@@ -31,6 +31,7 @@
 
 #include <QtCore/qstring.h>
 #include <QtCore/qstringview.h>
+#include <QtCore/qstring.h>
 
 QT_FORWARD_DECLARE_CLASS(QTextStream)
 
@@ -189,6 +190,15 @@ inline QTextStream &operator<<(QTextStream &str, const _stackVariable<withInitPa
 using stackVariable = _stackVariable<false>;
 using stackVariableWithInitParameters = _stackVariable<true>;
 
+struct SignalSlot
+{
+    QString name;
+    QString signature;
+    QString className;
+};
+
+void formatConnection(QTextStream &str, const SignalSlot &sender, const SignalSlot &receiver);
+
 } // namespace language
 
 #endif // LANGUAGE_H