feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Skip calling set custom value if nothing has changed.

Browse Source 
The call will trigger a setup of the local help manager,
which is rather heavy and should be avoided if possible.

Change-Id: I03fbe6a30fba6ac48361c7e2b5aa6d45dad5126b
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
This commit is contained in:
kh1
2012-05-24 16:19:44 +02:00
committed by Karsten Heimrich
parent 788772a23e
commit e1e65f6e56
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/help/generalsettingspage.cpp
View File

@@ -97,9 +97,9 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent)
} }
m_ui->homePageLineEdit->setText(m_homePage); m_ui->homePageLineEdit->setText(m_homePage);
const int startOption = manager->customValue(QLatin1String("StartOption"), m_startOption = manager->customValue(QLatin1String("StartOption"),
Help::Constants::ShowLastPages).toInt(); Help::Constants::ShowLastPages).toInt();
m_ui->helpStartComboBox->setCurrentIndex(startOption); m_ui->helpStartComboBox->setCurrentIndex(m_startOption);
m_contextOption = manager->customValue(QLatin1String("ContextHelpOption"), m_contextOption = manager->customValue(QLatin1String("ContextHelpOption"),
Help::Constants::SideBySideIfPossible).toInt(); Help::Constants::SideBySideIfPossible).toInt();
@@ -172,10 +172,16 @@ void GeneralSettingsPage::apply()
if (homePage.isEmpty()) if (homePage.isEmpty())
homePage = Help::Constants::AboutBlank; homePage = Help::Constants::AboutBlank;
m_ui->homePageLineEdit->setText(homePage); m_ui->homePageLineEdit->setText(homePage);
manager->setCustomValue(QLatin1String("HomePage"), homePage); if (m_homePage != homePage) {
m_homePage = homePage;
manager->setCustomValue(QLatin1String("HomePage"), homePage);
}
const int startOption = m_ui->helpStartComboBox->currentIndex(); const int startOption = m_ui->helpStartComboBox->currentIndex();
manager->setCustomValue(QLatin1String("StartOption"), startOption); if (m_startOption != startOption) {
m_startOption = startOption;
manager->setCustomValue(QLatin1String("StartOption"), startOption);
}
const int helpOption = m_ui->contextHelpComboBox->currentIndex(); const int helpOption = m_ui->contextHelpComboBox->currentIndex();
if (m_contextOption != helpOption) { if (m_contextOption != helpOption) {

1
src/plugins/help/generalsettingspage.h
View File

@@ -79,6 +79,7 @@ private:
QString m_homePage; QString m_homePage;
int m_contextOption; int m_contextOption;
int m_startOption;
bool m_returnOnClose; bool m_returnOnClose;
QString m_searchKeywords; QString m_searchKeywords;