aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/coreplugin/icore.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-02-01 15:20:16 +0100
committerhjk <hjk@qt.io>2018-02-14 16:37:08 +0000
commit892546bd6a3ceec7d2a442af228591e5bfd53e83 (patch)
tree09c11aa16f8707bd172a6e109709698d0299f09e /src/plugins/coreplugin/icore.cpp
parent29a4419c075b199621269c2e17f02106d1657b45 (diff)
Core: Minimize directly accessible SettingsDialog interface
Only the getSettingsDialog + exec combination was ever used. Make that accessible by a free function, move everything else to settingdialog.cpp. Take the opportunity for some code cosmetics and remove a few indirections by using direct members instead of pointers where appropriate. Change-Id: I14bc47395a85045ab439d418da0bc459add844bb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/icore.cpp')
-rw-r--r--src/plugins/coreplugin/icore.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index d8adaa3f9e..359cb7012e 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -358,13 +358,7 @@ void ICore::showNewItemDialog(const QString &title,
bool ICore::showOptionsDialog(const Id page, QWidget *parent)
{
- // Make sure all wizards are there when the user might access the keyboard shortcuts:
- (void) IWizardFactory::allWizardFactories();
-
- if (!parent)
- parent = dialogParent();
- SettingsDialog *dialog = SettingsDialog::getSettingsDialog(parent, page);
- return dialog->execDialog();
+ return executeSettingsDialog(parent ? parent : dialogParent(), page);
}
QString ICore::msgShowOptionsDialog()