From 9bd53be4c912c9c61e11291b1d015efd6ab50d13 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 13 Jul 2010 16:49:30 +0200
Subject: [PATCH] Maemo: Get rid of two unneeded functions.
---
.../qt-maemo/maemodeploystep.cpp | 16 ++++------------
.../qt4projectmanager/qt-maemo/maemodeploystep.h | 2 --
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index 358915b85b3..19eed45c798 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -219,16 +219,6 @@ MaemoDeviceConfig MaemoDeployStep::deviceConfig() const
: MaemoDeviceConfig();
}
-QString MaemoDeployStep::packageFileName() const
-{
- return QFileInfo(packageFilePath()).fileName();
-}
-
-QString MaemoDeployStep::packageFilePath() const
-{
- return packagingStep()->packageFilePath();
-}
-
void MaemoDeployStep::start()
{
m_stopped = false;
@@ -288,7 +278,7 @@ void MaemoDeployStep::handleSftpChannelInitialized()
const MaemoPackageCreationStep * const pStep = packagingStep();
const QString hostName = m_connection->connectionParameters().host;
if (pStep->isPackagingEnabled()) {
- const MaemoDeployable d(packageFilePath(), uploadDir());
+ const MaemoDeployable d(pStep->packageFilePath(), uploadDir());
if (currentlyNeedsDeployment(hostName, d)) {
if (!deploy(MaemoDeployable(d)))
return;
@@ -405,8 +395,10 @@ void MaemoDeployStep::handleLinkProcessFinished(int exitStatus)
if (m_linksInProgress.isEmpty() && m_uploadsInProgress.isEmpty()) {
if (m_needsInstall) {
writeOutput(tr("Installing package ..."));
+ const QString packageFileName
+ = QFileInfo(packagingStep()->packageFilePath()).fileName();
const QByteArray cmd = remoteSudo().toUtf8() + " dpkg -i "
- + packageFileName().toUtf8();
+ + packageFileName.toUtf8();
m_installer = m_connection->createRemoteProcess(cmd);
connect(m_installer.data(), SIGNAL(closed(int)), this,
SLOT(handleInstallationFinished(int)));
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h
index b939997a7fc..95331c1cd96 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h
@@ -104,8 +104,6 @@ private:
const MaemoPackageCreationStep *packagingStep() const;
bool deploy(const MaemoDeployable &deployable);
QString uploadDir() const;
- QString packageFileName() const;
- QString packageFilePath() const;
static const QLatin1String Id;
--
GitLab