summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2023-01-20 12:28:36 +0100
committerhjk <hjk@qt.io>2023-01-20 12:13:10 +0000
commit118b84ffd6975bc1c7b2687d0c0dab016fce3cbb (patch)
tree96e19943604af24b5ade0c73e81ea887e51d2ba9 /src
parent013ad1345e53fe9a52217a04445a479d90653a8d (diff)
downloadqt-creator-118b84ffd6975bc1c7b2687d0c0dab016fce3cbb.tar.gz
Use simpler Plugin::initialize() when feasible
Change-Id: I567965d266f20526bda9f823e31a04b354d53fb1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/libs/extensionsystem/iplugin.h4
-rw-r--r--src/plugins/android/androidplugin.cpp6
-rw-r--r--src/plugins/android/androidplugin.h2
-rw-r--r--src/plugins/autotest/autotestplugin.cpp6
-rw-r--r--src/plugins/autotest/autotestplugin.h2
-rw-r--r--src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp7
-rw-r--r--src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h2
-rw-r--r--src/plugins/baremetal/baremetalplugin.cpp6
-rw-r--r--src/plugins/baremetal/baremetalplugin.h2
-rw-r--r--src/plugins/bazaar/bazaarplugin.cpp5
-rw-r--r--src/plugins/bazaar/bazaarplugin.h2
-rw-r--r--src/plugins/beautifier/beautifierplugin.cpp6
-rw-r--r--src/plugins/beautifier/beautifierplugin.h2
-rw-r--r--src/plugins/bineditor/bineditorplugin.cpp7
-rw-r--r--src/plugins/bineditor/bineditorplugin.h2
-rw-r--r--src/plugins/bookmarks/bookmarksplugin.cpp3
-rw-r--r--src/plugins/bookmarks/bookmarksplugin.h2
-rw-r--r--src/plugins/boot2qt/qdbplugin.cpp7
-rw-r--r--src/plugins/boot2qt/qdbplugin.h2
-rw-r--r--src/plugins/clangcodemodel/clangcodemodelplugin.cpp7
-rw-r--r--src/plugins/clangcodemodel/clangcodemodelplugin.h3
-rw-r--r--src/plugins/clangformat/clangformatplugin.cpp5
-rw-r--r--src/plugins/clangformat/clangformatplugin.h2
-rw-r--r--src/plugins/clangtools/clangtoolsplugin.cpp7
-rw-r--r--src/plugins/clangtools/clangtoolsplugin.h2
-rw-r--r--src/plugins/classview/classviewplugin.cpp7
-rw-r--r--src/plugins/classview/classviewplugin.h2
-rw-r--r--src/plugins/clearcase/clearcaseplugin.cpp4
-rw-r--r--src/plugins/clearcase/clearcaseplugin.h2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp6
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectplugin.h2
-rw-r--r--src/plugins/coco/cocoplugin.cpp3
-rw-r--r--src/plugins/coco/cocoplugin.h2
-rw-r--r--src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp7
-rw-r--r--src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.h2
-rw-r--r--src/plugins/conan/conanplugin.cpp10
-rw-r--r--src/plugins/conan/conanplugin.h3
-rw-r--r--src/plugins/coreplugin/iwizardfactory.cpp2
-rw-r--r--src/plugins/cpaster/cpasterplugin.cpp7
-rw-r--r--src/plugins/cpaster/cpasterplugin.h2
-rw-r--r--src/plugins/cppcheck/cppcheckplugin.cpp7
-rw-r--r--src/plugins/cppcheck/cppcheckplugin.h2
-rw-r--r--src/plugins/cppeditor/cppeditorplugin.cpp6
-rw-r--r--src/plugins/cppeditor/cppeditorplugin.h2
-rw-r--r--src/plugins/ctfvisualizer/ctfvisualizerplugin.cpp7
-rw-r--r--src/plugins/ctfvisualizer/ctfvisualizerplugin.h2
-rw-r--r--src/plugins/cvs/cvsplugin.cpp5
-rw-r--r--src/plugins/cvs/cvsplugin.h2
-rw-r--r--src/plugins/designer/formeditorplugin.cpp6
-rw-r--r--src/plugins/designer/formeditorplugin.h2
-rw-r--r--src/plugins/diffeditor/diffeditorplugin.cpp7
-rw-r--r--src/plugins/diffeditor/diffeditorplugin.h2
-rw-r--r--src/plugins/docker/dockerplugin.cpp7
-rw-r--r--src/plugins/docker/dockerplugin.h2
-rw-r--r--src/plugins/emacskeys/emacskeysplugin.cpp6
-rw-r--r--src/plugins/emacskeys/emacskeysplugin.h2
-rw-r--r--src/plugins/fakevim/fakevimplugin.cpp12
-rw-r--r--src/plugins/fakevim/fakevimplugin.h2
-rw-r--r--src/plugins/genericprojectmanager/genericprojectplugin.cpp3
-rw-r--r--src/plugins/genericprojectmanager/genericprojectplugin.h2
-rw-r--r--src/plugins/gitlab/gitlabplugin.cpp3
-rw-r--r--src/plugins/gitlab/gitlabplugin.h2
-rw-r--r--src/plugins/glsleditor/glsleditorplugin.cpp4
-rw-r--r--src/plugins/glsleditor/glsleditorplugin.h2
-rw-r--r--src/plugins/help/helpplugin.cpp5
-rw-r--r--src/plugins/help/helpplugin.h2
-rw-r--r--src/plugins/imageviewer/imageviewerplugin.cpp7
-rw-r--r--src/plugins/imageviewer/imageviewerplugin.h2
-rw-r--r--src/plugins/incredibuild/incredibuildplugin.cpp7
-rw-r--r--src/plugins/incredibuild/incredibuildplugin.h2
-rw-r--r--src/plugins/ios/iosplugin.cpp7
-rw-r--r--src/plugins/ios/iosplugin.h2
-rw-r--r--src/plugins/languageclient/languageclientplugin.cpp4
-rw-r--r--src/plugins/languageclient/languageclientplugin.h2
-rw-r--r--src/plugins/macros/macrosplugin.cpp8
-rw-r--r--src/plugins/macros/macrosplugin.h2
-rw-r--r--src/plugins/mcusupport/mcusupportplugin.cpp7
-rw-r--r--src/plugins/mcusupport/mcusupportplugin.h2
-rw-r--r--src/plugins/mercurial/mercurialplugin.cpp3
-rw-r--r--src/plugins/mercurial/mercurialplugin.h2
-rw-r--r--src/plugins/mesonprojectmanager/mesonprojectplugin.cpp5
-rw-r--r--src/plugins/mesonprojectmanager/mesonprojectplugin.h2
-rw-r--r--src/plugins/modeleditor/modeleditor_plugin.cpp6
-rw-r--r--src/plugins/modeleditor/modeleditor_plugin.h2
-rw-r--r--src/plugins/perforce/perforceplugin.cpp4
-rw-r--r--src/plugins/perforce/perforceplugin.h2
-rw-r--r--src/plugins/perfprofiler/perfprofilerplugin.cpp6
-rw-r--r--src/plugins/perfprofiler/perfprofilerplugin.h2
-rw-r--r--src/plugins/python/pythonplugin.cpp7
-rw-r--r--src/plugins/python/pythonplugin.h2
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp7
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h2
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp6
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.h2
-rw-r--r--src/plugins/qmljseditor/qmljseditorplugin.cpp7
-rw-r--r--src/plugins/qmljseditor/qmljseditorplugin.h2
-rw-r--r--src/plugins/qmljstools/qmljstoolsplugin.cpp7
-rw-r--r--src/plugins/qmljstools/qmljstoolsplugin.h2
-rw-r--r--src/plugins/qmlpreview/qmlpreviewplugin.cpp7
-rw-r--r--src/plugins/qmlpreview/qmlpreviewplugin.h2
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectplugin.cpp6
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectplugin.h2
-rw-r--r--src/plugins/qnx/qnxplugin.cpp7
-rw-r--r--src/plugins/qnx/qnxplugin.h2
-rw-r--r--src/plugins/qtsupport/qtsupportplugin.cpp6
-rw-r--r--src/plugins/qtsupport/qtsupportplugin.h2
-rw-r--r--src/plugins/remotelinux/remotelinuxplugin.cpp7
-rw-r--r--src/plugins/remotelinux/remotelinuxplugin.h2
-rw-r--r--src/plugins/resourceeditor/resourceeditorplugin.cpp7
-rw-r--r--src/plugins/resourceeditor/resourceeditorplugin.h2
-rw-r--r--src/plugins/scxmleditor/scxmleditorplugin.cpp7
-rw-r--r--src/plugins/scxmleditor/scxmleditorplugin.h2
-rw-r--r--src/plugins/serialterminal/serialterminalplugin.cpp7
-rw-r--r--src/plugins/serialterminal/serialterminalplugin.h2
-rw-r--r--src/plugins/silversearcher/silversearcherplugin.cpp7
-rw-r--r--src/plugins/silversearcher/silversearcherplugin.h2
-rw-r--r--src/plugins/squish/squishplugin.cpp3
-rw-r--r--src/plugins/squish/squishplugin.h2
-rw-r--r--src/plugins/studiowelcome/studiowelcomeplugin.cpp7
-rw-r--r--src/plugins/studiowelcome/studiowelcomeplugin.h2
-rw-r--r--src/plugins/subversion/subversionplugin.cpp4
-rw-r--r--src/plugins/subversion/subversionplugin.h2
-rw-r--r--src/plugins/texteditor/texteditorplugin.cpp7
-rw-r--r--src/plugins/texteditor/texteditorplugin.h2
-rw-r--r--src/plugins/todo/todoplugin.cpp7
-rw-r--r--src/plugins/todo/todoplugin.h2
-rw-r--r--src/plugins/valgrind/valgrindplugin.cpp4
-rw-r--r--src/plugins/valgrind/valgrindplugin.h2
-rw-r--r--src/plugins/vcsbase/vcsplugin.cpp7
-rw-r--r--src/plugins/vcsbase/vcsplugin.h2
-rw-r--r--src/plugins/webassembly/webassemblyplugin.cpp7
-rw-r--r--src/plugins/webassembly/webassemblyplugin.h2
132 files changed, 138 insertions, 399 deletions
diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h
index 9c0bdea894..188797a264 100644
--- a/src/libs/extensionsystem/iplugin.h
+++ b/src/libs/extensionsystem/iplugin.h
@@ -31,7 +31,6 @@ public:
~IPlugin() override;
virtual bool initialize(const QStringList &arguments, QString *errorString);
- virtual void initialize() {}
virtual void extensionsInitialized() {}
virtual bool delayedInitialize() { return false; }
virtual ShutdownFlag aboutToShutdown() { return SynchronousShutdown; }
@@ -42,6 +41,9 @@ public:
PluginSpec *pluginSpec() const;
+protected:
+ virtual void initialize() {}
+
signals:
void asynchronousShutdownFinished();
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 38c58f5a02..070a62a1ba 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -121,11 +121,8 @@ AndroidPlugin::~AndroidPlugin()
delete d;
}
-bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void AndroidPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new AndroidPluginPrivate;
connect(KitManager::instance(), &KitManager::kitsLoaded,
@@ -135,7 +132,6 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
{Android::Constants::JLS_SETTINGS_ID,
Tr::tr("Java Language Server"),
[] { return new JLSSettings; }});
- return true;
}
void AndroidPlugin::kitsRestored()
diff --git a/src/plugins/android/androidplugin.h b/src/plugins/android/androidplugin.h
index 639d079010..d0eb8d9507 100644
--- a/src/plugins/android/androidplugin.h
+++ b/src/plugins/android/androidplugin.h
@@ -15,7 +15,7 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
~AndroidPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void kitsRestored();
void askUserAboutAndroidSetup();
diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp
index 3e73fde54e..3f8c2ff819 100644
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -276,17 +276,13 @@ void AutotestPluginPrivate::initializeMenuEntries()
this, &AutotestPlugin::updateMenuItemsEnabledState);
}
-bool AutotestPlugin::initialize(const QStringList &arguments, QString *errorString)
+void AutotestPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
dd = new AutotestPluginPrivate;
#ifdef WITH_TESTS
ExtensionSystem::PluginManager::registerScenario("TestModelManagerInterface",
[] { return dd->m_loadProjectScenario(); });
#endif
- return true;
}
void AutotestPlugin::extensionsInitialized()
diff --git a/src/plugins/autotest/autotestplugin.h b/src/plugins/autotest/autotestplugin.h
index 536597582e..71d6b8e5ee 100644
--- a/src/plugins/autotest/autotestplugin.h
+++ b/src/plugins/autotest/autotestplugin.h
@@ -39,7 +39,7 @@ public:
AutotestPlugin();
~AutotestPlugin() override;
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override;
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
index da958c03a6..4a33802473 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
@@ -63,15 +63,10 @@ AutotoolsProjectPlugin::~AutotoolsProjectPlugin()
void AutotoolsProjectPlugin::extensionsInitialized()
{ }
-bool AutotoolsProjectPlugin::initialize(const QStringList &arguments, QString *errorString)
+void AutotoolsProjectPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d = new AutotoolsProjectPluginPrivate;
ProjectExplorer::ProjectManager::registerProjectType<AutotoolsProject>(Constants::MAKEFILE_MIMETYPE);
-
- return true;
}
} // AutotoolsProjectManager::Internal
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h
index 8653a5f232..a705da891d 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h
@@ -43,7 +43,7 @@ class AutotoolsProjectPlugin final : public ExtensionSystem::IPlugin
~AutotoolsProjectPlugin() final;
void extensionsInitialized() final;
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
class AutotoolsProjectPluginPrivate *d;
};
diff --git a/src/plugins/baremetal/baremetalplugin.cpp b/src/plugins/baremetal/baremetalplugin.cpp
index 0a262e2467..f97bf1b40c 100644
--- a/src/plugins/baremetal/baremetalplugin.cpp
+++ b/src/plugins/baremetal/baremetalplugin.cpp
@@ -66,13 +66,9 @@ BareMetalPlugin::~BareMetalPlugin()
delete d;
}
-bool BareMetalPlugin::initialize(const QStringList &arguments, QString *errorString)
+void BareMetalPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d = new BareMetalPluginPrivate;
- return true;
}
void BareMetalPlugin::extensionsInitialized()
diff --git a/src/plugins/baremetal/baremetalplugin.h b/src/plugins/baremetal/baremetalplugin.h
index 3bf01534d0..cbad40df5c 100644
--- a/src/plugins/baremetal/baremetalplugin.h
+++ b/src/plugins/baremetal/baremetalplugin.h
@@ -15,7 +15,7 @@ class BareMetalPlugin final : public ExtensionSystem::IPlugin
~BareMetalPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
void extensionsInitialized() final;
class BareMetalPluginPrivate *d = nullptr;
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 777809407a..5775380b13 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -334,12 +334,9 @@ BazaarPlugin::~BazaarPlugin()
d = nullptr;
}
-bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void BazaarPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
d = new BazaarPluginPrivate;
- return true;
}
void BazaarPlugin::extensionsInitialized()
diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h
index 9f483d3ec6..34a42ca9ae 100644
--- a/src/plugins/bazaar/bazaarplugin.h
+++ b/src/plugins/bazaar/bazaarplugin.h
@@ -14,7 +14,7 @@ class BazaarPlugin final : public ExtensionSystem::IPlugin
~BazaarPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
#ifdef WITH_TESTS
diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp
index f2e1513f27..9e0b3f49e8 100644
--- a/src/plugins/beautifier/beautifierplugin.cpp
+++ b/src/plugins/beautifier/beautifierplugin.cpp
@@ -91,16 +91,12 @@ public:
static BeautifierPluginPrivate *dd = nullptr;
-bool BeautifierPlugin::initialize(const QStringList &arguments, QString *errorString)
+void BeautifierPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID);
menu->menu()->setTitle(Tr::tr("Bea&utifier"));
menu->setOnAllDisabledBehavior(Core::ActionContainer::Show);
Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
- return true;
}
void BeautifierPlugin::extensionsInitialized()
diff --git a/src/plugins/beautifier/beautifierplugin.h b/src/plugins/beautifier/beautifierplugin.h
index acd902c5c6..8b3d89ed21 100644
--- a/src/plugins/beautifier/beautifierplugin.h
+++ b/src/plugins/beautifier/beautifierplugin.h
@@ -24,7 +24,7 @@ public:
static void showError(const QString &error);
private:
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override;
};
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index f08097b073..aa6c190dc6 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -502,14 +502,9 @@ BinEditorPlugin::~BinEditorPlugin()
dd = nullptr;
}
-bool BinEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void BinEditorPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
dd = new BinEditorPluginPrivate;
-
- return true;
}
} // BinEditor::Internal
diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h
index 00bcba3c4f..ac91a508b8 100644
--- a/src/plugins/bineditor/bineditorplugin.h
+++ b/src/plugins/bineditor/bineditorplugin.h
@@ -16,7 +16,7 @@ class BinEditorPlugin : public ExtensionSystem::IPlugin
~BinEditorPlugin() override;
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final {}
};
diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp
index 929f63515a..2f25571b53 100644
--- a/src/plugins/bookmarks/bookmarksplugin.cpp
+++ b/src/plugins/bookmarks/bookmarksplugin.cpp
@@ -67,10 +67,9 @@ BookmarksPlugin::~BookmarksPlugin()
delete d;
}
-bool BookmarksPlugin::initialize(const QStringList &, QString *)
+void BookmarksPlugin::initialize()
{
d = new BookmarksPluginPrivate;
- return true;
}
BookmarksPluginPrivate::BookmarksPluginPrivate()
diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h
index d22dae1c91..06764043c7 100644
--- a/src/plugins/bookmarks/bookmarksplugin.h
+++ b/src/plugins/bookmarks/bookmarksplugin.h
@@ -14,7 +14,7 @@ class BookmarksPlugin final : public ExtensionSystem::IPlugin
~BookmarksPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
class BookmarksPluginPrivate *d = nullptr;
};
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index 7e1882c167..ee14e08a7b 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -164,16 +164,11 @@ QdbPlugin::~QdbPlugin()
delete d;
}
-bool QdbPlugin::initialize(const QStringList &arguments, QString *errorString)
+void QdbPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d = new QdbPluginPrivate;
registerFlashAction(this);
-
- return true;
}
void QdbPlugin::extensionsInitialized()
diff --git a/src/plugins/boot2qt/qdbplugin.h b/src/plugins/boot2qt/qdbplugin.h
index ff0b6de522..0f2b75a8ac 100644
--- a/src/plugins/boot2qt/qdbplugin.h
+++ b/src/plugins/boot2qt/qdbplugin.h
@@ -17,7 +17,7 @@ public:
~QdbPlugin() final;
private:
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
void extensionsInitialized() final;
ShutdownFlag aboutToShutdown() final;
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index 3bec0cd749..e974152584 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -76,11 +76,8 @@ ClangCodeModelPlugin::~ClangCodeModelPlugin()
m_generatorWatcher.waitForFinished();
}
-bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void ClangCodeModelPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
TaskHub::addCategory(Constants::TASK_CATEGORY_DIAGNOSTICS,
Tr::tr("Clang Code Model"));
@@ -93,8 +90,6 @@ bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *err
std::make_unique<ClangModelManagerSupport>());
createCompilationDBAction();
-
- return true;
}
void ClangCodeModelPlugin::createCompilationDBAction()
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.h b/src/plugins/clangcodemodel/clangcodemodelplugin.h
index 6b75adc466..6f4d9af653 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.h
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.h
@@ -21,12 +21,11 @@ class ClangCodeModelPlugin final: public ExtensionSystem::IPlugin
public:
~ClangCodeModelPlugin() override;
- bool initialize(const QStringList &arguments, QString *errorMessage) override;
+ void initialize() override;
private:
void maybeHandleBatchFileAndExit() const;
-private:
void generateCompilationDB();
void createCompilationDBAction();
diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp
index d8428e35f0..cbb49cbd31 100644
--- a/src/plugins/clangformat/clangformatplugin.cpp
+++ b/src/plugins/clangformat/clangformatplugin.cpp
@@ -87,10 +87,8 @@ static void replaceCppCodeStyle()
TextEditorSettings::registerCodeStyleFactory(new ClangFormatStyleFactory);
}
-bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorString)
+void ClangFormatPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
replaceCppCodeStyle();
ActionContainer *contextMenu = ActionManager::actionContainer(CppEditor::Constants::M_CONTEXT);
@@ -127,7 +125,6 @@ bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorS
openClangFormatConfigAction->setData(doc->filePath().toVariant());
});
}
- return true;
}
QVector<QObject *> ClangFormatPlugin::createTestObjects() const
diff --git a/src/plugins/clangformat/clangformatplugin.h b/src/plugins/clangformat/clangformatplugin.h
index c6915768db..7b3560c4ee 100644
--- a/src/plugins/clangformat/clangformatplugin.h
+++ b/src/plugins/clangformat/clangformatplugin.h
@@ -12,7 +12,7 @@ class ClangFormatPlugin : public ExtensionSystem::IPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "ClangFormat.json")
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
QVector<QObject *> createTestObjects() const override;
};
diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp
index 23e841fa36..c8be34202a 100644
--- a/src/plugins/clangtools/clangtoolsplugin.cpp
+++ b/src/plugins/clangtools/clangtoolsplugin.cpp
@@ -88,11 +88,8 @@ ClangToolsPlugin::~ClangToolsPlugin()
delete d;
}
-bool ClangToolsPlugin::initialize(const QStringList &arguments, QString *errorString)
+void ClangToolsPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
TaskHub::addCategory(taskCategory(), Tr::tr("Clang Tools"));
// Import tidy/clazy diagnostic configs from CppEditor now
@@ -115,8 +112,6 @@ bool ClangToolsPlugin::initialize(const QStringList &arguments, QString *errorSt
&Core::EditorManager::currentEditorChanged,
this,
&ClangToolsPlugin::onCurrentEditorChanged);
-
- return true;
}
void ClangToolsPlugin::onCurrentEditorChanged()
diff --git a/src/plugins/clangtools/clangtoolsplugin.h b/src/plugins/clangtools/clangtoolsplugin.h
index 7def8bab60..e08978ad5e 100644
--- a/src/plugins/clangtools/clangtoolsplugin.h
+++ b/src/plugins/clangtools/clangtoolsplugin.h
@@ -23,7 +23,7 @@ public:
~ClangToolsPlugin() final;
private:
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
void registerAnalyzeActions();
void onCurrentEditorChanged();
diff --git a/src/plugins/classview/classviewplugin.cpp b/src/plugins/classview/classviewplugin.cpp
index 4364d61f1d..e65e6c1e9e 100644
--- a/src/plugins/classview/classviewplugin.cpp
+++ b/src/plugins/classview/classviewplugin.cpp
@@ -34,14 +34,9 @@ ClassViewPlugin::~ClassViewPlugin()
dd = nullptr;
}
-bool ClassViewPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void ClassViewPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
dd = new ClassViewPluginPrivate;
-
- return true;
}
} // namespace Internal
diff --git a/src/plugins/classview/classviewplugin.h b/src/plugins/classview/classviewplugin.h
index 778cb74c25..48a69e748d 100644
--- a/src/plugins/classview/classviewplugin.h
+++ b/src/plugins/classview/classviewplugin.h
@@ -18,7 +18,7 @@ public:
~ClassViewPlugin() final;
private:
- bool initialize(const QStringList &arguments, QString *errorMessage = nullptr) final;
+ void initialize() final;
void extensionsInitialized() final {}
};
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 998c650603..9a18236b81 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -560,11 +560,9 @@ QString ClearCasePluginPrivate::findTopLevel(const FilePath &directory) const
return ccManagesDirectory(directory);
}
-bool ClearCasePlugin::initialize(const QStringList & /*arguments */, QString *errorMessage)
+void ClearCasePlugin::initialize()
{
- Q_UNUSED(errorMessage)
dd = new ClearCasePluginPrivate;
- return true;
}
void ClearCasePlugin::extensionsInitialized()
diff --git a/src/plugins/clearcase/clearcaseplugin.h b/src/plugins/clearcase/clearcaseplugin.h
index 9293b985a1..99fa3342ad 100644
--- a/src/plugins/clearcase/clearcaseplugin.h
+++ b/src/plugins/clearcase/clearcaseplugin.h
@@ -67,7 +67,7 @@ public:
static QSharedPointer<StatusMap> statusMap();
private:
- bool initialize(const QStringList &arguments, QString *error_message) final;
+ void initialize() final;
void extensionsInitialized() final;
#ifdef WITH_TESTS
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
index 9caa5b3d86..eabfacbd46 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
@@ -149,10 +149,8 @@ CMakeProjectPlugin::~CMakeProjectPlugin()
delete d;
}
-bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
+void CMakeProjectPlugin::initialize()
{
- Q_UNUSED(errorMessage)
-
d = new CMakeProjectPluginPrivate;
projectTypeSpecificSettings()->readSettings(ICore::settings());
@@ -195,8 +193,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
d->cmakeFormatter.initialize();
d->updateActions();
-
- return true;
}
void CMakeProjectPlugin::extensionsInitialized()
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
index 81f2c35d93..86c7cf6356 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
@@ -36,7 +36,7 @@ private slots:
#endif
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
void updateContextActions(ProjectExplorer::Node *node);
diff --git a/src/plugins/coco/cocoplugin.cpp b/src/plugins/coco/cocoplugin.cpp
index f3a2969276..3601e934f9 100644
--- a/src/plugins/coco/cocoplugin.cpp
+++ b/src/plugins/coco/cocoplugin.cpp
@@ -86,7 +86,7 @@ CocoPlugin::~CocoPlugin()
delete d;
}
-bool CocoPlugin::initialize(const QStringList &, QString *)
+void CocoPlugin::initialize()
{
using namespace Core;
ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER);
@@ -97,7 +97,6 @@ bool CocoPlugin::initialize(const QStringList &, QString *)
connect(startCoco, &QAction::triggered, this, [this]() { d->startCoco(); });
}
- return true;
}
} // namespace Coco
diff --git a/src/plugins/coco/cocoplugin.h b/src/plugins/coco/cocoplugin.h
index a2c429cbb9..919acfbff4 100644
--- a/src/plugins/coco/cocoplugin.h
+++ b/src/plugins/coco/cocoplugin.h
@@ -18,7 +18,7 @@ public:
CocoPlugin();
~CocoPlugin() override;
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
private:
CocoPluginPrivate *d;
};
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
index 20c1ad8d09..7f220244b0 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
@@ -42,11 +42,8 @@ CompilationDatabaseProjectManagerPlugin::~CompilationDatabaseProjectManagerPlugi
delete d;
}
-bool CompilationDatabaseProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void CompilationDatabaseProjectManagerPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new CompilationDatabaseProjectManagerPluginPrivate;
Utils::FileIconProvider::registerIconOverlayForFilename(Utils::Icons::PROJECT.imageFilePath().toString(),
@@ -80,8 +77,6 @@ bool CompilationDatabaseProjectManagerPlugin::initialize(const QStringList &argu
connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged,
this, onProjectChanged);
-
- return true;
}
QVector<QObject *> CompilationDatabaseProjectManagerPlugin::createTestObjects() const
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.h b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.h
index 8807bc4200..251138ba69 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.h
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.h
@@ -15,7 +15,7 @@ class CompilationDatabaseProjectManagerPlugin final : public ExtensionSystem::IP
~CompilationDatabaseProjectManagerPlugin();
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
QVector<QObject *> createTestObjects() const final;
class CompilationDatabaseProjectManagerPluginPrivate *d = nullptr;
diff --git a/src/plugins/conan/conanplugin.cpp b/src/plugins/conan/conanplugin.cpp
index 5b432bf216..a1a78acca3 100644
--- a/src/plugins/conan/conanplugin.cpp
+++ b/src/plugins/conan/conanplugin.cpp
@@ -34,21 +34,13 @@ ConanPlugin::~ConanPlugin()
delete d;
}
-void ConanPlugin::extensionsInitialized()
-{ }
-
-bool ConanPlugin::initialize(const QStringList &arguments, QString *errorString)
+void ConanPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d = new ConanPluginPrivate;
conanSettings()->readSettings(ICore::settings());
connect(SessionManager::instance(), &SessionManager::projectAdded,
this, &ConanPlugin::projectAdded);
-
- return true;
}
static void connectTarget(Project *project, Target *target)
diff --git a/src/plugins/conan/conanplugin.h b/src/plugins/conan/conanplugin.h
index 46b7b2618c..59fbe976d2 100644
--- a/src/plugins/conan/conanplugin.h
+++ b/src/plugins/conan/conanplugin.h
@@ -26,8 +26,7 @@ private:
~ConanPlugin() final;
void projectAdded(ProjectExplorer::Project *project);
- void extensionsInitialized() final;
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
class ConanPluginPrivate *d = nullptr;
};
diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp
index a30637e08c..3571353105 100644
--- a/src/plugins/coreplugin/iwizardfactory.cpp
+++ b/src/plugins/coreplugin/iwizardfactory.cpp
@@ -44,7 +44,7 @@
To make your wizard known to the system, add your IWizardFactory instance to the
plugin manager's object pool in your plugin's initialize function:
\code
- bool MyPlugin::initialize(const QStringList &arguments, QString *errorString)
+ void MyPlugin::initialize()
{
// ... do setup
addAutoReleasedObject(new MyWizardFactory);
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 4611e0696a..65b3d25179 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -116,14 +116,9 @@ CodePasterPlugin::~CodePasterPlugin()
delete d;
}
-bool CodePasterPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void CodePasterPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new CodePasterPluginPrivate;
-
- return true;
}
CodePasterPluginPrivate::CodePasterPluginPrivate()
diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h
index 8da5eba75b..0bff115fd2 100644
--- a/src/plugins/cpaster/cpasterplugin.h
+++ b/src/plugins/cpaster/cpasterplugin.h
@@ -43,7 +43,7 @@ public:
~CodePasterPlugin() final;
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
ShutdownFlag aboutToShutdown() final;
CodePasterPluginPrivate *d = nullptr;
diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp
index 33afa6c43d..5dd09a1820 100644
--- a/src/plugins/cppcheck/cppcheckplugin.cpp
+++ b/src/plugins/cppcheck/cppcheckplugin.cpp
@@ -133,11 +133,8 @@ CppcheckPlugin::CppcheckPlugin() = default;
CppcheckPlugin::~CppcheckPlugin() = default;
-bool CppcheckPlugin::initialize(const QStringList &arguments, QString *errorString)
+void CppcheckPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d.reset(new CppcheckPluginPrivate);
using namespace Core;
@@ -156,8 +153,6 @@ bool CppcheckPlugin::initialize(const QStringList &arguments, QString *errorStri
connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::runActionsUpdated,
d.get(), &CppcheckPluginPrivate::updateManualRunAction);
d->updateManualRunAction();
-
- return true;
}
} // Cppcheck::Internal
diff --git a/src/plugins/cppcheck/cppcheckplugin.h b/src/plugins/cppcheck/cppcheckplugin.h
index 697aea6030..d6911b5638 100644
--- a/src/plugins/cppcheck/cppcheckplugin.h
+++ b/src/plugins/cppcheck/cppcheckplugin.h
@@ -21,7 +21,7 @@ public:
~CppcheckPlugin() override;
private:
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
std::unique_ptr<CppcheckPluginPrivate> d;
};
diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp
index 3b82803a00..d596a1fe7e 100644
--- a/src/plugins/cppeditor/cppeditorplugin.cpp
+++ b/src/plugins/cppeditor/cppeditorplugin.cpp
@@ -224,10 +224,8 @@ CppQuickFixAssistProvider *CppEditorPlugin::quickFixProvider() const
return &d->m_quickFixProvider;
}
-bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
+void CppEditorPlugin::initialize()
{
- Q_UNUSED(errorMessage)
-
d = new CppEditorPluginPrivate;
d->initialize();
@@ -465,8 +463,6 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err
d, &CppEditorPluginPrivate::onTaskStarted);
connect(ProgressManager::instance(), &ProgressManager::allTasksFinished,
d, &CppEditorPluginPrivate::onAllTasksFinished);
-
- return true;
}
void CppEditorPlugin::extensionsInitialized()
diff --git a/src/plugins/cppeditor/cppeditorplugin.h b/src/plugins/cppeditor/cppeditorplugin.h
index 08d5f06af2..5ffdeaae54 100644
--- a/src/plugins/cppeditor/cppeditorplugin.h
+++ b/src/plugins/cppeditor/cppeditorplugin.h
@@ -53,7 +53,7 @@ signals:
void includeHierarchyRequested();
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) override;
+ void initialize() override;
void extensionsInitialized() override;
QVector<QObject *> createTestObjects() const override;
diff --git a/src/plugins/ctfvisualizer/ctfvisualizerplugin.cpp b/src/plugins/ctfvisualizer/ctfvisualizerplugin.cpp
index 123ee1720c..9c908536bb 100644
--- a/src/plugins/ctfvisualizer/ctfvisualizerplugin.cpp
+++ b/src/plugins/ctfvisualizer/ctfvisualizerplugin.cpp
@@ -1,5 +1,6 @@
// Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company,
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
#include "ctfvisualizerplugin.h"
#include "ctfvisualizertool.h"
@@ -18,13 +19,9 @@ CtfVisualizerPlugin::~CtfVisualizerPlugin()
delete d;
}
-bool CtfVisualizerPlugin::initialize(const QStringList &arguments, QString *errorString)
+void CtfVisualizerPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d = new CtfVisualizerPluginPrivate;
- return true;
}
} // namespace Internal
diff --git a/src/plugins/ctfvisualizer/ctfvisualizerplugin.h b/src/plugins/ctfvisualizer/ctfvisualizerplugin.h
index acfb0a1273..4550606940 100644
--- a/src/plugins/ctfvisualizer/ctfvisualizerplugin.h
+++ b/src/plugins/ctfvisualizer/ctfvisualizerplugin.h
@@ -16,7 +16,7 @@ class CtfVisualizerPlugin : public ExtensionSystem::IPlugin
public:
~CtfVisualizerPlugin();
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
class CtfVisualizerPluginPrivate *d = nullptr;
};
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 10a2037253..1030b74cfa 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -480,12 +480,9 @@ CvsPlugin::~CvsPlugin()
dd = nullptr;
}
-bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void CvsPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
dd = new CvsPluginPrivate;
- return true;
}
void CvsPlugin::extensionsInitialized()
diff --git a/src/plugins/cvs/cvsplugin.h b/src/plugins/cvs/cvsplugin.h
index 823b769f58..1826475ebb 100644
--- a/src/plugins/cvs/cvsplugin.h
+++ b/src/plugins/cvs/cvsplugin.h
@@ -14,7 +14,7 @@ class CvsPlugin final : public ExtensionSystem::IPlugin
~CvsPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
#ifdef WITH_TESTS
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index 132d56663b..50a5f4a8df 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -57,10 +57,8 @@ FormEditorPlugin::~FormEditorPlugin()
delete d;
}
-bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
+void FormEditorPlugin::initialize()
{
- Q_UNUSED(arguments)
-
d = new FormEditorPluginPrivate;
#ifdef CPP_ENABLED
@@ -91,8 +89,6 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
if (qtr->load(trFile, qtTrPath) || qtr->load(trFile, creatorTrPath))
QCoreApplication::installTranslator(qtr);
}
- error->clear();
- return true;
}
void FormEditorPlugin::extensionsInitialized()
diff --git a/src/plugins/designer/formeditorplugin.h b/src/plugins/designer/formeditorplugin.h
index b1407be217..e24c76ec53 100644
--- a/src/plugins/designer/formeditorplugin.h
+++ b/src/plugins/designer/formeditorplugin.h
@@ -24,7 +24,7 @@ private slots:
#endif
private:
- bool initialize(const QStringList &arguments, QString *errorMessage = nullptr) override;
+ void initialize() override;
void extensionsInitialized() override;
void switchSourceForm();
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index 44c824c3de..e18a0e2797 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -524,14 +524,9 @@ DiffEditorPlugin::~DiffEditorPlugin()
s_instance = nullptr;
}
-bool DiffEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void DiffEditorPlugin::initialize()
{
d = new DiffEditorPluginPrivate;
-
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
- return true;
}
FutureSynchronizer *DiffEditorPlugin::futureSynchronizer()
diff --git a/src/plugins/diffeditor/diffeditorplugin.h b/src/plugins/diffeditor/diffeditorplugin.h
index 9e70356f4d..66849a7387 100644
--- a/src/plugins/diffeditor/diffeditorplugin.h
+++ b/src/plugins/diffeditor/diffeditorplugin.h
@@ -32,7 +32,7 @@ public:
DiffEditorPlugin();
~DiffEditorPlugin();
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
static Utils::FutureSynchronizer *futureSynchronizer();
diff --git a/src/plugins/docker/dockerplugin.cpp b/src/plugins/docker/dockerplugin.cpp
index b04b2612ec..d7addc894d 100644
--- a/src/plugins/docker/dockerplugin.cpp
+++ b/src/plugins/docker/dockerplugin.cpp
@@ -53,14 +53,9 @@ DockerPlugin::~DockerPlugin()
delete d;
}
-bool DockerPlugin::initialize(const QStringList &arguments, QString *errorString)
+void DockerPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d = new DockerPluginPrivate;
-
- return true;
}
} // Docker::Interanl
diff --git a/src/plugins/docker/dockerplugin.h b/src/plugins/docker/dockerplugin.h
index 6f2e6f3f66..c4ee04ac5a 100644
--- a/src/plugins/docker/dockerplugin.h
+++ b/src/plugins/docker/dockerplugin.h
@@ -24,7 +24,7 @@ public:
private:
~DockerPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
class DockerPluginPrivate *d = nullptr;
};
diff --git a/src/plugins/emacskeys/emacskeysplugin.cpp b/src/plugins/emacskeys/emacskeysplugin.cpp
index 11063de3d6..fbd5e3b4ef 100644
--- a/src/plugins/emacskeys/emacskeysplugin.cpp
+++ b/src/plugins/emacskeys/emacskeysplugin.cpp
@@ -69,11 +69,8 @@ EmacsKeysPlugin::EmacsKeysPlugin() = default;
EmacsKeysPlugin::~EmacsKeysPlugin() = default;
-bool EmacsKeysPlugin::initialize(const QStringList &arguments, QString *errorString)
+void EmacsKeysPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
// We have to use this hack here at the moment, because it's the only way to
// disable Qt Creator menu accelerators aka mnemonics. Many of them get into
// the way of typical emacs keys, such as: Alt+F (File), Alt+B (Build),
@@ -130,7 +127,6 @@ bool EmacsKeysPlugin::initialize(const QStringList &arguments, QString *errorStr
&EmacsKeysPlugin::scrollHalfDown, tr("Scroll Half Screen Down"));
registerAction(Constants::SCROLL_HALF_UP,
&EmacsKeysPlugin::scrollHalfUp, tr("Scroll Half Screen Up"));
- return true;
}
void EmacsKeysPlugin::extensionsInitialized()
diff --git a/src/plugins/emacskeys/emacskeysplugin.h b/src/plugins/emacskeys/emacskeysplugin.h
index dca1f3960c..b0acb078cc 100644
--- a/src/plugins/emacskeys/emacskeysplugin.h
+++ b/src/plugins/emacskeys/emacskeysplugin.h
@@ -55,7 +55,7 @@ public:
EmacsKeysPlugin();
~EmacsKeysPlugin() override;
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override;
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index fcc80e43c9..02207de872 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -499,7 +499,7 @@ class FakeVimPluginPrivate : public QObject
public:
FakeVimPluginPrivate();
- bool initialize();
+ void initialize();
void editorOpened(Core::IEditor *);
void editorAboutToClose(Core::IEditor *);
@@ -1155,7 +1155,7 @@ FakeVimPluginPrivate::FakeVimPluginPrivate()
}
}
-bool FakeVimPluginPrivate::initialize()
+void FakeVimPluginPrivate::initialize()
{
runData = new FakeVimPluginRunData;
/*
@@ -1230,8 +1230,6 @@ bool FakeVimPluginPrivate::initialize()
this, &FakeVimPluginPrivate::handleDelayedQuitAll, Qt::QueuedConnection);
setCursorBlinking(s.blinkingCursor.value());
-
- return true;
}
void FakeVimPluginPrivate::userActionTriggered(int key)
@@ -2138,11 +2136,9 @@ FakeVimPlugin::~FakeVimPlugin()
dd = nullptr;
}
-bool FakeVimPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void FakeVimPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
- return dd->initialize();
+ dd->initialize();
}
ExtensionSystem::IPlugin::ShutdownFlag FakeVimPlugin::aboutToShutdown()
diff --git a/src/plugins/fakevim/fakevimplugin.h b/src/plugins/fakevim/fakevimplugin.h
index e90bace161..c6a925ad2a 100644
--- a/src/plugins/fakevim/fakevimplugin.h
+++ b/src/plugins/fakevim/fakevimplugin.h
@@ -21,7 +21,7 @@ public:
private:
// implementation of ExtensionSystem::IPlugin
- bool initialize(const QStringList &arguments, QString *errorMessage) override;
+ void initialize() override;
ShutdownFlag aboutToShutdown() override;
void extensionsInitialized() override;
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
index cafdef4640..de49bd4d80 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
@@ -54,10 +54,9 @@ GenericProjectPlugin::~GenericProjectPlugin()
delete d;
}
-bool GenericProjectPlugin::initialize(const QStringList &, QString *)
+void GenericProjectPlugin::initialize()
{
d = new GenericProjectPluginPrivate;
- return true;
}
GenericProjectPluginPrivate::GenericProjectPluginPrivate()
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.h b/src/plugins/genericprojectmanager/genericprojectplugin.h
index 58bcf48211..9fab0fcc1b 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.h
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.h
@@ -17,7 +17,7 @@ public:
~GenericProjectPlugin() override;
private:
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
void extensionsInitialized() override { }
class GenericProjectPluginPrivate *d = nullptr;
diff --git a/src/plugins/gitlab/gitlabplugin.cpp b/src/plugins/gitlab/gitlabplugin.cpp
index a4ce353a9a..7994a95304 100644
--- a/src/plugins/gitlab/gitlabplugin.cpp
+++ b/src/plugins/gitlab/gitlabplugin.cpp
@@ -67,7 +67,7 @@ GitLabPlugin::~GitLabPlugin()
dd = nullptr;
}
-bool GitLabPlugin::initialize(const QStringList & /*arguments*/, QString * /*errorString*/)
+void GitLabPlugin::initialize()
{
dd = new GitLabPluginPrivate;
dd->parameters.fromSettings(Core::ICore::settings());
@@ -91,7 +91,6 @@ bool GitLabPlugin::initialize(const QStringList & /*arguments*/, QString * /*err
connect(ProjectExplorer::SessionManager::instance(),
&ProjectExplorer::SessionManager::startupProjectChanged,
this, &GitLabPlugin::onStartupProjectChanged);
- return true;
}
void GitLabPlugin::openView()
diff --git a/src/plugins/gitlab/gitlabplugin.h b/src/plugins/gitlab/gitlabplugin.h
index e8e034e9d6..d49c17d89d 100644
--- a/src/plugins/gitlab/gitlabplugin.h
+++ b/src/plugins/gitlab/gitlabplugin.h
@@ -24,7 +24,7 @@ public:
GitLabPlugin();
~GitLabPlugin() override;
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
static QList<GitLabServer> allGitLabServers();
static GitLabServer gitLabServerForId(const Utils::Id &id);
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp
index a0b4e2ad7b..eff9456527 100644
--- a/src/plugins/glsleditor/glsleditorplugin.cpp
+++ b/src/plugins/glsleditor/glsleditorplugin.cpp
@@ -92,7 +92,7 @@ GlslEditorPlugin::~GlslEditorPlugin()
dd = nullptr;
}
-bool GlslEditorPlugin::initialize(const QStringList &, QString *)
+void GlslEditorPlugin::initialize()
{
dd = new GlslEditorPluginPrivate;
@@ -111,8 +111,6 @@ bool GlslEditorPlugin::initialize(const QStringList &, QString *)
Command *cmd = ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION);
contextMenu->addAction(cmd);
-
- return true;
}
void GlslEditorPlugin::extensionsInitialized()
diff --git a/src/plugins/glsleditor/glsleditorplugin.h b/src/plugins/glsleditor/glsleditorplugin.h
index ed3800f5af..3d6b9f2338 100644
--- a/src/plugins/glsleditor/glsleditorplugin.h
+++ b/src/plugins/glsleditor/glsleditorplugin.h
@@ -40,7 +40,7 @@ public:
static const InitFile *shaderInit(int variant);
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
};
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 9a0e23eeba..5612637247 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -158,12 +158,9 @@ void HelpPlugin::showHelpUrl(const QUrl &url, Core::HelpManager::HelpViewerLocat
dd->showHelpUrl(url, location);
}
-bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
+void HelpPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(error)
dd = new HelpPluginPrivate;
- return true;
}
HelpPluginPrivate::HelpPluginPrivate()
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 8be957b3a8..d3a3e0b980 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -30,7 +30,7 @@ public:
static HelpWidget *modeHelpWidget();
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
bool delayedInitialize() final;
ShutdownFlag aboutToShutdown() final;
diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp
index 4e11020524..9805c4ef3d 100644
--- a/src/plugins/imageviewer/imageviewerplugin.cpp
+++ b/src/plugins/imageviewer/imageviewerplugin.cpp
@@ -114,14 +114,9 @@ ImageViewerPlugin::~ImageViewerPlugin()
delete d;
}
-bool ImageViewerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void ImageViewerPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new ImageViewerPluginPrivate;
-
- return true;
}
} // ImageViewer::Internal
diff --git a/src/plugins/imageviewer/imageviewerplugin.h b/src/plugins/imageviewer/imageviewerplugin.h
index fc62b87c4b..bb2253c6a3 100644
--- a/src/plugins/imageviewer/imageviewerplugin.h
+++ b/src/plugins/imageviewer/imageviewerplugin.h
@@ -18,7 +18,7 @@ public:
~ImageViewerPlugin();
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
class ImageViewerPluginPrivate *d = nullptr;
};
diff --git a/src/plugins/incredibuild/incredibuildplugin.cpp b/src/plugins/incredibuild/incredibuildplugin.cpp
index a54254ddd2..6e7ea8a4bc 100644
--- a/src/plugins/incredibuild/incredibuildplugin.cpp
+++ b/src/plugins/incredibuild/incredibuildplugin.cpp
@@ -20,14 +20,9 @@ IncrediBuildPlugin::~IncrediBuildPlugin()
delete d;
}
-bool IncrediBuildPlugin::initialize(const QStringList &arguments, QString *errorString)
+void IncrediBuildPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d = new IncrediBuildPluginPrivate;
-
- return true;
}
} // IncrediBuild::Internal
diff --git a/src/plugins/incredibuild/incredibuildplugin.h b/src/plugins/incredibuild/incredibuildplugin.h
index 0ef93934a7..994d65bb77 100644
--- a/src/plugins/incredibuild/incredibuildplugin.h
+++ b/src/plugins/incredibuild/incredibuildplugin.h
@@ -16,7 +16,7 @@ public:
IncrediBuildPlugin() = default;
~IncrediBuildPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
private:
class IncrediBuildPluginPrivate *d = nullptr;
diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp
index b343fc3996..9f790aa17f 100644
--- a/src/plugins/ios/iosplugin.cpp
+++ b/src/plugins/ios/iosplugin.cpp
@@ -67,18 +67,13 @@ IosPlugin::~IosPlugin()
delete d;
}
-bool IosPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void IosPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
qRegisterMetaType<Ios::IosToolHandler::Dict>("Ios::IosToolHandler::Dict");
IosConfigurations::initialize();
d = new IosPluginPrivate;
-
- return true;
}
} // Internal::Ios
diff --git a/src/plugins/ios/iosplugin.h b/src/plugins/ios/iosplugin.h
index 0e06fc198a..31deffd7d2 100644
--- a/src/plugins/ios/iosplugin.h
+++ b/src/plugins/ios/iosplugin.h
@@ -17,7 +17,7 @@ public:
~IosPlugin() final;
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
class IosPluginPrivate *d = nullptr;
};
diff --git a/src/plugins/languageclient/languageclientplugin.cpp b/src/plugins/languageclient/languageclientplugin.cpp
index c44c81fdf4..7332f03e2b 100644
--- a/src/plugins/languageclient/languageclientplugin.cpp
+++ b/src/plugins/languageclient/languageclientplugin.cpp
@@ -33,7 +33,7 @@ LanguageClientPlugin *LanguageClientPlugin::instance()
return m_instance;
}
-bool LanguageClientPlugin::initialize(const QStringList & /*arguments*/, QString * /*errorString*/)
+void LanguageClientPlugin::initialize()
{
using namespace Core;
@@ -50,8 +50,6 @@ bool LanguageClientPlugin::initialize(const QStringList & /*arguments*/, QString
connect(inspectAction, &QAction::triggered, this, &LanguageClientManager::showInspector);
toolsDebugContainer->addAction(
ActionManager::registerAction(inspectAction, "LanguageClient.InspectLanguageClients"));
-
- return true;
}
void LanguageClientPlugin::extensionsInitialized()
diff --git a/src/plugins/languageclient/languageclientplugin.h b/src/plugins/languageclient/languageclientplugin.h
index 5bdbfc0a0a..b8eb3ac00a 100644
--- a/src/plugins/languageclient/languageclientplugin.h
+++ b/src/plugins/languageclient/languageclientplugin.h
@@ -22,7 +22,7 @@ public:
// IPlugin interface
private:
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override;
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index b3a3bb750a..be4d2d2217 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/src/plugins/macros/macrosplugin.cpp
@@ -38,11 +38,8 @@ MacrosPlugin::~MacrosPlugin()
delete d;
}
-bool MacrosPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void MacrosPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new MacrosPluginPrivate;
Core::Context textContext(TextEditor::Constants::C_TEXTEDITOR);
@@ -79,10 +76,7 @@ bool MacrosPlugin::initialize(const QStringList &arguments, QString *errorMessag
command = Core::ActionManager::registerAction(saveLastMacro, Constants::SAVE_LAST_MACRO, textContext);
mmacrotools->addAction(command);
connect(saveLastMacro, &QAction::triggered, &d->macroManager, &MacroManager::saveLastMacro);
-
- return true;
}
-
} // Internal
} // Macros
diff --git a/src/plugins/macros/macrosplugin.h b/src/plugins/macros/macrosplugin.h
index 8184d7485a..da7daf3ec6 100644
--- a/src/plugins/macros/macrosplugin.h
+++ b/src/plugins/macros/macrosplugin.h
@@ -16,7 +16,7 @@ class MacrosPlugin final : public ExtensionSystem::IPlugin
public:
~MacrosPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
private:
class MacrosPluginPrivate *d = nullptr;
diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp
index 095100bb8a..608588aa9d 100644
--- a/src/plugins/mcusupport/mcusupportplugin.cpp
+++ b/src/plugins/mcusupport/mcusupportplugin.cpp
@@ -68,19 +68,14 @@ McuSupportPlugin::~McuSupportPlugin()
dd = nullptr;
}
-bool McuSupportPlugin::initialize(const QStringList &arguments, QString *errorString)
+void McuSupportPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
setObjectName("McuSupportPlugin");
dd = new McuSupportPluginPrivate;
dd->m_options.registerQchFiles();
dd->m_options.registerExamples();
ProjectExplorer::JsonWizardFactory::addWizardPath(":/mcusupport/wizards/");
-
- return true;
}
void McuSupportPlugin::extensionsInitialized()
diff --git a/src/plugins/mcusupport/mcusupportplugin.h b/src/plugins/mcusupport/mcusupportplugin.h
index 9c56ca41e6..6db14cb63e 100644
--- a/src/plugins/mcusupport/mcusupportplugin.h
+++ b/src/plugins/mcusupport/mcusupportplugin.h
@@ -19,7 +19,7 @@ class McuSupportPlugin final : public ExtensionSystem::IPlugin
public:
~McuSupportPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
void extensionsInitialized() final;
void askUserAboutMcuSupportKitsSetup();
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 5eb45e3ea4..e84c26a6ca 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -226,10 +226,9 @@ MercurialPlugin::~MercurialPlugin()
dd = nullptr;
}
-bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString * /*errorMessage */)
+void MercurialPlugin::initialize()
{
dd = new MercurialPluginPrivate;
- return true;
}
void MercurialPlugin::extensionsInitialized()
diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h
index f4cf0d71b4..a5b789452b 100644
--- a/src/plugins/mercurial/mercurialplugin.h
+++ b/src/plugins/mercurial/mercurialplugin.h
@@ -14,7 +14,7 @@ class MercurialPlugin final : public ExtensionSystem::IPlugin
~MercurialPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
#ifdef WITH_TESTS
diff --git a/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp b/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp
index adabb646ee..f15f65c4af 100644
--- a/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp
@@ -69,17 +69,14 @@ MesonProjectPlugin::~MesonProjectPlugin()
delete d;
}
-bool MesonProjectPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
+void MesonProjectPlugin::initialize()
{
- Q_UNUSED(errorMessage)
-
d = new MesonProjectPluginPrivate;
ProjectManager::registerProjectType<MesonProject>(Constants::Project::MIMETYPE);
FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson.build");
FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson_options.txt");
Settings::instance()->readSettings(ICore::settings());
- return true;
}
} // MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/mesonprojectplugin.h b/src/plugins/mesonprojectmanager/mesonprojectplugin.h
index b6d8936c39..6cae4586dc 100644
--- a/src/plugins/mesonprojectmanager/mesonprojectplugin.h
+++ b/src/plugins/mesonprojectmanager/mesonprojectplugin.h
@@ -17,7 +17,7 @@ public:
~MesonProjectPlugin() final;
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
class MesonProjectPluginPrivate *d = nullptr;
};
diff --git a/src/plugins/modeleditor/modeleditor_plugin.cpp b/src/plugins/modeleditor/modeleditor_plugin.cpp
index 28671e3738..4cdbf85a74 100644
--- a/src/plugins/modeleditor/modeleditor_plugin.cpp
+++ b/src/plugins/modeleditor/modeleditor_plugin.cpp
@@ -58,10 +58,8 @@ ModelEditorPlugin::~ModelEditorPlugin()
delete d;
}
-bool ModelEditorPlugin::initialize(const QStringList &arguments, QString *errorString)
+void ModelEditorPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
d = new ModelEditorPluginPrivate;
Core::JsExpander::registerGlobalObject<JsExtension>("Modeling");
@@ -70,8 +68,6 @@ bool ModelEditorPlugin::initialize(const QStringList &arguments, QString *errorS
&d->uiController, &UiController::saveSettings);
connect(&d->settingsController, &SettingsController::loadSettings,
&d->uiController, &UiController::loadSettings);
-
- return true;
}
void ModelEditorPlugin::extensionsInitialized()
diff --git a/src/plugins/modeleditor/modeleditor_plugin.h b/src/plugins/modeleditor/modeleditor_plugin.h
index 04a0c7edba..d3cf0ceea9 100644
--- a/src/plugins/modeleditor/modeleditor_plugin.h
+++ b/src/plugins/modeleditor/modeleditor_plugin.h
@@ -19,7 +19,7 @@ public:
ModelEditorPlugin();
~ModelEditorPlugin();
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override;
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index cdcaccdba3..636fed7560 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1690,11 +1690,9 @@ PerforcePlugin::~PerforcePlugin()
dd = nullptr;
}
-bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *errorMessage)
+void PerforcePlugin::initialize()
{
- Q_UNUSED(errorMessage)
dd = new PerforcePluginPrivate;
- return true;
}
#ifdef WITH_TESTS
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 7dafbc7c93..4c511767cf 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -14,7 +14,7 @@ class PerforcePlugin final : public ExtensionSystem::IPlugin
~PerforcePlugin() final;
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
public:
diff --git a/src/plugins/perfprofiler/perfprofilerplugin.cpp b/src/plugins/perfprofiler/perfprofilerplugin.cpp
index 2ae15e413d..12c006b48d 100644
--- a/src/plugins/perfprofiler/perfprofilerplugin.cpp
+++ b/src/plugins/perfprofiler/perfprofilerplugin.cpp
@@ -55,13 +55,9 @@ PerfProfilerPlugin::~PerfProfilerPlugin()
delete d;
}
-bool PerfProfilerPlugin::initialize(const QStringList &arguments, QString *errorString)
+void PerfProfilerPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d = new PerfProfilerPluginPrivate;
- return true;
}
PerfSettings *PerfProfilerPlugin::globalSettings()
diff --git a/src/plugins/perfprofiler/perfprofilerplugin.h b/src/plugins/perfprofiler/perfprofilerplugin.h
index f3c4cb664b..d65281189d 100644
--- a/src/plugins/perfprofiler/perfprofilerplugin.h
+++ b/src/plugins/perfprofiler/perfprofilerplugin.h
@@ -17,7 +17,7 @@ class PerfProfilerPlugin : public ExtensionSystem::IPlugin
public:
~PerfProfilerPlugin();
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
QVector<QObject *> createTestObjects() const final;
static PerfSettings *globalSettings();
diff --git a/src/plugins/python/pythonplugin.cpp b/src/plugins/python/pythonplugin.cpp
index 246494455d..dff3c0cb22 100644
--- a/src/plugins/python/pythonplugin.cpp
+++ b/src/plugins/python/pythonplugin.cpp
@@ -52,16 +52,11 @@ PythonPlugin *PythonPlugin::instance()
return m_instance;
}
-bool PythonPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void PythonPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new PythonPluginPrivate;
ProjectManager::registerProjectType<PythonProject>(PythonMimeType);
-
- return true;
}
void PythonPlugin::extensionsInitialized()
diff --git a/src/plugins/python/pythonplugin.h b/src/plugins/python/pythonplugin.h
index 1fb4e79d3c..ef0860bbca 100644
--- a/src/plugins/python/pythonplugin.h
+++ b/src/plugins/python/pythonplugin.h
@@ -19,7 +19,7 @@ public:
static PythonPlugin *instance();
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
class PythonPluginPrivate *d = nullptr;
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
index 49af654e4f..01a58753a2 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
@@ -81,11 +81,8 @@ QbsProjectManagerPlugin::~QbsProjectManagerPlugin()
delete d;
}
-bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void QbsProjectManagerPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new QbsProjectManagerPluginPrivate;
const Core::Context projectContext(::QbsProjectManager::Constants::PROJECT_ID);
@@ -248,8 +245,6 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
updateContextActions(ProjectTree::currentNode());
updateReparseQbsAction();
updateBuildActions();
-
- return true;
}
void QbsProjectManagerPlugin::targetWasAdded(Target *target)
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
index 6b6e6f54be..bfda1ff3e9 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
@@ -29,7 +29,7 @@ public:
private:
~QbsProjectManagerPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void targetWasAdded(ProjectExplorer::Target *target);
void projectChanged(QbsProject *project);
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
index ef7a065ce9..c36f643570 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
@@ -128,10 +128,8 @@ QmakeProjectManagerPlugin::~QmakeProjectManagerPlugin()
delete d;
}
-bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void QmakeProjectManagerPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
const Context projectContext(QmakeProjectManager::Constants::QMAKEPROJECT_ID);
Context projectTreeContext(ProjectExplorer::Constants::C_PROJECT_TREE);
@@ -291,8 +289,6 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString
d, &QmakeProjectManagerPluginPrivate::updateBuildFileAction);
d->updateActions();
-
- return true;
}
QmakeProjectManagerPluginPrivate::~QmakeProjectManagerPluginPrivate()
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.h
index 70ab880aa4..0e9b5db2f3 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.h
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.h
@@ -25,7 +25,7 @@ private slots:
#endif
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
class QmakeProjectManagerPluginPrivate *d = nullptr;
};
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index 4b0475da97..84f303ec18 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -101,14 +101,9 @@ QmlJSEditorPlugin::~QmlJSEditorPlugin()
m_instance = nullptr;
}
-bool QmlJSEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void QmlJSEditorPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new QmlJSEditorPluginPrivate;
-
- return true;
}
QmlJSEditorPluginPrivate::QmlJSEditorPluginPrivate()
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h
index 158f49cdab..cc1b63fe68 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.h
+++ b/src/plugins/qmljseditor/qmljseditorplugin.h
@@ -27,7 +27,7 @@ public:
static QuickToolBar *quickToolBar();
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
ShutdownFlag aboutToShutdown() final;
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp
index 1fe3e21d97..574c73190b 100644
--- a/src/plugins/qmljstools/qmljstoolsplugin.cpp
+++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp
@@ -48,14 +48,9 @@ QmlJSToolsPlugin::~QmlJSToolsPlugin()
delete d;
}
-bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error)
+void QmlJSToolsPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(error)
-
d = new QmlJSToolsPluginPrivate;
-
- return true;
}
QmlJSToolsPluginPrivate::QmlJSToolsPluginPrivate()
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.h b/src/plugins/qmljstools/qmljstoolsplugin.h
index a67ccf6a33..b659a3462d 100644
--- a/src/plugins/qmljstools/qmljstoolsplugin.h
+++ b/src/plugins/qmljstools/qmljstoolsplugin.h
@@ -17,7 +17,7 @@ public:
~QmlJSToolsPlugin() final;
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
class QmlJSToolsPluginPrivate *d = nullptr;
diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp
index b1c10b6ead..194d9bcc6a 100644
--- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp
@@ -198,14 +198,9 @@ QmlPreviewPlugin::~QmlPreviewPlugin()
delete d;
}
-bool QmlPreviewPlugin::initialize(const QStringList &arguments, QString *errorString)
+void QmlPreviewPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d = new QmlPreviewPluginPrivate(this);
-
- return true;
}
ExtensionSystem::IPlugin::ShutdownFlag QmlPreviewPlugin::aboutToShutdown()
diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.h b/src/plugins/qmlpreview/qmlpreviewplugin.h
index 4ae3840f87..8e750146ab 100644
--- a/src/plugins/qmlpreview/qmlpreviewplugin.h
+++ b/src/plugins/qmlpreview/qmlpreviewplugin.h
@@ -48,7 +48,7 @@ class QMLPREVIEW_EXPORT QmlPreviewPlugin : public ExtensionSystem::IPlugin
public:
~QmlPreviewPlugin() override;
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
ShutdownFlag aboutToShutdown() override;
QVector<QObject *> createTestObjects() const override;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index fc3877ed71..3c156311b4 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -237,10 +237,8 @@ static QmlBuildSystem *qmlBuildSystemforFileNode(const FileNode *fileNode)
return nullptr;
}
-bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
+void QmlProjectPlugin::initialize()
{
- Q_UNUSED(errorMessage)
-
d = new QmlProjectPluginPrivate;
if (!qmlDesignerEnabled()) {
@@ -358,8 +356,6 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
GenerateCmake::generateMenuEntry(this);
if (QmlProject::isQtDesignStudio())
GenerateCmake::CmakeProjectConverter::generateMenuEntry(this);
-
- return true;
}
void QmlProjectPlugin::displayQmlLandingPage()
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.h b/src/plugins/qmlprojectmanager/qmlprojectplugin.h
index 15e2f690a1..75e85d619a 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.h
@@ -36,7 +36,7 @@ public slots:
void openQds(bool permanent = false);
private:
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
void displayQmlLandingPage();
void hideQmlLandingPage();
void updateQmlLandingPageProjectInfo(const Utils::FilePath &projectFile);
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index 590ff64d75..5b5f889032 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -114,14 +114,9 @@ QnxPlugin::~QnxPlugin()
delete dd;
}
-bool QnxPlugin::initialize(const QStringList &arguments, QString *errorString)
+void QnxPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
dd = new QnxPluginPrivate;
-
- return true;
}
void QnxPlugin::extensionsInitialized()
diff --git a/src/plugins/qnx/qnxplugin.h b/src/plugins/qnx/qnxplugin.h
index 1136eeb767..2eed97319f 100644
--- a/src/plugins/qnx/qnxplugin.h
+++ b/src/plugins/qnx/qnxplugin.h
@@ -16,7 +16,7 @@ public:
~QnxPlugin() final;
private:
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
void extensionsInitialized() final;
};
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index 839245c666..8945ca5afb 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -86,12 +86,10 @@ static void processRunnerCallback(ProcessData *data)
data->stdOut = proc.readAllRawStandardOutput();
}
-bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void QtSupportPlugin::initialize()
{
theProcessRunner() = processRunnerCallback;
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
QMakeParser::initialize();
ProFileEvaluator::initialize();
new ProFileCacheManager(this);
@@ -103,8 +101,6 @@ bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMes
d = new QtSupportPluginPrivate;
QtVersionManager::initialized();
-
- return true;
}
const char kLinkWithQtInstallationSetting[] = "LinkWithQtInstallation";
diff --git a/src/plugins/qtsupport/qtsupportplugin.h b/src/plugins/qtsupport/qtsupportplugin.h
index 7cd9a8eb79..7e4c98a9aa 100644
--- a/src/plugins/qtsupport/qtsupportplugin.h
+++ b/src/plugins/qtsupport/qtsupportplugin.h
@@ -17,7 +17,7 @@ public:
~QtSupportPlugin() final;
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
class QtSupportPluginPrivate *d = nullptr;
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index 4048c392e4..920d516204 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -89,14 +89,9 @@ QVector<QObject *> RemoteLinuxPlugin::createTestObjects() const
};
}
-bool RemoteLinuxPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void RemoteLinuxPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
dd = new RemoteLinuxPluginPrivate;
-
- return true;
}
} // namespace Internal
diff --git a/src/plugins/remotelinux/remotelinuxplugin.h b/src/plugins/remotelinux/remotelinuxplugin.h
index 19de0334fc..6e4bdce341 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.h
+++ b/src/plugins/remotelinux/remotelinuxplugin.h
@@ -20,7 +20,7 @@ public:
QVector<QObject *> createTestObjects() const override;
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
};
} // namespace Internal
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index 5fb3fb51e6..d7f2ca8be2 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -425,14 +425,9 @@ ResourceEditorPlugin::~ResourceEditorPlugin()
delete d;
}
-bool ResourceEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void ResourceEditorPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new ResourceEditorPluginPrivate(this);
-
- return true;
}
void ResourceEditorPlugin::onUndoStackChanged(ResourceEditorW const *editor,
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.h b/src/plugins/resourceeditor/resourceeditorplugin.h
index abc750298e..dd7390a76b 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.h
+++ b/src/plugins/resourceeditor/resourceeditorplugin.h
@@ -20,7 +20,7 @@ public:
void onUndoStackChanged(ResourceEditorW const *editor, bool canUndo, bool canRedo);
private:
- bool initialize(const QStringList &arguments, QString *errorMessage = nullptr) final;
+ void initialize() final;
void extensionsInitialized() override;
class ResourceEditorPluginPrivate *d = nullptr;
diff --git a/src/plugins/scxmleditor/scxmleditorplugin.cpp b/src/plugins/scxmleditor/scxmleditorplugin.cpp
index 95a5544fb9..f2a0de589e 100644
--- a/src/plugins/scxmleditor/scxmleditorplugin.cpp
+++ b/src/plugins/scxmleditor/scxmleditorplugin.cpp
@@ -23,14 +23,9 @@ ScxmlEditorPlugin::~ScxmlEditorPlugin()
delete d;
}
-bool ScxmlEditorPlugin::initialize(const QStringList &arguments, QString *errorString)
+void ScxmlEditorPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
d = new ScxmlEditorPluginPrivate;
-
- return true;
}
void ScxmlEditorPlugin::extensionsInitialized()
diff --git a/src/plugins/scxmleditor/scxmleditorplugin.h b/src/plugins/scxmleditor/scxmleditorplugin.h
index 87d5c90135..485ba92def 100644
--- a/src/plugins/scxmleditor/scxmleditorplugin.h
+++ b/src/plugins/scxmleditor/scxmleditorplugin.h
@@ -16,7 +16,7 @@ public:
~ScxmlEditorPlugin();
private:
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
void extensionsInitialized() final;
class ScxmlEditorPluginPrivate *d = nullptr;
diff --git a/src/plugins/serialterminal/serialterminalplugin.cpp b/src/plugins/serialterminal/serialterminalplugin.cpp
index d8a0bf19cf..0b50a50fa4 100644
--- a/src/plugins/serialterminal/serialterminalplugin.cpp
+++ b/src/plugins/serialterminal/serialterminalplugin.cpp
@@ -10,11 +10,8 @@
namespace SerialTerminal {
namespace Internal {
-bool SerialTerminalPlugin::initialize(const QStringList &arguments, QString *errorString)
+void SerialTerminalPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
m_settings.load(Core::ICore::settings());
// Create serial output pane
@@ -24,8 +21,6 @@ bool SerialTerminalPlugin::initialize(const QStringList &arguments, QString *err
connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested,
this, [this] { m_settings.save(Core::ICore::settings()); });
-
- return true;
}
ExtensionSystem::IPlugin::ShutdownFlag SerialTerminalPlugin::aboutToShutdown()
diff --git a/src/plugins/serialterminal/serialterminalplugin.h b/src/plugins/serialterminal/serialterminalplugin.h
index 18da3120da..c08fe5a2bd 100644
--- a/src/plugins/serialterminal/serialterminalplugin.h
+++ b/src/plugins/serialterminal/serialterminalplugin.h
@@ -21,7 +21,7 @@ class SerialTerminalPlugin : public ExtensionSystem::IPlugin
public:
explicit SerialTerminalPlugin() = default;
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
ShutdownFlag aboutToShutdown() final;
private:
diff --git a/src/plugins/silversearcher/silversearcherplugin.cpp b/src/plugins/silversearcher/silversearcherplugin.cpp
index ad0b862ec3..49f1b1da4d 100644
--- a/src/plugins/silversearcher/silversearcherplugin.cpp
+++ b/src/plugins/silversearcher/silversearcherplugin.cpp
@@ -8,14 +8,9 @@
namespace SilverSearcher {
namespace Internal {
-bool SilverSearcherPlugin::initialize(const QStringList &arguments, QString *errorString)
+void SilverSearcherPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
new FindInFilesSilverSearcher(this);
-
- return true;
}
#ifdef WITH_TESTS
diff --git a/src/plugins/silversearcher/silversearcherplugin.h b/src/plugins/silversearcher/silversearcherplugin.h
index 6e2dc68b4a..15d45da06b 100644
--- a/src/plugins/silversearcher/silversearcherplugin.h
+++ b/src/plugins/silversearcher/silversearcherplugin.h
@@ -14,7 +14,7 @@ class SilverSearcherPlugin : public ExtensionSystem::IPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "SilverSearcher.json")
public:
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
#ifdef WITH_TESTS
private:
diff --git a/src/plugins/squish/squishplugin.cpp b/src/plugins/squish/squishplugin.cpp
index fe9d9f1d13..f72f70df78 100644
--- a/src/plugins/squish/squishplugin.cpp
+++ b/src/plugins/squish/squishplugin.cpp
@@ -126,11 +126,10 @@ bool SquishPluginPrivate::initializeGlobalScripts()
return true;
}
-bool SquishPlugin::initialize(const QStringList &, QString *)
+void SquishPlugin::initialize()
{
dd = new SquishPluginPrivate;
ProjectExplorer::JsonWizardFactory::addWizardPath(":/squish/wizard/");
- return true;
}
bool SquishPlugin::delayedInitialize()
diff --git a/src/plugins/squish/squishplugin.h b/src/plugins/squish/squishplugin.h
index 76a95cc67f..86b5eca393 100644
--- a/src/plugins/squish/squishplugin.h
+++ b/src/plugins/squish/squishplugin.h
@@ -22,7 +22,7 @@ public:
static SquishSettings *squishSettings();
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
bool delayedInitialize() override;
ShutdownFlag aboutToShutdown() override;
};
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index bf80c749a9..ea57019031 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -470,17 +470,12 @@ StudioWelcomePlugin::~StudioWelcomePlugin()
delete m_welcomeMode;
}
-bool StudioWelcomePlugin::initialize(const QStringList &arguments, QString *errorString)
+void StudioWelcomePlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
qmlRegisterType<ProjectModel>("projectmodel", 1, 0, "ProjectModel");
qmlRegisterType<UsageStatisticPluginModel>("usagestatistics", 1, 0, "UsageStatisticModel");
m_welcomeMode = new WelcomeMode;
-
- return true;
}
static bool forceDownLoad()
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.h b/src/plugins/studiowelcome/studiowelcomeplugin.h
index c9219734ca..5f0a2a4dc6 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.h
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.h
@@ -50,7 +50,7 @@ public:
StudioWelcomePlugin();
~StudioWelcomePlugin() final;
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
void extensionsInitialized() override;
bool delayedInitialize() override;
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 0018b195ec..6fdf331be0 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -343,11 +343,9 @@ bool SubversionPluginPrivate::isCommitEditorOpen() const
return !m_commitMessageFileName.isEmpty();
}
-bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *errorMessage)
+void SubversionPlugin::initialize()
{
- Q_UNUSED(errorMessage)
dd = new SubversionPluginPrivate;
- return true;
}
void SubversionPlugin::extensionsInitialized()
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index a2823de519..c5ebc17884 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -20,7 +20,7 @@ class SubversionPlugin final : public ExtensionSystem::IPlugin
~SubversionPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
#ifdef WITH_TESTS
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 254389c957..e97453adda 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -88,11 +88,8 @@ TextEditorPlugin *TextEditorPlugin::instance()
return m_instance;
}
-bool TextEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void TextEditorPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new TextEditorPluginPrivate;
Context context(TextEditor::Constants::C_TEXTEDITOR);
@@ -143,8 +140,6 @@ bool TextEditorPlugin::initialize(const QStringList &arguments, QString *errorMe
Tr::tr("Text", "SnippetProvider"));
d->createStandardContextMenu();
-
- return true;
}
void TextEditorPluginPrivate::extensionsInitialized()
diff --git a/src/plugins/texteditor/texteditorplugin.h b/src/plugins/texteditor/texteditorplugin.h
index dd0c3ed24d..067e4e9631 100644
--- a/src/plugins/texteditor/texteditorplugin.h
+++ b/src/plugins/texteditor/texteditorplugin.h
@@ -25,7 +25,7 @@ public:
ShutdownFlag aboutToShutdown() override;
private:
- bool initialize(const QStringList &arguments, QString *errorMessage) final;
+ void initialize() final;
void extensionsInitialized() final;
class TextEditorPluginPrivate *d = nullptr;
diff --git a/src/plugins/todo/todoplugin.cpp b/src/plugins/todo/todoplugin.cpp
index cecee7fcda..764217b76b 100644
--- a/src/plugins/todo/todoplugin.cpp
+++ b/src/plugins/todo/todoplugin.cpp
@@ -107,14 +107,9 @@ TodoPlugin::~TodoPlugin()
delete d;
}
-bool TodoPlugin::initialize(const QStringList& args, QString *errMsg)
+void TodoPlugin::initialize()
{
- Q_UNUSED(args)
- Q_UNUSED(errMsg)
-
d = new TodoPluginPrivate;
-
- return true;
}
} // namespace Internal
diff --git a/src/plugins/todo/todoplugin.h b/src/plugins/todo/todoplugin.h
index 51953c1423..73cf865cb5 100644
--- a/src/plugins/todo/todoplugin.h
+++ b/src/plugins/todo/todoplugin.h
@@ -18,7 +18,7 @@ public:
TodoPlugin();
~TodoPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
private:
class TodoPluginPrivate *d = nullptr;
diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index 22b4c5450e..c6825a4ce9 100644
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -60,13 +60,11 @@ ValgrindPlugin::~ValgrindPlugin()
delete d;
}
-bool ValgrindPlugin::initialize(const QStringList &, QString *)
+void ValgrindPlugin::initialize()
{
d = new ValgrindPluginPrivate;
RunConfiguration::registerAspect<ValgrindRunConfigurationAspect>();
-
- return true;
}
QVector<QObject *> ValgrindPlugin::createTestObjects() const
diff --git a/src/plugins/valgrind/valgrindplugin.h b/src/plugins/valgrind/valgrindplugin.h
index 6430868848..9c8afda19f 100644
--- a/src/plugins/valgrind/valgrindplugin.h
+++ b/src/plugins/valgrind/valgrindplugin.h
@@ -17,7 +17,7 @@ public:
ValgrindPlugin() = default;
~ValgrindPlugin() final;
- bool initialize(const QStringList &arguments, QString *errorString) final;
+ void initialize() final;
private:
QVector<QObject *> createTestObjects() const override;
diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp
index da1740d691..e5108942f5 100644
--- a/src/plugins/vcsbase/vcsplugin.cpp
+++ b/src/plugins/vcsbase/vcsplugin.cpp
@@ -59,11 +59,8 @@ VcsPlugin::~VcsPlugin()
delete d;
}
-bool VcsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+void VcsPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
-
d = new VcsPluginPrivate;
EditorManager::addCloseEditorListener([this](IEditor *editor) -> bool {
@@ -114,8 +111,6 @@ bool VcsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
// Just touch VCS Output Pane before initialization
VcsOutputWindow::instance();
-
- return true;
}
VcsPlugin *VcsPlugin::instance()
diff --git a/src/plugins/vcsbase/vcsplugin.h b/src/plugins/vcsbase/vcsplugin.h
index 4b9007a09b..83157fc140 100644
--- a/src/plugins/vcsbase/vcsplugin.h
+++ b/src/plugins/vcsbase/vcsplugin.h
@@ -30,7 +30,7 @@ public:
VcsPlugin();
~VcsPlugin() override;
- bool initialize(const QStringList &arguments, QString *errorMessage) override;
+ void initialize() override;
static VcsPlugin *instance();
diff --git a/src/plugins/webassembly/webassemblyplugin.cpp b/src/plugins/webassembly/webassemblyplugin.cpp
index c0c05d20bd..2d342030d5 100644
--- a/src/plugins/webassembly/webassemblyplugin.cpp
+++ b/src/plugins/webassembly/webassemblyplugin.cpp
@@ -51,14 +51,9 @@ WebAssemblyPlugin::~WebAssemblyPlugin()
dd = nullptr;
}
-bool WebAssemblyPlugin::initialize(const QStringList& arguments, QString* errorString)
+void WebAssemblyPlugin::initialize()
{
- Q_UNUSED(arguments)
- Q_UNUSED(errorString)
-
dd = new WebAssemblyPluginPrivate;
-
- return true;
}
void WebAssemblyPlugin::extensionsInitialized()
diff --git a/src/plugins/webassembly/webassemblyplugin.h b/src/plugins/webassembly/webassemblyplugin.h
index 40c5f8e487..20c9e3e085 100644
--- a/src/plugins/webassembly/webassemblyplugin.h
+++ b/src/plugins/webassembly/webassemblyplugin.h
@@ -18,7 +18,7 @@ public:
WebAssemblyPlugin();
~WebAssemblyPlugin() override;
- bool initialize(const QStringList &arguments, QString *errorString) override;
+ void initialize() override;
void extensionsInitialized() override;
static void askUserAboutEmSdkSetup();