From 3f00faa9ef69f57511384cf6c19ecf0d88f42ada Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 28 Feb 2012 11:15:51 +0100 Subject: [PATCH] QmlProfiler: Always use quint16 for port number Change-Id: Ie77227058637c4900248eaca0ea183ad46b82663 Reviewed-by: Christiaan Janssen --- src/plugins/qmlprofiler/abstractqmlprofilerrunner.h | 2 +- src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp | 2 +- src/plugins/qmlprofiler/codaqmlprofilerrunner.h | 2 +- src/plugins/qmlprofiler/localqmlprofilerrunner.cpp | 2 +- src/plugins/qmlprofiler/localqmlprofilerrunner.h | 2 +- src/plugins/qmlprofiler/qmlprofilerengine.h | 2 +- src/plugins/qmlprofiler/qmlprofilertool.cpp | 6 +++--- src/plugins/qmlprofiler/qmlprofilertool.h | 2 +- src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.cpp | 6 +++--- src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.h | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/plugins/qmlprofiler/abstractqmlprofilerrunner.h b/src/plugins/qmlprofiler/abstractqmlprofilerrunner.h index ace4c28a515..78fc5cd9dfd 100644 --- a/src/plugins/qmlprofiler/abstractqmlprofilerrunner.h +++ b/src/plugins/qmlprofiler/abstractqmlprofilerrunner.h @@ -49,7 +49,7 @@ public: virtual void start() = 0; virtual void stop() = 0; - virtual int debugPort() const = 0; + virtual quint16 debugPort() const = 0; signals: void started(); diff --git a/src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp b/src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp index 3a1ddd1f667..d78c889a1c0 100644 --- a/src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp +++ b/src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp @@ -80,7 +80,7 @@ void CodaQmlProfilerRunner::appendMessage(ProjectExplorer::RunControl *, const Q emit appendMessage(message, format); } -int QmlProfiler::Internal::CodaQmlProfilerRunner::debugPort() const +quint16 QmlProfiler::Internal::CodaQmlProfilerRunner::debugPort() const { return m_configuration->debuggerAspect()->qmlDebugServerPort(); } diff --git a/src/plugins/qmlprofiler/codaqmlprofilerrunner.h b/src/plugins/qmlprofiler/codaqmlprofilerrunner.h index 3bc86fb6340..aca03e91744 100644 --- a/src/plugins/qmlprofiler/codaqmlprofilerrunner.h +++ b/src/plugins/qmlprofiler/codaqmlprofilerrunner.h @@ -55,7 +55,7 @@ public: // AbstractQmlProfilerRunner virtual void start(); virtual void stop(); - virtual int debugPort() const; + virtual quint16 debugPort() const; private slots: void appendMessage(ProjectExplorer::RunControl *, const QString &message, diff --git a/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp b/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp index 1d708dda593..e7b11f5cf9a 100644 --- a/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp +++ b/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp @@ -85,7 +85,7 @@ void LocalQmlProfilerRunner::stop() } } -int LocalQmlProfilerRunner::debugPort() const +quint16 LocalQmlProfilerRunner::debugPort() const { return m_configuration.port; } diff --git a/src/plugins/qmlprofiler/localqmlprofilerrunner.h b/src/plugins/qmlprofiler/localqmlprofilerrunner.h index c71b234f7cf..c49c38c283c 100644 --- a/src/plugins/qmlprofiler/localqmlprofilerrunner.h +++ b/src/plugins/qmlprofiler/localqmlprofilerrunner.h @@ -59,7 +59,7 @@ public: // AbstractQmlProfilerRunner virtual void start(); virtual void stop(); - virtual int debugPort() const; + virtual quint16 debugPort() const; bool hasExecutable() const { return !m_configuration.executable.isEmpty(); } diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.h b/src/plugins/qmlprofiler/qmlprofilerengine.h index b0199c31312..aade80edb73 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.h +++ b/src/plugins/qmlprofiler/qmlprofilerengine.h @@ -51,7 +51,7 @@ public: static void showNonmodalWarning(const QString &warningMsg); signals: - void processRunning(int port); + void processRunning(quint16 port); void stopRecording(); void timeUpdate(); void recordingChanged(bool recording); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 7d11326cb68..a8f06e4e78a 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -136,7 +136,7 @@ public: ConnectMode m_connectMode; QString m_tcpHost; - quint64 m_tcpPort; + quint16 m_tcpPort; QString m_ostDevice; QString m_sysroot; QAction *m_saveQmlTrace; @@ -364,7 +364,7 @@ IAnalyzerEngine *QmlProfilerTool::createEngine(const AnalyzerStartParameters &sp d->m_projectFinder.setProjectFiles(sourceFiles); d->m_projectFinder.setSysroot(sp.sysroot); - connect(engine, SIGNAL(processRunning(int)), this, SLOT(connectClient(int))); + connect(engine, SIGNAL(processRunning(quint16)), this, SLOT(connectClient(quint16))); connect(engine, SIGNAL(finished()), this, SLOT(disconnectClient())); connect(engine, SIGNAL(finished()), this, SLOT(updateTimers())); connect(engine, SIGNAL(stopRecording()), this, SLOT(stopRecording())); @@ -531,7 +531,7 @@ QWidget *QmlProfilerTool::createWidgets() return toolbarWidget; } -void QmlProfilerTool::connectClient(int port) +void QmlProfilerTool::connectClient(quint16 port) { if (d->m_client) delete d->m_client; diff --git a/src/plugins/qmlprofiler/qmlprofilertool.h b/src/plugins/qmlprofiler/qmlprofilertool.h index 3b53e5d7274..32f46105f06 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.h +++ b/src/plugins/qmlprofiler/qmlprofilertool.h @@ -73,7 +73,7 @@ public: void startTool(Analyzer::StartMode mode); public slots: - void connectClient(int port); + void connectClient(quint16 port); void disconnectClient(); void startRecording(); diff --git a/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.cpp b/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.cpp index 360f274a5ca..7930cf3333b 100644 --- a/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.cpp +++ b/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.cpp @@ -45,7 +45,7 @@ using namespace RemoteLinux; RemoteLinuxQmlProfilerRunner::RemoteLinuxQmlProfilerRunner( RemoteLinuxRunConfiguration *runConfiguration, QObject *parent) : AbstractQmlProfilerRunner(parent) - , m_port(-1) + , m_port(0) , m_runControl(0) { // find run control factory @@ -96,7 +96,7 @@ void RemoteLinuxQmlProfilerRunner::stop() runner()->stop(); } -int RemoteLinuxQmlProfilerRunner::debugPort() const +quint16 RemoteLinuxQmlProfilerRunner::debugPort() const { return m_port; } @@ -105,7 +105,7 @@ void RemoteLinuxQmlProfilerRunner::getPorts() { QTC_ASSERT(runner(), return); m_port = runner()->freePorts()->getNext(); - if (m_port == -1) { + if (m_port == 0) { emit appendMessage(tr("Not enough free ports on device for analyzing.\n"), Utils::ErrorMessageFormat); runner()->stop(); diff --git a/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.h b/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.h index 7841a6ae7cc..086e1aa33e4 100644 --- a/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.h +++ b/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.h @@ -53,7 +53,7 @@ public: // AbstractQmlProfilerRunner virtual void start(); virtual void stop(); - virtual int debugPort() const; + virtual quint16 debugPort() const; private slots: void getPorts(); @@ -67,7 +67,7 @@ private slots: private: RemoteLinux::AbstractRemoteLinuxApplicationRunner *runner() const; - int m_port; + quint16 m_port; RemoteLinux::AbstractRemoteLinuxRunControl *m_runControl; };