From 93d3205459a3e6db65d3f4a8ed5c8e3a5a62f48d Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 18 Feb 2010 16:10:56 +0100
Subject: [PATCH] Update Wizards to new signature
Seems like I missed some the first time round. Sorry for that!
---
src/plugins/genericprojectmanager/genericprojectwizard.cpp | 3 ++-
src/plugins/genericprojectmanager/genericprojectwizard.h | 2 +-
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp | 3 ++-
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.h | 2 +-
src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp | 3 ++-
src/plugins/qmlprojectmanager/qmlprojectimportwizard.h | 2 +-
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index caaef844808..8e355b147c0 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -214,8 +214,9 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
return files;
}
-bool GenericProjectWizard::postGenerateFiles(const Core::GeneratedFiles &l, QString *errorMessage)
+bool GenericProjectWizard::postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage)
{
+ Q_UNUSED(w);
// Post-Generate: Open the project
const QString proFileName = l.back().path();
if (!ProjectExplorer::ProjectExplorerPlugin::instance()->openProject(proFileName)) {
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.h b/src/plugins/genericprojectmanager/genericprojectwizard.h
index 6860418905d..9e5cecabf1a 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.h
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.h
@@ -82,7 +82,7 @@ protected:
virtual Core::GeneratedFiles generateFiles(const QWizard *w,
QString *errorMessage) const;
- virtual bool postGenerateFiles(const Core::GeneratedFiles &l, QString *errorMessage);
+ virtual bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
bool isValidDir(const QFileInfo &fileInfo) const;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index 9919cec32a6..248c72bac2e 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -154,8 +154,9 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w
return files;
}
-bool QmlProjectApplicationWizard::postGenerateFiles(const Core::GeneratedFiles &l, QString *errorMessage)
+bool QmlProjectApplicationWizard::postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage)
{
+ Q_UNUSED(w);
// Post-Generate: Open the project
const QString proFileName = l.back().path();
if (!ProjectExplorer::ProjectExplorerPlugin::instance()->openProject(proFileName)) {
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.h b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.h
index 6e96b6da3be..4b1285651c3 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.h
@@ -69,7 +69,7 @@ protected:
virtual Core::GeneratedFiles generateFiles(const QWizard *w,
QString *errorMessage) const;
- virtual bool postGenerateFiles(const Core::GeneratedFiles &l, QString *errorMessage);
+ virtual bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
};
} // end of namespace Internal
diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
index aa006f421fa..817a36d50b9 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
@@ -170,8 +170,9 @@ Core::GeneratedFiles QmlProjectImportWizard::generateFiles(const QWizard *w,
return files;
}
-bool QmlProjectImportWizard::postGenerateFiles(const Core::GeneratedFiles &l, QString *errorMessage)
+bool QmlProjectImportWizard::postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage)
{
+ Q_UNUSED(w);
// Post-Generate: Open the project
const QString proFileName = l.back().path();
if (!ProjectExplorer::ProjectExplorerPlugin::instance()->openProject(proFileName)) {
diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.h b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.h
index 07074c75204..c7d6ff67450 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.h
@@ -83,7 +83,7 @@ protected:
virtual Core::GeneratedFiles generateFiles(const QWizard *w,
QString *errorMessage) const;
- virtual bool postGenerateFiles(const Core::GeneratedFiles &l, QString *errorMessage);
+ virtual bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
};
} // end of namespace Internal
--
GitLab