remove MaintenanceTitle

We simply use the Title field and add "Maintain " in front.
This way it can easily be translated.

Change-Id: I343b5480c6fb7428ec264e39ae5c17d8d3029d5d
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

6 files changed, 1 insertions, 12 deletions

diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index 0bd37fe82..6c6437f34 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -189,9 +189,6 @@
             \o  Title
             \o  Name of the installer as displayed on the title bar.
         \row
-            \o  MaintenanceTitle
-            \o  Name of the maintenance tool as displayed on the title bar.
-        \row
             \o  Publisher
             \o  Publisher of the software.
         \row
diff --git a/installerbuilder/libinstaller/constants.h b/installerbuilder/libinstaller/constants.h
index 89afca1eb..ea512ed76 100644
--- a/installerbuilder/libinstaller/constants.h
+++ b/installerbuilder/libinstaller/constants.h
@@ -73,7 +73,6 @@ static const QLatin1String scPublisher("Publisher");
 static const QLatin1String scRunProgram("RunProgram");
 static const QLatin1String scStartMenuDir("StartMenuDir");
 static const QLatin1String scRemoveTargetDir("RemoveTargetDir");
-static const QLatin1String scMaintenanceTitle("MaintenanceTitle");
 static const QLatin1String scRunProgramDescription("RunProgramDescription");
 static const QLatin1String scTargetConfigurationFile("TargetConfigurationFile");
 static const QLatin1String scAllowNonAsciiCharacters("AllowNonAsciiCharacters");
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index cc1055315..2b2a541b9 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -537,7 +537,6 @@ void PackageManagerCorePrivate::initialize()
     m_vars.insert(QLatin1String("ProductName"), m_settings.applicationName());
     m_vars.insert(QLatin1String("ProductVersion"), m_settings.applicationVersion());
     m_vars.insert(scTitle, m_settings.title());
-    m_vars.insert(scMaintenanceTitle, m_settings.maintenanceTitle());
     m_vars.insert(scPublisher, m_settings.publisher());
     m_vars.insert(QLatin1String("Url"), m_settings.url());
     m_vars.insert(scStartMenuDir, m_settings.startMenuDir());
diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp
index bf96f8dd7..a2c5b72e3 100644
--- a/installerbuilder/libinstaller/packagemanagergui.cpp
+++ b/installerbuilder/libinstaller/packagemanagergui.cpp
@@ -237,7 +237,7 @@ PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent)
     if (m_core->isInstaller())
         setWindowTitle(tr("%1 Setup").arg(m_core->value(scTitle)));
     else
-        setWindowTitle(tr("%1").arg(m_core->value(scMaintenanceTitle)));
+        setWindowTitle(tr("Maintain %1").arg(m_core->value(scTitle)));
 
 #ifndef Q_WS_MAC
     setWindowIcon(QIcon(m_core->settings().icon()));
diff --git a/installerbuilder/libinstaller/settings.cpp b/installerbuilder/libinstaller/settings.cpp
index 1699b462b..6507c0e7d 100644
--- a/installerbuilder/libinstaller/settings.cpp
+++ b/installerbuilder/libinstaller/settings.cpp
@@ -235,11 +235,6 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix)
     return s;
 }
 
-QString Settings::maintenanceTitle() const
-{
-    return d->m_data.value(scMaintenanceTitle).toString();
-}
-
 QString Settings::logo() const
 {
     return d->makeAbsolutePath(d->m_data.value(scLogo).toString());
diff --git a/installerbuilder/libinstaller/settings.h b/installerbuilder/libinstaller/settings.h
index 987321f24..5fb60a7c9 100644
--- a/installerbuilder/libinstaller/settings.h
+++ b/installerbuilder/libinstaller/settings.h
@@ -74,7 +74,6 @@ public:
     QString logo() const;
     QString logoSmall() const;
     QString title() const;
-    QString maintenanceTitle() const;
     QString publisher() const;
     QString url() const;
     QString watermark() const;