QmlDebug: Streamline command line parameter creation

We always have a port now in advance and can construct the
command line directly.

Change-Id: I12dba553f4ef073d7c5b00477baf9fa0e5596bdb
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 2 insertions, 16 deletions

diff --git a/src/libs/qmldebug/qmldebugcommandlinearguments.h b/src/libs/qmldebug/qmldebugcommandlinearguments.h
index 407f991114..dfcb40927b 100644
--- a/src/libs/qmldebug/qmldebugcommandlinearguments.h
+++ b/src/libs/qmldebug/qmldebugcommandlinearguments.h
@@ -66,12 +66,9 @@ static inline QString qmlDebugCommandLineArguments(QmlDebugServicesPreset servic
 }
 
 static inline QString qmlDebugTcpArguments(QmlDebugServicesPreset services,
-                                           Utils::Port port = Utils::Port(),
-                                           bool block = true)
+                                           Utils::Port port, bool block = true)
 {
-    return qmlDebugCommandLineArguments(services, port.isValid() ?
-                                            QString::fromLatin1("port:%1").arg(port.number()) :
-                                            QStringLiteral("port:%qml_port%"), block);
+    return qmlDebugCommandLineArguments(services, QString("port:%1").arg(port.number()), block);
 }
 
 static inline QString qmlDebugNativeArguments(QmlDebugServicesPreset services, bool block = true)
@@ -85,15 +82,4 @@ static inline QString qmlDebugLocalArguments(QmlDebugServicesPreset services, co
     return qmlDebugCommandLineArguments(services, QLatin1String("file:") + socket, block);
 }
 
-static inline QString qmlDebugArguments(QmlDebugServicesPreset services, const QUrl &serverUrl,
-                                             bool block = true)
-{
-    if (serverUrl.scheme() == "socket")
-        return qmlDebugCommandLineArguments(services, "file:" + serverUrl.path(), block);
-    else
-        return qmlDebugCommandLineArguments(services, serverUrl.port() != -1 ?
-                                            QString("port:%1").arg(serverUrl.port()) :
-                                            "port:%qml_port%", block);
-}
-
 } // namespace QmlDebug