From 038b75825dfe0346c7f793d8fed05f02b4feda1f Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 3 Feb 2010 11:00:45 +0100
Subject: [PATCH] Maemo: Minor style/performance issues.
---
.../qt-maemo/maemorunconfiguration.cpp | 9 ++++++---
.../qt-maemo/maemorunconfigurationwidget.h | 4 ++--
.../qt4projectmanager/qt-maemo/maemoruncontrol.cpp | 13 ++++++++-----
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 742d6922fdb..95853429644 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -49,6 +49,7 @@
#include <QtCore/QDebug>
#include <QtCore/QProcess>
+#include <QtCore/QStringBuilder>
namespace {
const char * const MAEMO_RC_ID("Qt4ProjectManager.MaemoRunConfiguration");
@@ -477,8 +478,9 @@ void MaemoRunConfiguration::updateTarget()
m_executable.clear();
m_cachedTargetInformationValid = true;
- Qt4TargetInformation info = qt4Project()->targetInformation(qt4Project()->activeQt4BuildConfiguration(),
- m_proFilePath);
+ Qt4TargetInformation info
+ = qt4Project()->targetInformation(qt4Project()->activeQt4BuildConfiguration(),
+ m_proFilePath);
if (info.error != Qt4TargetInformation::NoError) {
if (info.error == Qt4TargetInformation::ProParserError) {
Core::ICore::instance()->messageManager()->printToOutputPane(tr(
@@ -489,7 +491,8 @@ void MaemoRunConfiguration::updateTarget()
return;
}
- m_executable = QDir::cleanPath(info.workingDir + QLatin1Char('/') + info.target);
+ m_executable
+ = QDir::cleanPath(info.workingDir % QLatin1Char('/') % info.target);
emit targetInformationChanged();
}
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
index 59d53ba1be0..ff0e4588ef6 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
@@ -53,8 +53,8 @@ class MaemoRunConfigurationWidget : public QWidget
{
Q_OBJECT
public:
- MaemoRunConfigurationWidget(MaemoRunConfiguration *runConfiguration,
- QWidget *parent = 0);
+ explicit MaemoRunConfigurationWidget(MaemoRunConfiguration *runConfiguration,
+ QWidget *parent = 0);
private slots:
void configNameEdited(const QString &text);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
index 37dc0db05e6..4f943788cb4 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
@@ -76,6 +76,7 @@ AbstractMaemoRunControl::AbstractMaemoRunControl(RunConfiguration *rc)
connect(&deployProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this,
SLOT(deployProcessFinished()));
#endif // USE_SSH_LIB
+ qDebug("%s: runconfig = %p, exdecutable = %s", Q_FUNC_INFO, runConfig, qPrintable(runConfig->executable()));
}
void AbstractMaemoRunControl::startDeployment(bool forDebugging)
@@ -87,7 +88,7 @@ void AbstractMaemoRunControl::startDeployment(bool forDebugging)
tr("Deploying"), QLatin1String("Maemo.Deploy"));
#endif // USE_SSH_LIB
if (devConfig.isValid()) {
- deployables.clear();
+ deployables.clear();
if (runConfig->currentlyNeedsDeployment()) {
deployables.append(Deployable(executableFileName(),
QFileInfo(executableOnHost()).canonicalPath(),
@@ -152,8 +153,8 @@ void AbstractMaemoRunControl::deploy()
QStringList cmdArgs;
cmdArgs << "-P" << sshPort() << options() << deployable.fileName
- << (devConfig.uname + QLatin1Char('@') + devConfig.host +
- QLatin1Char(':') + remoteDir());
+ << (devConfig.uname % QLatin1Char('@') % devConfig.host
+ % QLatin1Char(':') % remoteDir());
deployProcess.setWorkingDirectory(deployable.dir);
deployProcess.start(runConfig->scpCmd(), cmdArgs);
@@ -237,6 +238,7 @@ void AbstractMaemoRunControl::deploymentFinished(bool success)
const QString AbstractMaemoRunControl::executableOnHost() const
{
+ qDebug("runconfig->executable: %s", qPrintable(runConfig->executable()));
return runConfig->executable();
}
@@ -474,8 +476,9 @@ MaemoDebugRunControl::MaemoDebugRunControl(RunConfiguration *runConfiguration)
startParams->startMode = Debugger::StartRemote;
startParams->executable = executableOnHost();
startParams->remoteChannel
- = devConfig.host + QLatin1Char(':') + QString::number(devConfig.gdbServerPort);
- startParams->remoteArchitecture = "arm";
+ = devConfig.host % QLatin1Char(':')
+ % QString::number(devConfig.gdbServerPort);
+ startParams->remoteArchitecture = QLatin1String("arm");
startParams->sysRoot = runConfig->sysRoot();
startParams->toolChainType = ToolChain::GCC_MAEMO;
startParams->debuggerCommand = runConfig->gdbCmd();
--
GitLab