1 files changed, 6 insertions, 14 deletions
diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp
index cd71652729..477cb70383 100644
--- a/src/plugins/android/androidpackageinstallationstep.cpp
+++ b/src/plugins/android/androidpackageinstallationstep.cpp
@@ -31,30 +31,22 @@
 #include "androidpackageinstallationstep.h"
 #include "androidmanager.h"
 
-#include <QFileInfo>
-#include <QDir>
 #include <projectexplorer/buildsteplist.h>
 
 using namespace Android::Internal;
 
-const Core::Id AndroidPackageInstallationStep::Id("Qt4ProjectManager.AndroidPackageInstallationStep");
+const Core::Id AndroidPackageInstallationStep::Id = Core::Id("Qt4ProjectManager.AndroidPackageInstallationStep");
 
-static inline QString stepDisplayName()
+AndroidPackageInstallationStep::AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl)
+    : MakeStep(bsl, Id)
 {
-    return AndroidPackageInstallationStep::tr("Copy application data");
-}
-
-AndroidPackageInstallationStep::AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl) : MakeStep(bsl, Id)
-{
-    const QString name = stepDisplayName();
+    const QString name = tr("Copy application data");
     setDefaultDisplayName(name);
     setDisplayName(name);
 }
 
-AndroidPackageInstallationStep::AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bc, AndroidPackageInstallationStep *other): MakeStep(bc, other)
-{ }
-
-AndroidPackageInstallationStep::~AndroidPackageInstallationStep()
+AndroidPackageInstallationStep::AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bc, AndroidPackageInstallationStep *other)
+    : MakeStep(bc, other)
 { }
 
 bool AndroidPackageInstallationStep::init()