From aea92807be2567c4212b96ae67de7137075ba4ee Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Tue, 14 Mar 2023 08:29:43 +0000
Subject: Revert "qdbusxml2cpp: invert Q_DECL_DEPRECATED and inline in the
 output"

This reverts commit 310f6666150f18d40630b54cf5c9424e4cfb5567.

Reason for revert: Causes a fail-to-build regression

Task-number: QTBUG-111330
Change-Id: I08a6a68d2c81e1a1189356aa7cf36aaf24fd8c9b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp            | 12 +++---
 tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp | 49 ----------------------
 2 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
index 873c133232..0bfaf6eb1e 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -606,15 +606,13 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
                 continue;
             }
 
-            if (isDeprecated)
-                hs << "    Q_DECL_DEPRECATED ";
-            else
-                hs << "    ";
+            hs << "    inline "
+               << (isDeprecated ? "Q_DECL_DEPRECATED " : "");
 
             if (isNoReply) {
-                hs << "Q_NOREPLY inline void ";
+                hs << "Q_NOREPLY void ";
             } else {
-                hs << "inline QDBusPendingReply<";
+                hs << "QDBusPendingReply<";
                 for (qsizetype i = 0; i < method.outputArgs.size(); ++i)
                     hs << (i > 0 ? ", " : "")
                        << templateArg(qtTypeName(method.outputArgs.at(i).name, method.outputArgs.at(i).type,
@@ -650,7 +648,7 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
 
             if (method.outputArgs.size() > 1) {
                 // generate the old-form QDBusReply methods with multiple incoming parameters
-                hs << (isDeprecated ? "    Q_DECL_DEPRECATED " : "    ") << "inline QDBusReply<"
+                hs << "    inline " << (isDeprecated ? "Q_DECL_DEPRECATED " : "") << "QDBusReply<"
                    << templateArg(qtTypeName(method.outputArgs.first().name, method.outputArgs.first().type,
                                              method.annotations, 0, "Out"))
                    << "> ";
diff --git a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
index 1dde91311a..f75790da6e 100644
--- a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
+++ b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
@@ -240,46 +240,6 @@ void tst_qdbusxml2cpp::process_data()
             << QRegularExpression("Q_SLOTS:.*QString Method\\(const QString &\\w*, const QString &\\w*, QString &",
                                   QRegularExpression::DotMatchesEverythingOption);
 
-    QTest::newRow("method-deprecated-0out")
-            << "<method name=\"Method\">"
-               "<annotation name=\"org.freedesktop.DBus.Deprecated\" value=\"true\"/>"
-               "</method>"
-            << QRegularExpression("Q_SLOTS:.*Q_DECL_DEPRECATED inline QDBusPendingReply<> Method\\(\\)",
-                                  QRegularExpression::DotMatchesEverythingOption)
-            << QRegularExpression("Q_SLOTS:.*void Method\\(\\)",
-                                  QRegularExpression::DotMatchesEverythingOption);
-
-    QTest::newRow("method-deprecated-2out")
-            << "<method name=\"Method\">"
-               "<annotation name=\"org.freedesktop.DBus.Deprecated\" value=\"true\"/>"
-               "<arg type=\"s\" direction=\"out\"/>"
-               "<arg type=\"s\" direction=\"out\"/>"
-               "</method>"
-            << QRegularExpression("Q_SLOTS:.*Q_DECL_DEPRECATED inline QDBusPendingReply<QString, QString> Method\\(\\)"
-                                  ".*Q_DECL_DEPRECATED inline QDBusReply<QString> Method\\(QString &\\w*\\)",
-                                  QRegularExpression::DotMatchesEverythingOption)
-            << QRegularExpression("Q_SLOTS:.*QString Method\\(QString &",
-                                  QRegularExpression::DotMatchesEverythingOption);
-
-    QTest::newRow("method-noreply")
-            << "<method name=\"Method\">"
-               "<annotation name=\"org.freedesktop.DBus.Method.NoReply\" value=\"true\"/>"
-               "</method>"
-            << QRegularExpression("Q_SLOTS:.*Q_NOREPLY inline void Method\\(\\).*\\bQDBus::NoBlock\\b",
-                                  QRegularExpression::DotMatchesEverythingOption)
-            << QRegularExpression("Q_SLOTS:.*Q_NOREPLY void Method\\(",
-                                  QRegularExpression::DotMatchesEverythingOption);
-
-    QTest::newRow("method-deprecated-noreply")
-            << "<method name=\"Method\">"
-               "<annotation name=\"org.freedesktop.DBus.Method.NoReply\" value=\"true\"/>"
-               "<annotation name=\"org.freedesktop.DBus.Deprecated\" value=\"true\"/>"
-               "</method>"
-            << QRegularExpression("Q_SLOTS:.*Q_DECL_DEPRECATED Q_NOREPLY inline void Method\\(\\).*\\bQDBus::NoBlock\\b",
-                                  QRegularExpression::DotMatchesEverythingOption)
-            << QRegularExpression("Q_SLOTS:.*Q_NOREPLY void Method\\(",
-                                  QRegularExpression::DotMatchesEverythingOption);
-
     // -- signals --
     for (int i = 0; i < basicTypeCount; ++i) {
         QRegularExpression rx(QString("Q_SIGNALS:.*\\bvoid Signal\\((const )?%1\\b")
@@ -301,15 +261,6 @@ void tst_qdbusxml2cpp::process_data()
                     <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>"
                   </signal>)"
             << rx << rx;
-
-    QTest::newRow("signal-deprecated")
-            << R"(<signal name="Signal">
-                    <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
-                  </signal>)"
-            << QRegularExpression(R"(Q_SIGNALS:.*\bQ_DECL_DEPRECATED void Signal\(\))",
-                                  QRegularExpression::DotMatchesEverythingOption)
-            << QRegularExpression(R"(Q_SIGNALS:.*\bvoid Signal\(\))",
-                                  QRegularExpression::DotMatchesEverythingOption);
 }
 
 void tst_qdbusxml2cpp::process()
-- 
cgit v1.2.1