diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 65f6abe48d4..a8d1a4ee64b 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -144,12 +144,10 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) m_mainWindow->setOverrideColor(args.overrideColor); m_locator = new Locator; qsrand(QDateTime::currentDateTime().toTime_t()); - const bool success = m_mainWindow->init(errorMessage); - if (success) { - m_editMode = new EditMode; - ModeManager::activateMode(m_editMode->id()); - InfoBar::initialize(ICore::settings(), creatorTheme()); - } + m_mainWindow->init(); + m_editMode = new EditMode; + ModeManager::activateMode(m_editMode->id()); + InfoBar::initialize(ICore::settings(), creatorTheme()); IWizardFactory::initialize(); @@ -204,7 +202,7 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) Utils::PathChooser::setAboutToShowContextMenuHandler(&CorePlugin::addToPathChooserContextMenu); - return success; + return true; } void CorePlugin::extensionsInitialized() diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index e7fa756245a..9699b7a9669 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -288,13 +288,10 @@ MainWindow::~MainWindow() m_jsExpander = nullptr; } -bool MainWindow::init(QString *errorMessage) +void MainWindow::init() { - Q_UNUSED(errorMessage) - m_progressManager->init(); // needs the status bar manager MessageManager::init(); - return true; } void MainWindow::extensionsInitialized() diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 52d46b092db..be3af9958b8 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -78,7 +78,7 @@ public: MainWindow(); ~MainWindow(); - bool init(QString *errorMessage); + void init(); void extensionsInitialized(); void aboutToShutdown();