SettingsDialog: Remove CategoryId parameter from callers

PageIds are supposed to be unique, so the CategoryId can be determined
from the PageId. Look for PageIds in the already expanded categories
first before searching through expensive categories.

Change-Id: I006beb0df6183453163ac1810fe59a306a0f52b1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2015-02-23 11:07:38 +01:00
parent 655eed467e
commit 592ffe7377
33 changed files with 87 additions and 134 deletions

View File

@@ -337,9 +337,9 @@ void ICore::showNewItemDialog(const QString &title,
m_mainwindow->showNewItemDialog(title, factories, defaultLocation, extraVariables);
}
bool ICore::showOptionsDialog(const Id group, const Id page, QWidget *parent)
bool ICore::showOptionsDialog(const Id page, QWidget *parent)
{
return m_mainwindow->showOptionsDialog(group, page, parent);
return m_mainwindow->showOptionsDialog(page, parent);
}
QString ICore::msgShowOptionsDialog()
@@ -358,14 +358,9 @@ QString ICore::msgShowOptionsDialogToolTip()
}
bool ICore::showWarningWithOptions(const QString &title, const QString &text,
const QString &details,
Id settingsCategory,
Id settingsId,
QWidget *parent)
const QString &details, Id settingsId, QWidget *parent)
{
return m_mainwindow->showWarningWithOptions(title, text,
details, settingsCategory,
settingsId, parent);
return m_mainwindow->showWarningWithOptions(title, text, details, settingsId, parent);
}
QSettings *ICore::settings(QSettings::Scope scope)