Core: Simplify MainWindow::init() signature

And adapt its only user.

Change-Id: Ifc1f6c7857951d6e1a68f5bc909146e9689c5428
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2018-01-31 10:59:41 +01:00
parent 56e8752a29
commit 310a2bf96f
3 changed files with 7 additions and 12 deletions

View File

@@ -144,12 +144,10 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
m_mainWindow->setOverrideColor(args.overrideColor); m_mainWindow->setOverrideColor(args.overrideColor);
m_locator = new Locator; m_locator = new Locator;
qsrand(QDateTime::currentDateTime().toTime_t()); qsrand(QDateTime::currentDateTime().toTime_t());
const bool success = m_mainWindow->init(errorMessage); m_mainWindow->init();
if (success) {
m_editMode = new EditMode; m_editMode = new EditMode;
ModeManager::activateMode(m_editMode->id()); ModeManager::activateMode(m_editMode->id());
InfoBar::initialize(ICore::settings(), creatorTheme()); InfoBar::initialize(ICore::settings(), creatorTheme());
}
IWizardFactory::initialize(); IWizardFactory::initialize();
@@ -204,7 +202,7 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
Utils::PathChooser::setAboutToShowContextMenuHandler(&CorePlugin::addToPathChooserContextMenu); Utils::PathChooser::setAboutToShowContextMenuHandler(&CorePlugin::addToPathChooserContextMenu);
return success; return true;
} }
void CorePlugin::extensionsInitialized() void CorePlugin::extensionsInitialized()

View File

@@ -288,13 +288,10 @@ MainWindow::~MainWindow()
m_jsExpander = nullptr; m_jsExpander = nullptr;
} }
bool MainWindow::init(QString *errorMessage) void MainWindow::init()
{ {
Q_UNUSED(errorMessage)
m_progressManager->init(); // needs the status bar manager m_progressManager->init(); // needs the status bar manager
MessageManager::init(); MessageManager::init();
return true;
} }
void MainWindow::extensionsInitialized() void MainWindow::extensionsInitialized()

View File

@@ -78,7 +78,7 @@ public:
MainWindow(); MainWindow();
~MainWindow(); ~MainWindow();
bool init(QString *errorMessage); void init();
void extensionsInitialized(); void extensionsInitialized();
void aboutToShutdown(); void aboutToShutdown();