Use simpler Plugin::initialize() when feasible

Change-Id: I567965d266f20526bda9f823e31a04b354d53fb1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-01-20 12:28:36 +01:00
parent 013ad1345e
commit 118b84ffd6
132 changed files with 138 additions and 399 deletions

View File

@@ -31,7 +31,6 @@ public:
~IPlugin() override; ~IPlugin() override;
virtual bool initialize(const QStringList &arguments, QString *errorString); virtual bool initialize(const QStringList &arguments, QString *errorString);
virtual void initialize() {}
virtual void extensionsInitialized() {} virtual void extensionsInitialized() {}
virtual bool delayedInitialize() { return false; } virtual bool delayedInitialize() { return false; }
virtual ShutdownFlag aboutToShutdown() { return SynchronousShutdown; } virtual ShutdownFlag aboutToShutdown() { return SynchronousShutdown; }
@@ -42,6 +41,9 @@ public:
PluginSpec *pluginSpec() const; PluginSpec *pluginSpec() const;
protected:
virtual void initialize() {}
signals: signals:
void asynchronousShutdownFinished(); void asynchronousShutdownFinished();

View File

@@ -121,11 +121,8 @@ AndroidPlugin::~AndroidPlugin()
delete d; delete d;
} }
bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessage) void AndroidPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
d = new AndroidPluginPrivate; d = new AndroidPluginPrivate;
connect(KitManager::instance(), &KitManager::kitsLoaded, connect(KitManager::instance(), &KitManager::kitsLoaded,
@@ -135,7 +132,6 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
{Android::Constants::JLS_SETTINGS_ID, {Android::Constants::JLS_SETTINGS_ID,
Tr::tr("Java Language Server"), Tr::tr("Java Language Server"),
[] { return new JLSSettings; }}); [] { return new JLSSettings; }});
return true;
} }
void AndroidPlugin::kitsRestored() void AndroidPlugin::kitsRestored()

View File

@@ -15,7 +15,7 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
~AndroidPlugin() final; ~AndroidPlugin() final;
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void kitsRestored(); void kitsRestored();
void askUserAboutAndroidSetup(); void askUserAboutAndroidSetup();

View File

@@ -276,17 +276,13 @@ void AutotestPluginPrivate::initializeMenuEntries()
this, &AutotestPlugin::updateMenuItemsEnabledState); this, &AutotestPlugin::updateMenuItemsEnabledState);
} }
bool AutotestPlugin::initialize(const QStringList &arguments, QString *errorString) void AutotestPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
dd = new AutotestPluginPrivate; dd = new AutotestPluginPrivate;
#ifdef WITH_TESTS #ifdef WITH_TESTS
ExtensionSystem::PluginManager::registerScenario("TestModelManagerInterface", ExtensionSystem::PluginManager::registerScenario("TestModelManagerInterface",
[] { return dd->m_loadProjectScenario(); }); [] { return dd->m_loadProjectScenario(); });
#endif #endif
return true;
} }
void AutotestPlugin::extensionsInitialized() void AutotestPlugin::extensionsInitialized()

View File

@@ -39,7 +39,7 @@ public:
AutotestPlugin(); AutotestPlugin();
~AutotestPlugin() override; ~AutotestPlugin() override;
bool initialize(const QStringList &arguments, QString *errorString) override; void initialize() override;
void extensionsInitialized() override; void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override; ShutdownFlag aboutToShutdown() override;

View File

@@ -63,15 +63,10 @@ AutotoolsProjectPlugin::~AutotoolsProjectPlugin()
void AutotoolsProjectPlugin::extensionsInitialized() void AutotoolsProjectPlugin::extensionsInitialized()
{ } { }
bool AutotoolsProjectPlugin::initialize(const QStringList &arguments, QString *errorString) void AutotoolsProjectPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
d = new AutotoolsProjectPluginPrivate; d = new AutotoolsProjectPluginPrivate;
ProjectExplorer::ProjectManager::registerProjectType<AutotoolsProject>(Constants::MAKEFILE_MIMETYPE); ProjectExplorer::ProjectManager::registerProjectType<AutotoolsProject>(Constants::MAKEFILE_MIMETYPE);
return true;
} }
} // AutotoolsProjectManager::Internal } // AutotoolsProjectManager::Internal

View File

@@ -43,7 +43,7 @@ class AutotoolsProjectPlugin final : public ExtensionSystem::IPlugin
~AutotoolsProjectPlugin() final; ~AutotoolsProjectPlugin() final;
void extensionsInitialized() final; void extensionsInitialized() final;
bool initialize(const QStringList &arguments, QString *errorString) final; void initialize() final;
class AutotoolsProjectPluginPrivate *d; class AutotoolsProjectPluginPrivate *d;
}; };

View File

@@ -66,13 +66,9 @@ BareMetalPlugin::~BareMetalPlugin()
delete d; delete d;
} }
bool BareMetalPlugin::initialize(const QStringList &arguments, QString *errorString) void BareMetalPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
d = new BareMetalPluginPrivate; d = new BareMetalPluginPrivate;
return true;
} }
void BareMetalPlugin::extensionsInitialized() void BareMetalPlugin::extensionsInitialized()

View File

@@ -15,7 +15,7 @@ class BareMetalPlugin final : public ExtensionSystem::IPlugin
~BareMetalPlugin() final; ~BareMetalPlugin() final;
bool initialize(const QStringList &arguments, QString *errorString) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
class BareMetalPluginPrivate *d = nullptr; class BareMetalPluginPrivate *d = nullptr;

View File

@@ -334,12 +334,9 @@ BazaarPlugin::~BazaarPlugin()
d = nullptr; d = nullptr;
} }
bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessage) void BazaarPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
d = new BazaarPluginPrivate; d = new BazaarPluginPrivate;
return true;
} }
void BazaarPlugin::extensionsInitialized() void BazaarPlugin::extensionsInitialized()

View File

@@ -14,7 +14,7 @@ class BazaarPlugin final : public ExtensionSystem::IPlugin
~BazaarPlugin() final; ~BazaarPlugin() final;
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
#ifdef WITH_TESTS #ifdef WITH_TESTS

View File

@@ -91,16 +91,12 @@ public:
static BeautifierPluginPrivate *dd = nullptr; 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); Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID);
menu->menu()->setTitle(Tr::tr("Bea&utifier")); menu->menu()->setTitle(Tr::tr("Bea&utifier"));
menu->setOnAllDisabledBehavior(Core::ActionContainer::Show); menu->setOnAllDisabledBehavior(Core::ActionContainer::Show);
Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu); Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
return true;
} }
void BeautifierPlugin::extensionsInitialized() void BeautifierPlugin::extensionsInitialized()

View File

@@ -24,7 +24,7 @@ public:
static void showError(const QString &error); static void showError(const QString &error);
private: private:
bool initialize(const QStringList &arguments, QString *errorString) override; void initialize() override;
void extensionsInitialized() override; void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override; ShutdownFlag aboutToShutdown() override;
}; };

View File

@@ -502,14 +502,9 @@ BinEditorPlugin::~BinEditorPlugin()
dd = nullptr; dd = nullptr;
} }
bool BinEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage) void BinEditorPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
dd = new BinEditorPluginPrivate; dd = new BinEditorPluginPrivate;
return true;
} }
} // BinEditor::Internal } // BinEditor::Internal

View File

@@ -16,7 +16,7 @@ class BinEditorPlugin : public ExtensionSystem::IPlugin
~BinEditorPlugin() override; ~BinEditorPlugin() override;
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final {} void extensionsInitialized() final {}
}; };

View File

@@ -67,10 +67,9 @@ BookmarksPlugin::~BookmarksPlugin()
delete d; delete d;
} }
bool BookmarksPlugin::initialize(const QStringList &, QString *) void BookmarksPlugin::initialize()
{ {
d = new BookmarksPluginPrivate; d = new BookmarksPluginPrivate;
return true;
} }
BookmarksPluginPrivate::BookmarksPluginPrivate() BookmarksPluginPrivate::BookmarksPluginPrivate()

View File

@@ -14,7 +14,7 @@ class BookmarksPlugin final : public ExtensionSystem::IPlugin
~BookmarksPlugin() final; ~BookmarksPlugin() final;
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
class BookmarksPluginPrivate *d = nullptr; class BookmarksPluginPrivate *d = nullptr;
}; };

View File

@@ -164,16 +164,11 @@ QdbPlugin::~QdbPlugin()
delete d; delete d;
} }
bool QdbPlugin::initialize(const QStringList &arguments, QString *errorString) void QdbPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
d = new QdbPluginPrivate; d = new QdbPluginPrivate;
registerFlashAction(this); registerFlashAction(this);
return true;
} }
void QdbPlugin::extensionsInitialized() void QdbPlugin::extensionsInitialized()

View File

@@ -17,7 +17,7 @@ public:
~QdbPlugin() final; ~QdbPlugin() final;
private: private:
bool initialize(const QStringList &arguments, QString *errorString) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
ShutdownFlag aboutToShutdown() final; ShutdownFlag aboutToShutdown() final;

View File

@@ -76,11 +76,8 @@ ClangCodeModelPlugin::~ClangCodeModelPlugin()
m_generatorWatcher.waitForFinished(); 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, TaskHub::addCategory(Constants::TASK_CATEGORY_DIAGNOSTICS,
Tr::tr("Clang Code Model")); Tr::tr("Clang Code Model"));
@@ -93,8 +90,6 @@ bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *err
std::make_unique<ClangModelManagerSupport>()); std::make_unique<ClangModelManagerSupport>());
createCompilationDBAction(); createCompilationDBAction();
return true;
} }
void ClangCodeModelPlugin::createCompilationDBAction() void ClangCodeModelPlugin::createCompilationDBAction()

View File

@@ -21,12 +21,11 @@ class ClangCodeModelPlugin final: public ExtensionSystem::IPlugin
public: public:
~ClangCodeModelPlugin() override; ~ClangCodeModelPlugin() override;
bool initialize(const QStringList &arguments, QString *errorMessage) override; void initialize() override;
private: private:
void maybeHandleBatchFileAndExit() const; void maybeHandleBatchFileAndExit() const;
private:
void generateCompilationDB(); void generateCompilationDB();
void createCompilationDBAction(); void createCompilationDBAction();

View File

@@ -87,10 +87,8 @@ static void replaceCppCodeStyle()
TextEditorSettings::registerCodeStyleFactory(new ClangFormatStyleFactory); TextEditorSettings::registerCodeStyleFactory(new ClangFormatStyleFactory);
} }
bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorString) void ClangFormatPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
replaceCppCodeStyle(); replaceCppCodeStyle();
ActionContainer *contextMenu = ActionManager::actionContainer(CppEditor::Constants::M_CONTEXT); 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()); openClangFormatConfigAction->setData(doc->filePath().toVariant());
}); });
} }
return true;
} }
QVector<QObject *> ClangFormatPlugin::createTestObjects() const QVector<QObject *> ClangFormatPlugin::createTestObjects() const

View File

@@ -12,7 +12,7 @@ class ClangFormatPlugin : public ExtensionSystem::IPlugin
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "ClangFormat.json") 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; QVector<QObject *> createTestObjects() const override;
}; };

View File

@@ -88,11 +88,8 @@ ClangToolsPlugin::~ClangToolsPlugin()
delete d; 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")); TaskHub::addCategory(taskCategory(), Tr::tr("Clang Tools"));
// Import tidy/clazy diagnostic configs from CppEditor now // Import tidy/clazy diagnostic configs from CppEditor now
@@ -115,8 +112,6 @@ bool ClangToolsPlugin::initialize(const QStringList &arguments, QString *errorSt
&Core::EditorManager::currentEditorChanged, &Core::EditorManager::currentEditorChanged,
this, this,
&ClangToolsPlugin::onCurrentEditorChanged); &ClangToolsPlugin::onCurrentEditorChanged);
return true;
} }
void ClangToolsPlugin::onCurrentEditorChanged() void ClangToolsPlugin::onCurrentEditorChanged()

View File

@@ -23,7 +23,7 @@ public:
~ClangToolsPlugin() final; ~ClangToolsPlugin() final;
private: private:
bool initialize(const QStringList &arguments, QString *errorString) final; void initialize() final;
void registerAnalyzeActions(); void registerAnalyzeActions();
void onCurrentEditorChanged(); void onCurrentEditorChanged();

View File

@@ -34,14 +34,9 @@ ClassViewPlugin::~ClassViewPlugin()
dd = nullptr; dd = nullptr;
} }
bool ClassViewPlugin::initialize(const QStringList &arguments, QString *errorMessage) void ClassViewPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
dd = new ClassViewPluginPrivate; dd = new ClassViewPluginPrivate;
return true;
} }
} // namespace Internal } // namespace Internal

View File

@@ -18,7 +18,7 @@ public:
~ClassViewPlugin() final; ~ClassViewPlugin() final;
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage = nullptr) final; void initialize() final;
void extensionsInitialized() final {} void extensionsInitialized() final {}
}; };

View File

@@ -560,11 +560,9 @@ QString ClearCasePluginPrivate::findTopLevel(const FilePath &directory) const
return ccManagesDirectory(directory); return ccManagesDirectory(directory);
} }
bool ClearCasePlugin::initialize(const QStringList & /*arguments */, QString *errorMessage) void ClearCasePlugin::initialize()
{ {
Q_UNUSED(errorMessage)
dd = new ClearCasePluginPrivate; dd = new ClearCasePluginPrivate;
return true;
} }
void ClearCasePlugin::extensionsInitialized() void ClearCasePlugin::extensionsInitialized()

View File

@@ -67,7 +67,7 @@ public:
static QSharedPointer<StatusMap> statusMap(); static QSharedPointer<StatusMap> statusMap();
private: private:
bool initialize(const QStringList &arguments, QString *error_message) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
#ifdef WITH_TESTS #ifdef WITH_TESTS

View File

@@ -149,10 +149,8 @@ CMakeProjectPlugin::~CMakeProjectPlugin()
delete d; delete d;
} }
bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage) void CMakeProjectPlugin::initialize()
{ {
Q_UNUSED(errorMessage)
d = new CMakeProjectPluginPrivate; d = new CMakeProjectPluginPrivate;
projectTypeSpecificSettings()->readSettings(ICore::settings()); projectTypeSpecificSettings()->readSettings(ICore::settings());
@@ -195,8 +193,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
d->cmakeFormatter.initialize(); d->cmakeFormatter.initialize();
d->updateActions(); d->updateActions();
return true;
} }
void CMakeProjectPlugin::extensionsInitialized() void CMakeProjectPlugin::extensionsInitialized()

View File

@@ -36,7 +36,7 @@ private slots:
#endif #endif
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
void updateContextActions(ProjectExplorer::Node *node); void updateContextActions(ProjectExplorer::Node *node);

View File

@@ -86,7 +86,7 @@ CocoPlugin::~CocoPlugin()
delete d; delete d;
} }
bool CocoPlugin::initialize(const QStringList &, QString *) void CocoPlugin::initialize()
{ {
using namespace Core; using namespace Core;
ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER); 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(); }); connect(startCoco, &QAction::triggered, this, [this]() { d->startCoco(); });
} }
return true;
} }
} // namespace Coco } // namespace Coco

View File

@@ -18,7 +18,7 @@ public:
CocoPlugin(); CocoPlugin();
~CocoPlugin() override; ~CocoPlugin() override;
bool initialize(const QStringList &arguments, QString *errorString) override; void initialize() override;
private: private:
CocoPluginPrivate *d; CocoPluginPrivate *d;
}; };

View File

@@ -42,11 +42,8 @@ CompilationDatabaseProjectManagerPlugin::~CompilationDatabaseProjectManagerPlugi
delete d; delete d;
} }
bool CompilationDatabaseProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage) void CompilationDatabaseProjectManagerPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
d = new CompilationDatabaseProjectManagerPluginPrivate; d = new CompilationDatabaseProjectManagerPluginPrivate;
Utils::FileIconProvider::registerIconOverlayForFilename(Utils::Icons::PROJECT.imageFilePath().toString(), Utils::FileIconProvider::registerIconOverlayForFilename(Utils::Icons::PROJECT.imageFilePath().toString(),
@@ -80,8 +77,6 @@ bool CompilationDatabaseProjectManagerPlugin::initialize(const QStringList &argu
connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged, connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged,
this, onProjectChanged); this, onProjectChanged);
return true;
} }
QVector<QObject *> CompilationDatabaseProjectManagerPlugin::createTestObjects() const QVector<QObject *> CompilationDatabaseProjectManagerPlugin::createTestObjects() const

View File

@@ -15,7 +15,7 @@ class CompilationDatabaseProjectManagerPlugin final : public ExtensionSystem::IP
~CompilationDatabaseProjectManagerPlugin(); ~CompilationDatabaseProjectManagerPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
QVector<QObject *> createTestObjects() const final; QVector<QObject *> createTestObjects() const final;
class CompilationDatabaseProjectManagerPluginPrivate *d = nullptr; class CompilationDatabaseProjectManagerPluginPrivate *d = nullptr;

View File

@@ -34,21 +34,13 @@ ConanPlugin::~ConanPlugin()
delete d; delete d;
} }
void ConanPlugin::extensionsInitialized() void ConanPlugin::initialize()
{ }
bool ConanPlugin::initialize(const QStringList &arguments, QString *errorString)
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
d = new ConanPluginPrivate; d = new ConanPluginPrivate;
conanSettings()->readSettings(ICore::settings()); conanSettings()->readSettings(ICore::settings());
connect(SessionManager::instance(), &SessionManager::projectAdded, connect(SessionManager::instance(), &SessionManager::projectAdded,
this, &ConanPlugin::projectAdded); this, &ConanPlugin::projectAdded);
return true;
} }
static void connectTarget(Project *project, Target *target) static void connectTarget(Project *project, Target *target)

View File

@@ -26,8 +26,7 @@ private:
~ConanPlugin() final; ~ConanPlugin() final;
void projectAdded(ProjectExplorer::Project *project); void projectAdded(ProjectExplorer::Project *project);
void extensionsInitialized() final; void initialize() final;
bool initialize(const QStringList &arguments, QString *errorString) final;
class ConanPluginPrivate *d = nullptr; class ConanPluginPrivate *d = nullptr;
}; };

View File

@@ -44,7 +44,7 @@
To make your wizard known to the system, add your IWizardFactory instance to the 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: plugin manager's object pool in your plugin's initialize function:
\code \code
bool MyPlugin::initialize(const QStringList &arguments, QString *errorString) void MyPlugin::initialize()
{ {
// ... do setup // ... do setup
addAutoReleasedObject(new MyWizardFactory); addAutoReleasedObject(new MyWizardFactory);

View File

@@ -116,14 +116,9 @@ CodePasterPlugin::~CodePasterPlugin()
delete d; delete d;
} }
bool CodePasterPlugin::initialize(const QStringList &arguments, QString *errorMessage) void CodePasterPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
d = new CodePasterPluginPrivate; d = new CodePasterPluginPrivate;
return true;
} }
CodePasterPluginPrivate::CodePasterPluginPrivate() CodePasterPluginPrivate::CodePasterPluginPrivate()

View File

@@ -43,7 +43,7 @@ public:
~CodePasterPlugin() final; ~CodePasterPlugin() final;
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
ShutdownFlag aboutToShutdown() final; ShutdownFlag aboutToShutdown() final;
CodePasterPluginPrivate *d = nullptr; CodePasterPluginPrivate *d = nullptr;

View File

@@ -133,11 +133,8 @@ CppcheckPlugin::CppcheckPlugin() = default;
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); d.reset(new CppcheckPluginPrivate);
using namespace Core; using namespace Core;
@@ -156,8 +153,6 @@ bool CppcheckPlugin::initialize(const QStringList &arguments, QString *errorStri
connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::runActionsUpdated, connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::runActionsUpdated,
d.get(), &CppcheckPluginPrivate::updateManualRunAction); d.get(), &CppcheckPluginPrivate::updateManualRunAction);
d->updateManualRunAction(); d->updateManualRunAction();
return true;
} }
} // Cppcheck::Internal } // Cppcheck::Internal

View File

@@ -21,7 +21,7 @@ public:
~CppcheckPlugin() override; ~CppcheckPlugin() override;
private: private:
bool initialize(const QStringList &arguments, QString *errorString) final; void initialize() final;
std::unique_ptr<CppcheckPluginPrivate> d; std::unique_ptr<CppcheckPluginPrivate> d;
}; };

View File

@@ -224,10 +224,8 @@ CppQuickFixAssistProvider *CppEditorPlugin::quickFixProvider() const
return &d->m_quickFixProvider; return &d->m_quickFixProvider;
} }
bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage) void CppEditorPlugin::initialize()
{ {
Q_UNUSED(errorMessage)
d = new CppEditorPluginPrivate; d = new CppEditorPluginPrivate;
d->initialize(); d->initialize();
@@ -465,8 +463,6 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err
d, &CppEditorPluginPrivate::onTaskStarted); d, &CppEditorPluginPrivate::onTaskStarted);
connect(ProgressManager::instance(), &ProgressManager::allTasksFinished, connect(ProgressManager::instance(), &ProgressManager::allTasksFinished,
d, &CppEditorPluginPrivate::onAllTasksFinished); d, &CppEditorPluginPrivate::onAllTasksFinished);
return true;
} }
void CppEditorPlugin::extensionsInitialized() void CppEditorPlugin::extensionsInitialized()

View File

@@ -53,7 +53,7 @@ signals:
void includeHierarchyRequested(); void includeHierarchyRequested();
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) override; void initialize() override;
void extensionsInitialized() override; void extensionsInitialized() override;
QVector<QObject *> createTestObjects() const override; QVector<QObject *> createTestObjects() const override;

View File

@@ -1,5 +1,6 @@
// Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company, // 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 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "ctfvisualizerplugin.h" #include "ctfvisualizerplugin.h"
#include "ctfvisualizertool.h" #include "ctfvisualizertool.h"
@@ -18,13 +19,9 @@ CtfVisualizerPlugin::~CtfVisualizerPlugin()
delete d; delete d;
} }
bool CtfVisualizerPlugin::initialize(const QStringList &arguments, QString *errorString) void CtfVisualizerPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
d = new CtfVisualizerPluginPrivate; d = new CtfVisualizerPluginPrivate;
return true;
} }
} // namespace Internal } // namespace Internal

View File

@@ -16,7 +16,7 @@ class CtfVisualizerPlugin : public ExtensionSystem::IPlugin
public: public:
~CtfVisualizerPlugin(); ~CtfVisualizerPlugin();
bool initialize(const QStringList &arguments, QString *errorString) final; void initialize() final;
class CtfVisualizerPluginPrivate *d = nullptr; class CtfVisualizerPluginPrivate *d = nullptr;
}; };

View File

@@ -480,12 +480,9 @@ CvsPlugin::~CvsPlugin()
dd = nullptr; dd = nullptr;
} }
bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage) void CvsPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
dd = new CvsPluginPrivate; dd = new CvsPluginPrivate;
return true;
} }
void CvsPlugin::extensionsInitialized() void CvsPlugin::extensionsInitialized()

View File

@@ -14,7 +14,7 @@ class CvsPlugin final : public ExtensionSystem::IPlugin
~CvsPlugin() final; ~CvsPlugin() final;
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
#ifdef WITH_TESTS #ifdef WITH_TESTS

View File

@@ -57,10 +57,8 @@ FormEditorPlugin::~FormEditorPlugin()
delete d; delete d;
} }
bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error) void FormEditorPlugin::initialize()
{ {
Q_UNUSED(arguments)
d = new FormEditorPluginPrivate; d = new FormEditorPluginPrivate;
#ifdef CPP_ENABLED #ifdef CPP_ENABLED
@@ -91,8 +89,6 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
if (qtr->load(trFile, qtTrPath) || qtr->load(trFile, creatorTrPath)) if (qtr->load(trFile, qtTrPath) || qtr->load(trFile, creatorTrPath))
QCoreApplication::installTranslator(qtr); QCoreApplication::installTranslator(qtr);
} }
error->clear();
return true;
} }
void FormEditorPlugin::extensionsInitialized() void FormEditorPlugin::extensionsInitialized()

View File

@@ -24,7 +24,7 @@ private slots:
#endif #endif
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage = nullptr) override; void initialize() override;
void extensionsInitialized() override; void extensionsInitialized() override;
void switchSourceForm(); void switchSourceForm();

View File

@@ -524,14 +524,9 @@ DiffEditorPlugin::~DiffEditorPlugin()
s_instance = nullptr; s_instance = nullptr;
} }
bool DiffEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage) void DiffEditorPlugin::initialize()
{ {
d = new DiffEditorPluginPrivate; d = new DiffEditorPluginPrivate;
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
return true;
} }
FutureSynchronizer *DiffEditorPlugin::futureSynchronizer() FutureSynchronizer *DiffEditorPlugin::futureSynchronizer()

View File

@@ -32,7 +32,7 @@ public:
DiffEditorPlugin(); DiffEditorPlugin();
~DiffEditorPlugin(); ~DiffEditorPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
static Utils::FutureSynchronizer *futureSynchronizer(); static Utils::FutureSynchronizer *futureSynchronizer();

View File

@@ -53,14 +53,9 @@ DockerPlugin::~DockerPlugin()
delete d; delete d;
} }
bool DockerPlugin::initialize(const QStringList &arguments, QString *errorString) void DockerPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
d = new DockerPluginPrivate; d = new DockerPluginPrivate;
return true;
} }
} // Docker::Interanl } // Docker::Interanl

View File

@@ -24,7 +24,7 @@ public:
private: private:
~DockerPlugin() final; ~DockerPlugin() final;
bool initialize(const QStringList &arguments, QString *errorString) final; void initialize() final;
class DockerPluginPrivate *d = nullptr; class DockerPluginPrivate *d = nullptr;
}; };

View File

@@ -69,11 +69,8 @@ EmacsKeysPlugin::EmacsKeysPlugin() = default;
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 // 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 // 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), // 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")); &EmacsKeysPlugin::scrollHalfDown, tr("Scroll Half Screen Down"));
registerAction(Constants::SCROLL_HALF_UP, registerAction(Constants::SCROLL_HALF_UP,
&EmacsKeysPlugin::scrollHalfUp, tr("Scroll Half Screen Up")); &EmacsKeysPlugin::scrollHalfUp, tr("Scroll Half Screen Up"));
return true;
} }
void EmacsKeysPlugin::extensionsInitialized() void EmacsKeysPlugin::extensionsInitialized()

View File

@@ -55,7 +55,7 @@ public:
EmacsKeysPlugin(); EmacsKeysPlugin();
~EmacsKeysPlugin() override; ~EmacsKeysPlugin() override;
bool initialize(const QStringList &arguments, QString *errorString) override; void initialize() override;
void extensionsInitialized() override; void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override; ShutdownFlag aboutToShutdown() override;

View File

@@ -499,7 +499,7 @@ class FakeVimPluginPrivate : public QObject
public: public:
FakeVimPluginPrivate(); FakeVimPluginPrivate();
bool initialize(); void initialize();
void editorOpened(Core::IEditor *); void editorOpened(Core::IEditor *);
void editorAboutToClose(Core::IEditor *); void editorAboutToClose(Core::IEditor *);
@@ -1155,7 +1155,7 @@ FakeVimPluginPrivate::FakeVimPluginPrivate()
} }
} }
bool FakeVimPluginPrivate::initialize() void FakeVimPluginPrivate::initialize()
{ {
runData = new FakeVimPluginRunData; runData = new FakeVimPluginRunData;
/* /*
@@ -1230,8 +1230,6 @@ bool FakeVimPluginPrivate::initialize()
this, &FakeVimPluginPrivate::handleDelayedQuitAll, Qt::QueuedConnection); this, &FakeVimPluginPrivate::handleDelayedQuitAll, Qt::QueuedConnection);
setCursorBlinking(s.blinkingCursor.value()); setCursorBlinking(s.blinkingCursor.value());
return true;
} }
void FakeVimPluginPrivate::userActionTriggered(int key) void FakeVimPluginPrivate::userActionTriggered(int key)
@@ -2138,11 +2136,9 @@ FakeVimPlugin::~FakeVimPlugin()
dd = nullptr; dd = nullptr;
} }
bool FakeVimPlugin::initialize(const QStringList &arguments, QString *errorMessage) void FakeVimPlugin::initialize()
{ {
Q_UNUSED(arguments) dd->initialize();
Q_UNUSED(errorMessage)
return dd->initialize();
} }
ExtensionSystem::IPlugin::ShutdownFlag FakeVimPlugin::aboutToShutdown() ExtensionSystem::IPlugin::ShutdownFlag FakeVimPlugin::aboutToShutdown()

View File

@@ -21,7 +21,7 @@ public:
private: private:
// implementation of ExtensionSystem::IPlugin // implementation of ExtensionSystem::IPlugin
bool initialize(const QStringList &arguments, QString *errorMessage) override; void initialize() override;
ShutdownFlag aboutToShutdown() override; ShutdownFlag aboutToShutdown() override;
void extensionsInitialized() override; void extensionsInitialized() override;

View File

@@ -54,10 +54,9 @@ GenericProjectPlugin::~GenericProjectPlugin()
delete d; delete d;
} }
bool GenericProjectPlugin::initialize(const QStringList &, QString *) void GenericProjectPlugin::initialize()
{ {
d = new GenericProjectPluginPrivate; d = new GenericProjectPluginPrivate;
return true;
} }
GenericProjectPluginPrivate::GenericProjectPluginPrivate() GenericProjectPluginPrivate::GenericProjectPluginPrivate()

View File

@@ -17,7 +17,7 @@ public:
~GenericProjectPlugin() override; ~GenericProjectPlugin() override;
private: private:
bool initialize(const QStringList &arguments, QString *errorString) override; void initialize() override;
void extensionsInitialized() override { } void extensionsInitialized() override { }
class GenericProjectPluginPrivate *d = nullptr; class GenericProjectPluginPrivate *d = nullptr;

View File

@@ -67,7 +67,7 @@ GitLabPlugin::~GitLabPlugin()
dd = nullptr; dd = nullptr;
} }
bool GitLabPlugin::initialize(const QStringList & /*arguments*/, QString * /*errorString*/) void GitLabPlugin::initialize()
{ {
dd = new GitLabPluginPrivate; dd = new GitLabPluginPrivate;
dd->parameters.fromSettings(Core::ICore::settings()); dd->parameters.fromSettings(Core::ICore::settings());
@@ -91,7 +91,6 @@ bool GitLabPlugin::initialize(const QStringList & /*arguments*/, QString * /*err
connect(ProjectExplorer::SessionManager::instance(), connect(ProjectExplorer::SessionManager::instance(),
&ProjectExplorer::SessionManager::startupProjectChanged, &ProjectExplorer::SessionManager::startupProjectChanged,
this, &GitLabPlugin::onStartupProjectChanged); this, &GitLabPlugin::onStartupProjectChanged);
return true;
} }
void GitLabPlugin::openView() void GitLabPlugin::openView()

View File

@@ -24,7 +24,7 @@ public:
GitLabPlugin(); GitLabPlugin();
~GitLabPlugin() override; ~GitLabPlugin() override;
bool initialize(const QStringList &arguments, QString *errorString) override; void initialize() override;
static QList<GitLabServer> allGitLabServers(); static QList<GitLabServer> allGitLabServers();
static GitLabServer gitLabServerForId(const Utils::Id &id); static GitLabServer gitLabServerForId(const Utils::Id &id);

View File

@@ -92,7 +92,7 @@ GlslEditorPlugin::~GlslEditorPlugin()
dd = nullptr; dd = nullptr;
} }
bool GlslEditorPlugin::initialize(const QStringList &, QString *) void GlslEditorPlugin::initialize()
{ {
dd = new GlslEditorPluginPrivate; dd = new GlslEditorPluginPrivate;
@@ -111,8 +111,6 @@ bool GlslEditorPlugin::initialize(const QStringList &, QString *)
Command *cmd = ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION); Command *cmd = ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION);
contextMenu->addAction(cmd); contextMenu->addAction(cmd);
return true;
} }
void GlslEditorPlugin::extensionsInitialized() void GlslEditorPlugin::extensionsInitialized()

View File

@@ -40,7 +40,7 @@ public:
static const InitFile *shaderInit(int variant); static const InitFile *shaderInit(int variant);
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
}; };

View File

@@ -158,12 +158,9 @@ void HelpPlugin::showHelpUrl(const QUrl &url, Core::HelpManager::HelpViewerLocat
dd->showHelpUrl(url, location); dd->showHelpUrl(url, location);
} }
bool HelpPlugin::initialize(const QStringList &arguments, QString *error) void HelpPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(error)
dd = new HelpPluginPrivate; dd = new HelpPluginPrivate;
return true;
} }
HelpPluginPrivate::HelpPluginPrivate() HelpPluginPrivate::HelpPluginPrivate()

View File

@@ -30,7 +30,7 @@ public:
static HelpWidget *modeHelpWidget(); static HelpWidget *modeHelpWidget();
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
bool delayedInitialize() final; bool delayedInitialize() final;
ShutdownFlag aboutToShutdown() final; ShutdownFlag aboutToShutdown() final;

View File

@@ -114,14 +114,9 @@ ImageViewerPlugin::~ImageViewerPlugin()
delete d; delete d;
} }
bool ImageViewerPlugin::initialize(const QStringList &arguments, QString *errorMessage) void ImageViewerPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
d = new ImageViewerPluginPrivate; d = new ImageViewerPluginPrivate;
return true;
} }
} // ImageViewer::Internal } // ImageViewer::Internal

View File

@@ -18,7 +18,7 @@ public:
~ImageViewerPlugin(); ~ImageViewerPlugin();
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
class ImageViewerPluginPrivate *d = nullptr; class ImageViewerPluginPrivate *d = nullptr;
}; };

View File

@@ -20,14 +20,9 @@ IncrediBuildPlugin::~IncrediBuildPlugin()
delete d; delete d;
} }
bool IncrediBuildPlugin::initialize(const QStringList &arguments, QString *errorString) void IncrediBuildPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
d = new IncrediBuildPluginPrivate; d = new IncrediBuildPluginPrivate;
return true;
} }
} // IncrediBuild::Internal } // IncrediBuild::Internal

View File

@@ -16,7 +16,7 @@ public:
IncrediBuildPlugin() = default; IncrediBuildPlugin() = default;
~IncrediBuildPlugin() final; ~IncrediBuildPlugin() final;
bool initialize(const QStringList &arguments, QString *errorString) final; void initialize() final;
private: private:
class IncrediBuildPluginPrivate *d = nullptr; class IncrediBuildPluginPrivate *d = nullptr;

View File

@@ -67,18 +67,13 @@ IosPlugin::~IosPlugin()
delete d; 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"); qRegisterMetaType<Ios::IosToolHandler::Dict>("Ios::IosToolHandler::Dict");
IosConfigurations::initialize(); IosConfigurations::initialize();
d = new IosPluginPrivate; d = new IosPluginPrivate;
return true;
} }
} // Internal::Ios } // Internal::Ios

View File

@@ -17,7 +17,7 @@ public:
~IosPlugin() final; ~IosPlugin() final;
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
class IosPluginPrivate *d = nullptr; class IosPluginPrivate *d = nullptr;
}; };

View File

@@ -33,7 +33,7 @@ LanguageClientPlugin *LanguageClientPlugin::instance()
return m_instance; return m_instance;
} }
bool LanguageClientPlugin::initialize(const QStringList & /*arguments*/, QString * /*errorString*/) void LanguageClientPlugin::initialize()
{ {
using namespace Core; using namespace Core;
@@ -50,8 +50,6 @@ bool LanguageClientPlugin::initialize(const QStringList & /*arguments*/, QString
connect(inspectAction, &QAction::triggered, this, &LanguageClientManager::showInspector); connect(inspectAction, &QAction::triggered, this, &LanguageClientManager::showInspector);
toolsDebugContainer->addAction( toolsDebugContainer->addAction(
ActionManager::registerAction(inspectAction, "LanguageClient.InspectLanguageClients")); ActionManager::registerAction(inspectAction, "LanguageClient.InspectLanguageClients"));
return true;
} }
void LanguageClientPlugin::extensionsInitialized() void LanguageClientPlugin::extensionsInitialized()

View File

@@ -22,7 +22,7 @@ public:
// IPlugin interface // IPlugin interface
private: private:
bool initialize(const QStringList &arguments, QString *errorString) override; void initialize() override;
void extensionsInitialized() override; void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override; ShutdownFlag aboutToShutdown() override;

View File

@@ -38,11 +38,8 @@ MacrosPlugin::~MacrosPlugin()
delete d; delete d;
} }
bool MacrosPlugin::initialize(const QStringList &arguments, QString *errorMessage) void MacrosPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
d = new MacrosPluginPrivate; d = new MacrosPluginPrivate;
Core::Context textContext(TextEditor::Constants::C_TEXTEDITOR); 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); command = Core::ActionManager::registerAction(saveLastMacro, Constants::SAVE_LAST_MACRO, textContext);
mmacrotools->addAction(command); mmacrotools->addAction(command);
connect(saveLastMacro, &QAction::triggered, &d->macroManager, &MacroManager::saveLastMacro); connect(saveLastMacro, &QAction::triggered, &d->macroManager, &MacroManager::saveLastMacro);
return true;
} }
} // Internal } // Internal
} // Macros } // Macros

View File

@@ -16,7 +16,7 @@ class MacrosPlugin final : public ExtensionSystem::IPlugin
public: public:
~MacrosPlugin() final; ~MacrosPlugin() final;
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
private: private:
class MacrosPluginPrivate *d = nullptr; class MacrosPluginPrivate *d = nullptr;

View File

@@ -68,19 +68,14 @@ McuSupportPlugin::~McuSupportPlugin()
dd = nullptr; dd = nullptr;
} }
bool McuSupportPlugin::initialize(const QStringList &arguments, QString *errorString) void McuSupportPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
setObjectName("McuSupportPlugin"); setObjectName("McuSupportPlugin");
dd = new McuSupportPluginPrivate; dd = new McuSupportPluginPrivate;
dd->m_options.registerQchFiles(); dd->m_options.registerQchFiles();
dd->m_options.registerExamples(); dd->m_options.registerExamples();
ProjectExplorer::JsonWizardFactory::addWizardPath(":/mcusupport/wizards/"); ProjectExplorer::JsonWizardFactory::addWizardPath(":/mcusupport/wizards/");
return true;
} }
void McuSupportPlugin::extensionsInitialized() void McuSupportPlugin::extensionsInitialized()

View File

@@ -19,7 +19,7 @@ class McuSupportPlugin final : public ExtensionSystem::IPlugin
public: public:
~McuSupportPlugin() final; ~McuSupportPlugin() final;
bool initialize(const QStringList &arguments, QString *errorString) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
void askUserAboutMcuSupportKitsSetup(); void askUserAboutMcuSupportKitsSetup();

View File

@@ -226,10 +226,9 @@ MercurialPlugin::~MercurialPlugin()
dd = nullptr; dd = nullptr;
} }
bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString * /*errorMessage */) void MercurialPlugin::initialize()
{ {
dd = new MercurialPluginPrivate; dd = new MercurialPluginPrivate;
return true;
} }
void MercurialPlugin::extensionsInitialized() void MercurialPlugin::extensionsInitialized()

View File

@@ -14,7 +14,7 @@ class MercurialPlugin final : public ExtensionSystem::IPlugin
~MercurialPlugin() final; ~MercurialPlugin() final;
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
#ifdef WITH_TESTS #ifdef WITH_TESTS

View File

@@ -69,17 +69,14 @@ MesonProjectPlugin::~MesonProjectPlugin()
delete d; delete d;
} }
bool MesonProjectPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage) void MesonProjectPlugin::initialize()
{ {
Q_UNUSED(errorMessage)
d = new MesonProjectPluginPrivate; d = new MesonProjectPluginPrivate;
ProjectManager::registerProjectType<MesonProject>(Constants::Project::MIMETYPE); ProjectManager::registerProjectType<MesonProject>(Constants::Project::MIMETYPE);
FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson.build"); FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson.build");
FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson_options.txt"); FileIconProvider::registerIconOverlayForFilename(Constants::Icons::MESON, "meson_options.txt");
Settings::instance()->readSettings(ICore::settings()); Settings::instance()->readSettings(ICore::settings());
return true;
} }
} // MesonProjectManager::Internal } // MesonProjectManager::Internal

View File

@@ -17,7 +17,7 @@ public:
~MesonProjectPlugin() final; ~MesonProjectPlugin() final;
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
class MesonProjectPluginPrivate *d = nullptr; class MesonProjectPluginPrivate *d = nullptr;
}; };

View File

@@ -58,10 +58,8 @@ ModelEditorPlugin::~ModelEditorPlugin()
delete d; delete d;
} }
bool ModelEditorPlugin::initialize(const QStringList &arguments, QString *errorString) void ModelEditorPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
d = new ModelEditorPluginPrivate; d = new ModelEditorPluginPrivate;
Core::JsExpander::registerGlobalObject<JsExtension>("Modeling"); Core::JsExpander::registerGlobalObject<JsExtension>("Modeling");
@@ -70,8 +68,6 @@ bool ModelEditorPlugin::initialize(const QStringList &arguments, QString *errorS
&d->uiController, &UiController::saveSettings); &d->uiController, &UiController::saveSettings);
connect(&d->settingsController, &SettingsController::loadSettings, connect(&d->settingsController, &SettingsController::loadSettings,
&d->uiController, &UiController::loadSettings); &d->uiController, &UiController::loadSettings);
return true;
} }
void ModelEditorPlugin::extensionsInitialized() void ModelEditorPlugin::extensionsInitialized()

View File

@@ -19,7 +19,7 @@ public:
ModelEditorPlugin(); ModelEditorPlugin();
~ModelEditorPlugin(); ~ModelEditorPlugin();
bool initialize(const QStringList &arguments, QString *errorString) override; void initialize() override;
void extensionsInitialized() override; void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override; ShutdownFlag aboutToShutdown() override;

View File

@@ -1690,11 +1690,9 @@ PerforcePlugin::~PerforcePlugin()
dd = nullptr; dd = nullptr;
} }
bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *errorMessage) void PerforcePlugin::initialize()
{ {
Q_UNUSED(errorMessage)
dd = new PerforcePluginPrivate; dd = new PerforcePluginPrivate;
return true;
} }
#ifdef WITH_TESTS #ifdef WITH_TESTS

View File

@@ -14,7 +14,7 @@ class PerforcePlugin final : public ExtensionSystem::IPlugin
~PerforcePlugin() final; ~PerforcePlugin() final;
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
public: public:

View File

@@ -55,13 +55,9 @@ PerfProfilerPlugin::~PerfProfilerPlugin()
delete d; delete d;
} }
bool PerfProfilerPlugin::initialize(const QStringList &arguments, QString *errorString) void PerfProfilerPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
d = new PerfProfilerPluginPrivate; d = new PerfProfilerPluginPrivate;
return true;
} }
PerfSettings *PerfProfilerPlugin::globalSettings() PerfSettings *PerfProfilerPlugin::globalSettings()

View File

@@ -17,7 +17,7 @@ class PerfProfilerPlugin : public ExtensionSystem::IPlugin
public: public:
~PerfProfilerPlugin(); ~PerfProfilerPlugin();
bool initialize(const QStringList &arguments, QString *errorString) final; void initialize() final;
QVector<QObject *> createTestObjects() const final; QVector<QObject *> createTestObjects() const final;
static PerfSettings *globalSettings(); static PerfSettings *globalSettings();

View File

@@ -52,16 +52,11 @@ PythonPlugin *PythonPlugin::instance()
return m_instance; return m_instance;
} }
bool PythonPlugin::initialize(const QStringList &arguments, QString *errorMessage) void PythonPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
d = new PythonPluginPrivate; d = new PythonPluginPrivate;
ProjectManager::registerProjectType<PythonProject>(PythonMimeType); ProjectManager::registerProjectType<PythonProject>(PythonMimeType);
return true;
} }
void PythonPlugin::extensionsInitialized() void PythonPlugin::extensionsInitialized()

View File

@@ -19,7 +19,7 @@ public:
static PythonPlugin *instance(); static PythonPlugin *instance();
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
class PythonPluginPrivate *d = nullptr; class PythonPluginPrivate *d = nullptr;

View File

@@ -81,11 +81,8 @@ QbsProjectManagerPlugin::~QbsProjectManagerPlugin()
delete d; delete d;
} }
bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage) void QbsProjectManagerPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
d = new QbsProjectManagerPluginPrivate; d = new QbsProjectManagerPluginPrivate;
const Core::Context projectContext(::QbsProjectManager::Constants::PROJECT_ID); const Core::Context projectContext(::QbsProjectManager::Constants::PROJECT_ID);
@@ -248,8 +245,6 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
updateContextActions(ProjectTree::currentNode()); updateContextActions(ProjectTree::currentNode());
updateReparseQbsAction(); updateReparseQbsAction();
updateBuildActions(); updateBuildActions();
return true;
} }
void QbsProjectManagerPlugin::targetWasAdded(Target *target) void QbsProjectManagerPlugin::targetWasAdded(Target *target)

View File

@@ -29,7 +29,7 @@ public:
private: private:
~QbsProjectManagerPlugin() final; ~QbsProjectManagerPlugin() final;
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void targetWasAdded(ProjectExplorer::Target *target); void targetWasAdded(ProjectExplorer::Target *target);
void projectChanged(QbsProject *project); void projectChanged(QbsProject *project);

View File

@@ -128,10 +128,8 @@ QmakeProjectManagerPlugin::~QmakeProjectManagerPlugin()
delete d; 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); const Context projectContext(QmakeProjectManager::Constants::QMAKEPROJECT_ID);
Context projectTreeContext(ProjectExplorer::Constants::C_PROJECT_TREE); Context projectTreeContext(ProjectExplorer::Constants::C_PROJECT_TREE);
@@ -291,8 +289,6 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString
d, &QmakeProjectManagerPluginPrivate::updateBuildFileAction); d, &QmakeProjectManagerPluginPrivate::updateBuildFileAction);
d->updateActions(); d->updateActions();
return true;
} }
QmakeProjectManagerPluginPrivate::~QmakeProjectManagerPluginPrivate() QmakeProjectManagerPluginPrivate::~QmakeProjectManagerPluginPrivate()

View File

@@ -25,7 +25,7 @@ private slots:
#endif #endif
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
class QmakeProjectManagerPluginPrivate *d = nullptr; class QmakeProjectManagerPluginPrivate *d = nullptr;
}; };

View File

@@ -101,14 +101,9 @@ QmlJSEditorPlugin::~QmlJSEditorPlugin()
m_instance = nullptr; m_instance = nullptr;
} }
bool QmlJSEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage) void QmlJSEditorPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
d = new QmlJSEditorPluginPrivate; d = new QmlJSEditorPluginPrivate;
return true;
} }
QmlJSEditorPluginPrivate::QmlJSEditorPluginPrivate() QmlJSEditorPluginPrivate::QmlJSEditorPluginPrivate()

View File

@@ -27,7 +27,7 @@ public:
static QuickToolBar *quickToolBar(); static QuickToolBar *quickToolBar();
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
ShutdownFlag aboutToShutdown() final; ShutdownFlag aboutToShutdown() final;

View File

@@ -48,14 +48,9 @@ QmlJSToolsPlugin::~QmlJSToolsPlugin()
delete d; delete d;
} }
bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error) void QmlJSToolsPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(error)
d = new QmlJSToolsPluginPrivate; d = new QmlJSToolsPluginPrivate;
return true;
} }
QmlJSToolsPluginPrivate::QmlJSToolsPluginPrivate() QmlJSToolsPluginPrivate::QmlJSToolsPluginPrivate()

View File

@@ -17,7 +17,7 @@ public:
~QmlJSToolsPlugin() final; ~QmlJSToolsPlugin() final;
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; void initialize() final;
void extensionsInitialized() final; void extensionsInitialized() final;
class QmlJSToolsPluginPrivate *d = nullptr; class QmlJSToolsPluginPrivate *d = nullptr;

View File

@@ -198,14 +198,9 @@ QmlPreviewPlugin::~QmlPreviewPlugin()
delete d; delete d;
} }
bool QmlPreviewPlugin::initialize(const QStringList &arguments, QString *errorString) void QmlPreviewPlugin::initialize()
{ {
Q_UNUSED(arguments)
Q_UNUSED(errorString)
d = new QmlPreviewPluginPrivate(this); d = new QmlPreviewPluginPrivate(this);
return true;
} }
ExtensionSystem::IPlugin::ShutdownFlag QmlPreviewPlugin::aboutToShutdown() ExtensionSystem::IPlugin::ShutdownFlag QmlPreviewPlugin::aboutToShutdown()

View File

@@ -48,7 +48,7 @@ class QMLPREVIEW_EXPORT QmlPreviewPlugin : public ExtensionSystem::IPlugin
public: public:
~QmlPreviewPlugin() override; ~QmlPreviewPlugin() override;
bool initialize(const QStringList &arguments, QString *errorString) override; void initialize() override;
ShutdownFlag aboutToShutdown() override; ShutdownFlag aboutToShutdown() override;
QVector<QObject *> createTestObjects() const override; QVector<QObject *> createTestObjects() const override;

Some files were not shown because too many files have changed in this diff Show More