diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2014-02-13 14:56:14 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-02-13 16:21:29 +0100 |
commit | 424b9a0036141d24cb6d563c8cf76e2d7e6b2ab5 (patch) | |
tree | f4c9b6c1162f499241dbdaaeefecdfb69cc90951 /src | |
parent | 12b0fedcfc4b9de489aa9fa028a77333f7510801 (diff) | |
download | qt-creator-424b9a0036141d24cb6d563c8cf76e2d7e6b2ab5.tar.gz |
IWizard and derived classes: Code cleanups
There should be no functional changes, just removal of unnecessary
code. This includes:
* Removal of unused QObject *parent = 0 parameters to constructors
* Removal of unnecessary explicits
* Removal of unnecessary virtuals
* Removal of unnecessary constructors/destructors
Some explicits were added though where those were missing.
Change-Id: Iab570349ea950dad0a2d01af17bc6175f70832f1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src')
26 files changed, 53 insertions, 125 deletions
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index 99962f475f..e21cbe6d10 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -175,17 +175,6 @@ void WizardEventLoop::rejected() \sa Core::Internal::WizardEventLoop */ - -BaseFileWizard::BaseFileWizard(QObject *parent) : - IWizard(parent) -{ -} - - -BaseFileWizard::~BaseFileWizard() -{ -} - BaseFileWizard::ExtensionList BaseFileWizard::selectExtensions() { return ExtensionSystem::PluginManager::getObjects<IFileWizardExtension>(); @@ -532,11 +521,6 @@ QString BaseFileWizard::preferredSuffix(const QString &mimeType) Creates the files with the \a name under the \a path. */ -StandardFileWizard::StandardFileWizard(QObject *parent) : - BaseFileWizard(parent) -{ -} - /*! Creates a Utils::FileWizardDialog. */ diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h index a7b52e4d2b..88016dfa2b 100644 --- a/src/plugins/coreplugin/basefilewizard.h +++ b/src/plugins/coreplugin/basefilewizard.h @@ -108,10 +108,8 @@ class CORE_EXPORT BaseFileWizard : public IWizard Q_OBJECT public: - virtual ~BaseFileWizard(); - // IWizard - virtual void runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &extraValues); + void runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &extraValues); static QString buildFileName(const QString &path, const QString &baseName, const QString &extension); static void applyExtensionPageShortTitle(Utils::Wizard *wizard, int pageId); @@ -120,8 +118,6 @@ protected: typedef QList<QWizardPage *> WizardPageList; typedef QList<Core::IFileWizardExtension*> ExtensionList; - explicit BaseFileWizard(QObject *parent = 0); - virtual ExtensionList selectExtensions(); virtual QWizard *createWizardDialog(QWidget *parent, @@ -147,9 +143,8 @@ class CORE_EXPORT StandardFileWizard : public BaseFileWizard Q_OBJECT protected: - explicit StandardFileWizard(QObject *parent = 0); - virtual QWizard *createWizardDialog(QWidget *parent, const WizardDialogParameters &wizardDialogParameters) const; - virtual GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; + QWizard *createWizardDialog(QWidget *parent, const WizardDialogParameters &wizardDialogParameters) const; + GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; virtual GeneratedFiles generateFilesFromPath(const QString &path, const QString &name, QString *errorMessage) const = 0; }; diff --git a/src/plugins/coreplugin/dialogs/iwizard.h b/src/plugins/coreplugin/dialogs/iwizard.h index d527540afe..bf95177358 100644 --- a/src/plugins/coreplugin/dialogs/iwizard.h +++ b/src/plugins/coreplugin/dialogs/iwizard.h @@ -74,8 +74,7 @@ public: QString descriptionImage; }; - IWizard(QObject *parent = 0) : QObject(parent) {} - ~IWizard() {} + IWizard() { } QString id() const { return m_data.id; } WizardKind kind() const { return m_data.kind; } diff --git a/src/plugins/cppeditor/cppfilewizard.h b/src/plugins/cppeditor/cppfilewizard.h index 12ee53d1ca..441bfbe0c1 100644 --- a/src/plugins/cppeditor/cppfilewizard.h +++ b/src/plugins/cppeditor/cppfilewizard.h @@ -42,7 +42,7 @@ class CppFileWizard : public Core::StandardFileWizard Q_OBJECT public: - CppFileWizard(FileType type); + explicit CppFileWizard(FileType type); private: QString fileContents(FileType type, const QString &baseName) const; diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h index 214e5cb1f8..592981ac2f 100644 --- a/src/plugins/designer/cpp/formclasswizard.h +++ b/src/plugins/designer/cpp/formclasswizard.h @@ -52,8 +52,7 @@ private: QWizard *createWizardDialog(QWidget *parent, const Core::WizardDialogParameters &wizardDialogParameters) const; - Core::GeneratedFiles generateFiles(const QWizard *w, - QString *errorMessage) const; + Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; }; } // namespace Internal diff --git a/src/plugins/designer/formwizard.h b/src/plugins/designer/formwizard.h index 4eb15d90d4..ebca6531be 100644 --- a/src/plugins/designer/formwizard.h +++ b/src/plugins/designer/formwizard.h @@ -46,8 +46,7 @@ private: QWizard *createWizardDialog(QWidget *parent, const Core::WizardDialogParameters &wizardDialogParameters) const; - Core::GeneratedFiles generateFiles(const QWizard *w, - QString *errorMessage) const; + Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h index 6119c7c5c2..2468c3dfeb 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.h +++ b/src/plugins/projectexplorer/customwizard/customwizard.h @@ -78,14 +78,14 @@ public: typedef QSharedPointer<ICustomWizardFactory> ICustomWizardFactoryPtr; CustomWizard(); - virtual ~CustomWizard(); + ~CustomWizard(); // Can be reimplemented to create custom wizards. initWizardDialog() needs to be // called. - virtual QWizard *createWizardDialog(QWidget *parent, - const Core::WizardDialogParameters &wizardDialogParameters) const; + QWizard *createWizardDialog(QWidget *parent, + const Core::WizardDialogParameters &wizardDialogParameters) const; - virtual Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; + Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; // Register a factory for a derived custom widget static void registerFactory(const QString &name, const ICustomWizardFactoryPtr &f); @@ -110,7 +110,7 @@ protected: Core::GeneratedFiles generateWizardFiles(QString *errorMessage) const; // Create replacement map as static base fields + QWizard fields FieldReplacementMap replacementMap(const QWizard *w) const; - virtual bool writeFiles(const Core::GeneratedFiles &files, QString *errorMessage); + bool writeFiles(const Core::GeneratedFiles &files, QString *errorMessage); CustomWizardParametersPtr parameters() const; CustomWizardContextPtr context() const; @@ -144,7 +144,7 @@ signals: void projectLocationChanged(const QString &path); protected: - virtual bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage); + bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage); void initProjectWizardDialog(BaseProjectWizardDialog *w, const QString &defaultPath, const WizardPageList &extensionPages) const; diff --git a/src/plugins/pythoneditor/wizard/pythonfilewizard.cpp b/src/plugins/pythoneditor/wizard/pythonfilewizard.cpp index 105b4abacf..dbf444d17d 100644 --- a/src/plugins/pythoneditor/wizard/pythonfilewizard.cpp +++ b/src/plugins/pythoneditor/wizard/pythonfilewizard.cpp @@ -55,10 +55,6 @@ FileWizard::FileWizard() setDescription(FileWizard::tr(Constants::EN_PY_SOURCE_DESCRIPTION)); } -FileWizard::~FileWizard() -{ -} - /** * @brief FileWizard::createWizardDialog * @param parent diff --git a/src/plugins/pythoneditor/wizard/pythonfilewizard.h b/src/plugins/pythoneditor/wizard/pythonfilewizard.h index 9f092f3769..aa3f5456ac 100644 --- a/src/plugins/pythoneditor/wizard/pythonfilewizard.h +++ b/src/plugins/pythoneditor/wizard/pythonfilewizard.h @@ -40,14 +40,12 @@ class FileWizard : public Core::BaseFileWizard public: FileWizard(); - ~FileWizard(); protected: QWizard *createWizardDialog(QWidget *parent, const Core::WizardDialogParameters ¶ms) const; - Core::GeneratedFiles generateFiles( const QWizard *dialog, - QString *errorMessage) const; + Core::GeneratedFiles generateFiles( const QWizard *dialog, QString *errorMessage) const; }; } // namespace PythonEditor diff --git a/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.cpp index c4caa59454..ef702792d9 100644 --- a/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.cpp @@ -97,11 +97,6 @@ int AbstractMobileAppWizardDialog::addPageWithTitle(QWizardPage *page, const QSt return pageId; } - -AbstractMobileAppWizard::AbstractMobileAppWizard(QObject *parent) - : Core::BaseFileWizard(parent) -{ } - QWizard *AbstractMobileAppWizard::createWizardDialog(QWidget *parent, const Core::WizardDialogParameters &wizardDialogParameters) const { diff --git a/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.h b/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.h index 0991b90bfa..75c0c9e646 100644 --- a/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.h @@ -72,8 +72,6 @@ private: class QMAKEPROJECTMANAGER_EXPORT AbstractMobileAppWizard : public Core::BaseFileWizard { Q_OBJECT -protected: - explicit AbstractMobileAppWizard(QObject *parent = 0); private slots: void useProjectPath(const QString &projectName, const QString &projectPath); @@ -82,20 +80,17 @@ protected: virtual QString fileToOpenPostGeneration() const = 0; private: - virtual QWizard *createWizardDialog(QWidget *parent, - const Core::WizardDialogParameters &wizardDialogParameters) const; - virtual Core::GeneratedFiles generateFiles(const QWizard *wizard, - QString *errorMessage) const; - virtual bool postGenerateFiles(const QWizard *w, - const Core::GeneratedFiles &l, QString *errorMessage); + QWizard *createWizardDialog(QWidget *parent, + const Core::WizardDialogParameters &wizardDialogParameters) const; + Core::GeneratedFiles generateFiles(const QWizard *wizard, QString *errorMessage) const; + bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage); virtual AbstractMobileApp *app() const = 0; virtual AbstractMobileAppWizardDialog *wizardDialog() const = 0; virtual AbstractMobileAppWizardDialog *createWizardDialogInternal(QWidget *parent, const Core::WizardDialogParameters &wizardDialogParameters) const = 0; virtual void projectPathChanged(const QString &path) const = 0; - virtual void prepareGenerateFiles(const QWizard *wizard, - QString *errorMessage) const = 0; + virtual void prepareGenerateFiles(const QWizard *wizard, QString *errorMessage) const = 0; }; } // namespace QmakeProjectManager diff --git a/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.h b/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.h index 5dffb475e3..050329965a 100644 --- a/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.h @@ -48,8 +48,7 @@ protected: QWizard *createWizardDialog(QWidget *parent, const Core::WizardDialogParameters &wizardDialogParameters) const; - Core::GeneratedFiles generateFiles(const QWizard *w, - QString *errorMessage) const; + Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; }; } // namespace Internal diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h index d156940302..1fd965e7c2 100644 --- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h @@ -54,7 +54,6 @@ private: static bool parametrizeTemplate(const QString &templatePath, const QString &templateName, const GuiAppParameters ¶ms, QString *target, QString *errorMessage); - }; } // namespace Internal diff --git a/src/plugins/qmakeprojectmanager/wizards/html5appwizard.h b/src/plugins/qmakeprojectmanager/wizards/html5appwizard.h index afb92cd072..22134c1a4f 100644 --- a/src/plugins/qmakeprojectmanager/wizards/html5appwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/html5appwizard.h @@ -47,13 +47,12 @@ protected: QString fileToOpenPostGeneration() const; private: - virtual AbstractMobileApp *app() const; - virtual AbstractMobileAppWizardDialog *wizardDialog() const; - virtual AbstractMobileAppWizardDialog *createWizardDialogInternal(QWidget *parent, - const Core::WizardDialogParameters ¶meters) const; - virtual void projectPathChanged(const QString &path) const; - virtual void prepareGenerateFiles(const QWizard *wizard, - QString *errorMessage) const; + AbstractMobileApp *app() const; + AbstractMobileAppWizardDialog *wizardDialog() const; + AbstractMobileAppWizardDialog *createWizardDialogInternal(QWidget *parent, + const Core::WizardDialogParameters ¶meters) const; + void projectPathChanged(const QString &path) const; + void prepareGenerateFiles(const QWizard *wizard, QString *errorMessage) const; class Html5AppWizardPrivate *d; }; diff --git a/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.h b/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.h index 5348dcd5f5..d0db0a31d3 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.h @@ -47,13 +47,12 @@ protected: QString fileToOpenPostGeneration() const; private: - virtual AbstractMobileApp *app() const; - virtual AbstractMobileAppWizardDialog *wizardDialog() const; - virtual AbstractMobileAppWizardDialog *createWizardDialogInternal(QWidget *parent, - const Core::WizardDialogParameters &baseParameters) const; - virtual void projectPathChanged(const QString &path) const; - virtual void prepareGenerateFiles(const QWizard *wizard, - QString *errorMessage) const; + AbstractMobileApp *app() const; + AbstractMobileAppWizardDialog *wizardDialog() const; + AbstractMobileAppWizardDialog *createWizardDialogInternal(QWidget *parent, + const Core::WizardDialogParameters &baseParameters) const; + void projectPathChanged(const QString &path) const; + void prepareGenerateFiles(const QWizard *wizard, QString *errorMessage) const; class QtQuickAppWizardPrivate *d; }; diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h index bc4c86124c..53548335c2 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h @@ -95,8 +95,8 @@ public: private: QWizard *createWizardDialog(QWidget *parent, - const Core::WizardDialogParameters &wizardDialogParameters) const; - virtual bool postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage); + const Core::WizardDialogParameters &wizardDialogParameters) const; + bool postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage); private: enum { targetPageId = 1 }; @@ -120,7 +120,7 @@ protected: public: explicit BaseQmakeProjectWizardDialog(bool showModulesPage, QWidget *parent, const Core::WizardDialogParameters ¶meters); - virtual ~BaseQmakeProjectWizardDialog(); + ~BaseQmakeProjectWizardDialog(); int addModulesPage(int id = -1); int addTargetSetupPage(int id = -1); diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.h b/src/plugins/qmlprojectmanager/qmlapplicationwizard.h index 835c4d4e38..49072d56d5 100644 --- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.h +++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.h @@ -61,7 +61,7 @@ class QmlApplicationWizard : public Core::BaseFileWizard Q_OBJECT public: - explicit QmlApplicationWizard(); + QmlApplicationWizard(); static void createInstances(ExtensionSystem::IPlugin *plugin); diff --git a/src/plugins/qnx/cascadesimport/cascadesimportwizard.cpp b/src/plugins/qnx/cascadesimport/cascadesimportwizard.cpp index 1bdcf3c7c6..e188cf85d6 100644 --- a/src/plugins/qnx/cascadesimport/cascadesimportwizard.cpp +++ b/src/plugins/qnx/cascadesimport/cascadesimportwizard.cpp @@ -111,8 +111,7 @@ void CascadesImportWizardDialog::onSrcProjectPathChanged(const QString &path) ////////////////////////////////////////////////////////////////////////////// static const char IMPORT_LOG_FILE_NAME[] = "import.log"; -CascadesImportWizard::CascadesImportWizard(QObject *parent) -: Core::BaseFileWizard(parent) +CascadesImportWizard::CascadesImportWizard() { setWizardKind(ProjectWizard); setIcon(QPixmap(QLatin1String(Qnx::Constants::QNX_BB_CATEGORY_ICON))); @@ -125,10 +124,6 @@ CascadesImportWizard::CascadesImportWizard(QObject *parent) setDisplayCategory(QLatin1String(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY)); } -CascadesImportWizard::~CascadesImportWizard() -{ -} - Core::BaseFileWizard::ExtensionList CascadesImportWizard::selectExtensions() { return Core::BaseFileWizard::ExtensionList(); diff --git a/src/plugins/qnx/cascadesimport/cascadesimportwizard.h b/src/plugins/qnx/cascadesimport/cascadesimportwizard.h index a8e3461eab..52371c7edd 100644 --- a/src/plugins/qnx/cascadesimport/cascadesimportwizard.h +++ b/src/plugins/qnx/cascadesimport/cascadesimportwizard.h @@ -63,8 +63,7 @@ class CascadesImportWizard : public Core::BaseFileWizard { Q_OBJECT public: - CascadesImportWizard(QObject *parent = 0); - virtual ~CascadesImportWizard(); + CascadesImportWizard(); protected: ExtensionList selectExtensions(); diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index 227d69b3ef..3d6b622f73 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -51,36 +51,28 @@ using namespace ResourceEditor::Internal; ResourceEditorPlugin::ResourceEditorPlugin() : - m_wizard(0), - m_editor(0), m_redoAction(0), m_undoAction(0) { } -ResourceEditorPlugin::~ResourceEditorPlugin() -{ - removeObject(m_editor); - removeObject(m_wizard); -} - bool ResourceEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage) { Q_UNUSED(arguments) if (!Core::MimeDatabase::addMimeTypes(QLatin1String(":/resourceeditor/ResourceEditor.mimetypes.xml"), errorMessage)) return false; - m_editor = new ResourceEditorFactory(this); - addObject(m_editor); + ResourceEditorFactory *editor = new ResourceEditorFactory(this); + addAutoReleasedObject(editor); - m_wizard = new ResourceWizard(this); - m_wizard->setDescription(tr("Creates a Qt Resource file (.qrc) that you can add to a Qt Widget Project.")); - m_wizard->setDisplayName(tr("Qt Resource file")); - m_wizard->setId(QLatin1String("F.Resource")); - m_wizard->setCategory(QLatin1String(Core::Constants::WIZARD_CATEGORY_QT)); - m_wizard->setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::WIZARD_TR_CATEGORY_QT)); + ResourceWizard *wizard = new ResourceWizard; + wizard->setDescription(tr("Creates a Qt Resource file (.qrc) that you can add to a Qt Widget Project.")); + wizard->setDisplayName(tr("Qt Resource file")); + wizard->setId(QLatin1String("F.Resource")); + wizard->setCategory(QLatin1String(Core::Constants::WIZARD_CATEGORY_QT)); + wizard->setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::WIZARD_TR_CATEGORY_QT)); - addObject(m_wizard); + addAutoReleasedObject(wizard); errorMessage->clear(); diff --git a/src/plugins/resourceeditor/resourceeditorplugin.h b/src/plugins/resourceeditor/resourceeditorplugin.h index 4f09ba69ab..d488ec0b0e 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.h +++ b/src/plugins/resourceeditor/resourceeditorplugin.h @@ -50,7 +50,6 @@ class ResourceEditorPlugin : public ExtensionSystem::IPlugin public: ResourceEditorPlugin(); - virtual ~ResourceEditorPlugin(); // IPlugin bool initialize(const QStringList &arguments, QString *errorMessage = 0); @@ -68,8 +67,6 @@ private: ResourceEditorW * currentEditor() const; private: - ResourceWizard *m_wizard; - ResourceEditorFactory *m_editor; QAction *m_redoAction; QAction *m_undoAction; QAction *m_refreshAction; diff --git a/src/plugins/resourceeditor/resourcewizard.cpp b/src/plugins/resourceeditor/resourcewizard.cpp index a05c68ab17..b62ef31279 100644 --- a/src/plugins/resourceeditor/resourcewizard.cpp +++ b/src/plugins/resourceeditor/resourcewizard.cpp @@ -34,11 +34,6 @@ using namespace ResourceEditor; using namespace ResourceEditor::Internal; -ResourceWizard::ResourceWizard(QObject *parent) - : Core::StandardFileWizard(parent) -{ -} - Core::GeneratedFiles ResourceWizard::generateFilesFromPath(const QString &path, const QString &name, diff --git a/src/plugins/resourceeditor/resourcewizard.h b/src/plugins/resourceeditor/resourcewizard.h index 25c86fb9c5..b485afbba3 100644 --- a/src/plugins/resourceeditor/resourcewizard.h +++ b/src/plugins/resourceeditor/resourcewizard.h @@ -39,13 +39,9 @@ class ResourceWizard : public Core::StandardFileWizard { Q_OBJECT -public: - explicit ResourceWizard(QObject *parent); - protected: - virtual Core::GeneratedFiles - generateFilesFromPath(const QString &path, const QString &name, - QString *errorMessage) const; + Core::GeneratedFiles generateFilesFromPath(const QString &path, const QString &name, + QString *errorMessage) const; }; } // namespace Internal diff --git a/src/plugins/texteditor/textfilewizard.h b/src/plugins/texteditor/textfilewizard.h index f4f72e5ec6..e77318f6b8 100644 --- a/src/plugins/texteditor/textfilewizard.h +++ b/src/plugins/texteditor/textfilewizard.h @@ -45,9 +45,8 @@ public: const QString &suggestedFileName); protected: - virtual Core::GeneratedFiles - generateFilesFromPath(const QString &path, const QString &name, - QString *errorMessage) const; + Core::GeneratedFiles generateFilesFromPath(const QString &path, const QString &name, + QString *errorMessage) const; private: const QString m_mimeType; const QString m_suggestedFileName; diff --git a/src/plugins/vcsbase/basecheckoutwizard.cpp b/src/plugins/vcsbase/basecheckoutwizard.cpp index 3916b53701..9233eca6c9 100644 --- a/src/plugins/vcsbase/basecheckoutwizard.cpp +++ b/src/plugins/vcsbase/basecheckoutwizard.cpp @@ -84,8 +84,7 @@ void BaseCheckoutWizardPrivate::clear() } // namespace Internal -BaseCheckoutWizard::BaseCheckoutWizard(QObject *parent) : - Core::IWizard(parent), +BaseCheckoutWizard::BaseCheckoutWizard() : d(new Internal::BaseCheckoutWizardPrivate) { setWizardKind(IWizard::ProjectWizard); diff --git a/src/plugins/vcsbase/basecheckoutwizard.h b/src/plugins/vcsbase/basecheckoutwizard.h index 00ad9474a1..2b8a3c52c7 100644 --- a/src/plugins/vcsbase/basecheckoutwizard.h +++ b/src/plugins/vcsbase/basecheckoutwizard.h @@ -50,7 +50,7 @@ class VCSBASE_EXPORT BaseCheckoutWizard : public Core::IWizard Q_OBJECT public: - explicit BaseCheckoutWizard(QObject *parent = 0); + BaseCheckoutWizard(); ~BaseCheckoutWizard(); void runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &extraValues); |