yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kcmkwin/deco] Only specify QStringLiteral("Normal") once

Browse source
This commit is contained in:
Martin Gräßlin 2014-12-04 17:41:18 +01:00
parent dc9437e59a
commit 6b7fd5b9bc
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kcmkwin/kwindecoration/kcm.cpp
View file

@ -48,6 +48,7 @@ namespace Configuration
{ {
static const QString s_pluginName = QStringLiteral("org.kde.kdecoration2"); static const QString s_pluginName = QStringLiteral("org.kde.kdecoration2");
static const QString s_defaultPlugin = QStringLiteral("org.kde.breeze"); static const QString s_defaultPlugin = QStringLiteral("org.kde.breeze");
static const QString s_borderSizeNormal = QStringLiteral("Normal");
ConfigurationForm::ConfigurationForm(QWidget *parent) ConfigurationForm::ConfigurationForm(QWidget *parent)
: QWidget(parent) : QWidget(parent)
@ -127,7 +128,7 @@ static const QMap<QString, KDecoration2::BorderSize> s_sizes = QMap<QString, KDe
{QStringLiteral("None"), BorderSize::None}, {QStringLiteral("None"), BorderSize::None},
{QStringLiteral("NoSides"), BorderSize::NoSides}, {QStringLiteral("NoSides"), BorderSize::NoSides},
{QStringLiteral("Tiny"), BorderSize::Tiny}, {QStringLiteral("Tiny"), BorderSize::Tiny},
{QStringLiteral("Normal"), BorderSize::Normal}, {s_borderSizeNormal, BorderSize::Normal},
{QStringLiteral("Large"), BorderSize::Large}, {QStringLiteral("Large"), BorderSize::Large},
{QStringLiteral("VeryLarge"), BorderSize::VeryLarge}, {QStringLiteral("VeryLarge"), BorderSize::VeryLarge},
{QStringLiteral("Huge"), BorderSize::Huge}, {QStringLiteral("Huge"), BorderSize::Huge},
@ -147,7 +148,7 @@ static BorderSize stringToSize(const QString &name)
static QString sizeToString(BorderSize size) static QString sizeToString(BorderSize size)
{ {
return s_sizes.key(size, QStringLiteral("Normal")); return s_sizes.key(size, s_borderSizeNormal);
} }
void ConfigurationModule::load() void ConfigurationModule::load()
@ -161,7 +162,7 @@ void ConfigurationModule::load()
listView->setProperty("currentIndex", index.isValid() ? index.row() : -1); listView->setProperty("currentIndex", index.isValid() ? index.row() : -1);
} }
m_ui->closeWindowsDoubleClick->setChecked(config.readEntry("CloseOnDoubleClickOnMenu", false)); m_ui->closeWindowsDoubleClick->setChecked(config.readEntry("CloseOnDoubleClickOnMenu", false));
const QVariant border = QVariant::fromValue(stringToSize(config.readEntry("BorderSize", QStringLiteral("Normal")))); const QVariant border = QVariant::fromValue(stringToSize(config.readEntry("BorderSize", s_borderSizeNormal)));
m_ui->borderSizesCombo->setCurrentIndex(m_ui->borderSizesCombo->findData(border)); m_ui->borderSizesCombo->setCurrentIndex(m_ui->borderSizesCombo->findData(border));
KCModule::load(); KCModule::load();
s_loading = false; s_loading = false;