summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/themechooser.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2016-01-20 22:24:42 +0200
committerOrgad Shaneh <orgads@gmail.com>2016-01-21 08:04:11 +0000
commitb8cb222c0fa0a6f983c8fe24d7d3e6bfe81324a8 (patch)
treeb55bb755cad5fcb41bf30bd0e07330be9c3138f2 /src/plugins/coreplugin/themechooser.cpp
parent9d0d39495f5862000f3c8f21d386ea4ee52199cc (diff)
downloadqt-creator-b8cb222c0fa0a6f983c8fe24d7d3e6bfe81324a8.tar.gz
ThemeChooser: Remove an unneeded function and an unused variable
Change-Id: Ibd2addcabbf071cc76b3238300aab85763c235d3 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/coreplugin/themechooser.cpp')
-rw-r--r--src/plugins/coreplugin/themechooser.cpp23
1 files changed, 6 insertions, 17 deletions
diff --git a/src/plugins/coreplugin/themechooser.cpp b/src/plugins/coreplugin/themechooser.cpp
index fd97cfd815..ffb94438be 100644
--- a/src/plugins/coreplugin/themechooser.cpp
+++ b/src/plugins/coreplugin/themechooser.cpp
@@ -128,13 +128,11 @@ public:
public:
ThemeListModel *m_themeListModel;
QComboBox *m_themeComboBox;
- bool m_refreshingThemeList;
};
ThemeChooserPrivate::ThemeChooserPrivate(QWidget *widget)
: m_themeListModel(new ThemeListModel)
, m_themeComboBox(new QComboBox)
- , m_refreshingThemeList(false)
{
QHBoxLayout *layout = new QHBoxLayout(widget);
layout->addWidget(m_themeComboBox);
@@ -142,6 +140,12 @@ ThemeChooserPrivate::ThemeChooserPrivate(QWidget *widget)
auto horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
layout->addSpacerItem(horizontalSpacer);
m_themeComboBox->setModel(m_themeListModel);
+ const QList<ThemeEntry> themes = ThemeEntry::availableThemes();
+ const Id activeTheme = Id::fromString(creatorTheme()->id());
+ const int selected = Utils::indexOf(themes, Utils::equal(&ThemeEntry::id, activeTheme));
+ m_themeListModel->setThemes(themes);
+ if (selected >= 0)
+ m_themeComboBox->setCurrentIndex(selected);
}
ThemeChooserPrivate::~ThemeChooserPrivate()
@@ -153,8 +157,6 @@ ThemeChooser::ThemeChooser(QWidget *parent) :
QWidget(parent)
{
d = new ThemeChooserPrivate(this);
-
- refreshThemeList();
}
ThemeChooser::~ThemeChooser()
@@ -162,19 +164,6 @@ ThemeChooser::~ThemeChooser()
delete d;
}
-void ThemeChooser::refreshThemeList()
-{
- const QList<ThemeEntry> themes = ThemeEntry::availableThemes();
- const int selected = Utils::indexOf(themes, Utils::equal(&ThemeEntry::id,
- Id::fromString(creatorTheme()->id())));
-
- d->m_refreshingThemeList = true;
- d->m_themeListModel->setThemes(themes);
- if (selected >= 0)
- d->m_themeComboBox->setCurrentIndex(selected);
- d->m_refreshingThemeList = false;
-}
-
void ThemeChooser::apply()
{
const int index = d->m_themeComboBox->currentIndex();