diff options
author | hjk <hjk@qt.io> | 2018-01-31 10:59:41 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-02-12 11:21:14 +0000 |
commit | 310a2bf96f7965bc1b2848edd77cdb44614254a1 (patch) | |
tree | 353a5983d1c32af6e1db218f6cfdb40874d3a723 | |
parent | 56e8752a29f522a0225b4d69c0b9fce47b978c04 (diff) | |
download | qt-creator-310a2bf96f7965bc1b2848edd77cdb44614254a1.tar.gz |
Core: Simplify MainWindow::init() signature
And adapt its only user.
Change-Id: Ifc1f6c7857951d6e1a68f5bc909146e9689c5428
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r-- | src/plugins/coreplugin/coreplugin.cpp | 12 | ||||
-rw-r--r-- | src/plugins/coreplugin/mainwindow.cpp | 5 | ||||
-rw-r--r-- | src/plugins/coreplugin/mainwindow.h | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 65f6abe48d..a8d1a4ee64 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 e7fa756245..9699b7a966 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 52d46b092d..be3af9958b 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(); |