bring bracket sanity to a wasteland of if statements

9 files changed, 229 insertions, 308 deletions

diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp
index 95f2c9b7..4d585409 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp
@@ -42,8 +42,7 @@ AppearancePage::AppearancePage(QWidget *parent) : TabPage(parent), m_ui(new Ui::
 }
 
 AppearancePage::~AppearancePage(){
-  if(m_selectedStyle)
-    delete m_selectedStyle;
+  if(m_selectedStyle){ delete m_selectedStyle; }
     delete m_ui;
     delete m_previewUi;
 }
@@ -59,13 +58,11 @@ void AppearancePage::writeSettings(){
 
 void AppearancePage::on_styleComboBox_activated(const QString &text){
   QStyle *style = QStyleFactory::create(text);
-  if(!style)
-    return;
-    setStyle(m_previewWidget, style);
-    if(m_selectedStyle)
-      delete m_selectedStyle;
-      m_selectedStyle = style;
-      updatePalette();
+  if(!style){ return; }
+  setStyle(m_previewWidget, style);
+  if(m_selectedStyle){ delete m_selectedStyle; }
+  m_selectedStyle = style;
+  updatePalette();
 }
 
 void AppearancePage::on_colorSchemeComboBox_activated(int){
@@ -75,94 +72,84 @@ void AppearancePage::on_colorSchemeComboBox_activated(int){
 
 void AppearancePage::createColorScheme(){
   QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"));
-  if(name.isEmpty())
+  if(name.isEmpty()){ return; }
+  if(!name.endsWith(".conf", Qt::CaseInsensitive)){ name.append(".conf"); }
+  if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){
+    QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0)));
     return;
-    if(!name.endsWith(".conf", Qt::CaseInsensitive))
-      name.append(".conf");
-      if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){
-        QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0)));
-        return;
-      }
-    QString schemePath = lthemeengine::userColorSchemePath() + "/" + name;
-    createColorScheme(schemePath, palette());
-    m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), schemePath);
+    }
+  QString schemePath = lthemeengine::userColorSchemePath() + "/" + name;
+  createColorScheme(schemePath, palette());
+  m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), schemePath);
 }
 
 void AppearancePage::changeColorScheme(){
-  if(m_ui->colorSchemeComboBox->currentIndex() < 0)
+  if(m_ui->colorSchemeComboBox->currentIndex() < 0){ return; }
+  if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){
+    QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText()));
     return;
-    if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){
-      QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText()));
-      return;
     }
-    PaletteEditDialog d(m_customPalette, m_selectedStyle, this);
-    connect(&d, SIGNAL(paletteChanged(QPalette)), SLOT(setPreviewPalette(QPalette)));
-    if(d.exec() == QDialog::Accepted){
-      m_customPalette = d.selectedPalette();
-      createColorScheme(m_ui->colorSchemeComboBox->currentData().toString(), m_customPalette);
+  PaletteEditDialog d(m_customPalette, m_selectedStyle, this);
+  connect(&d, SIGNAL(paletteChanged(QPalette)), SLOT(setPreviewPalette(QPalette)));
+  if(d.exec() == QDialog::Accepted){
+    m_customPalette = d.selectedPalette();
+    createColorScheme(m_ui->colorSchemeComboBox->currentData().toString(), m_customPalette);
     }
-    updatePalette();
+  updatePalette();
 }
 
 void AppearancePage::removeColorScheme(){
   int index = m_ui->colorSchemeComboBox->currentIndex();
-  if(index < 0 || m_ui->colorSchemeComboBox->count() <= 1)
+  if(index < 0 || m_ui->colorSchemeComboBox->count() <= 1){ return; }
+  if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){
+    QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText()));
     return;
-    if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){
-      QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText()));
-      return;
     }
-    int button = QMessageBox::question(this, tr("Confirm Remove"),tr("Are you sure you want to remove color scheme \"%1\"?").arg(m_ui->colorSchemeComboBox->currentText()), QMessageBox::Yes | QMessageBox::No);
-    if(button != QMessageBox::Yes)
-      return;
-      if(QFile::remove(m_ui->colorSchemeComboBox->currentData().toString())){
-        m_ui->colorSchemeComboBox->removeItem(index);
-        on_colorSchemeComboBox_activated(0);
-      }
+  int button = QMessageBox::question(this, tr("Confirm Remove"),tr("Are you sure you want to remove color scheme \"%1\"?").arg(m_ui->colorSchemeComboBox->currentText()), QMessageBox::Yes | QMessageBox::No);
+  if(button != QMessageBox::Yes){ return; }
+  if(QFile::remove(m_ui->colorSchemeComboBox->currentData().toString())){
+    m_ui->colorSchemeComboBox->removeItem(index);
+    on_colorSchemeComboBox_activated(0);
+    }
 }
 
 void AppearancePage::copyColorScheme(){
-  if(m_ui->colorSchemeComboBox->currentIndex() < 0)
+  if(m_ui->colorSchemeComboBox->currentIndex() < 0) { return; }
+  QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"),QLineEdit::Normal, tr("%1 (copy)").arg(m_ui->colorSchemeComboBox->currentText()));
+  if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText()){ return; }
+  if(!name.endsWith(".conf", Qt::CaseInsensitive)) { name.append(".conf"); }
+  if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){
+    QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0)));
     return;
-    QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"),QLineEdit::Normal, tr("%1 (copy)").arg(m_ui->colorSchemeComboBox->currentText()));
-    if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText())
-      return;
-      if(!name.endsWith(".conf", Qt::CaseInsensitive))name.append(".conf");
-        if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){
-          QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0)));
-          return;
-        }
-      QString newPath =  lthemeengine::userColorSchemePath() + "/" + name;
-     QFile::copy(m_ui->colorSchemeComboBox->currentData().toString(), newPath);
-     m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), newPath);
+    }
+  QString newPath =  lthemeengine::userColorSchemePath() + "/" + name;
+  QFile::copy(m_ui->colorSchemeComboBox->currentData().toString(), newPath);
+  m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), newPath);
 }
 
 void AppearancePage::renameColorScheme(){
   int index = m_ui->colorSchemeComboBox->currentIndex();
-    if(index < 0)
-      return;
-      if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){
-        QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText()));
-        return;
-      }
-      QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"), QLineEdit::Normal, m_ui->colorSchemeComboBox->currentText());
-      if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText())
-        return;
-        if(!name.endsWith(".conf", Qt::CaseInsensitive))name.append(".conf");
-          if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){
-            QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0)));
-            return;
-          }
-          QString newPath =  lthemeengine::userColorSchemePath() + "/" + name;
-          QFile::rename(m_ui->colorSchemeComboBox->currentData().toString(), newPath);
-          m_ui->colorSchemeComboBox->setItemText(index, name.section('.',0,0));
-          m_ui->colorSchemeComboBox->setItemData(index, newPath);
+  if(index < 0){ return; }
+  if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){
+    QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText()));
+    return;
+    }
+  QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"), QLineEdit::Normal, m_ui->colorSchemeComboBox->currentText());
+  if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText()){ return; }
+  if(!name.endsWith(".conf", Qt::CaseInsensitive)){ name.append(".conf"); }
+  if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){
+    QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0)));
+    return;
+    }
+  QString newPath =  lthemeengine::userColorSchemePath() + "/" + name;
+  QFile::rename(m_ui->colorSchemeComboBox->currentData().toString(), newPath);
+  m_ui->colorSchemeComboBox->setItemText(index, name.section('.',0,0));
+  m_ui->colorSchemeComboBox->setItemData(index, newPath);
 }
 
 void AppearancePage::updatePalette(){
-    if(!m_selectedStyle)
-      return;
-      setPreviewPalette(m_ui->customPaletteButton->isChecked() ? m_customPalette : m_selectedStyle->standardPalette());
+  if(!m_selectedStyle){ return; }
+  setPreviewPalette(m_ui->customPaletteButton->isChecked() ? m_customPalette : m_selectedStyle->standardPalette());
 }
 
 void AppearancePage::setPreviewPalette(const QPalette &p){
@@ -171,15 +158,15 @@ void AppearancePage::setPreviewPalette(const QPalette &p){
   if(m_ui->paletteComboBox->currentIndex() == 0){
     colorGroup = QPalette::Active;
     }
-    else if(m_ui->paletteComboBox->currentIndex() == 1){
-      colorGroup = QPalette::Inactive;
-      }
-    for (int i = 0; i < QPalette::NColorRoles; i++){
-      QPalette::ColorRole role = QPalette::ColorRole(i);
-       previewPalette.setColor(QPalette::Active, role, p.color(colorGroup, role));
-       previewPalette.setColor(QPalette::Inactive, role, p.color(colorGroup, role));
-       }
-     setPalette(m_ui->mdiArea, previewPalette);
+  else if(m_ui->paletteComboBox->currentIndex() == 1){
+    colorGroup = QPalette::Inactive;
+    }
+  for (int i = 0; i < QPalette::NColorRoles; i++){
+    QPalette::ColorRole role = QPalette::ColorRole(i);
+    previewPalette.setColor(QPalette::Active, role, p.color(colorGroup, role));
+    previewPalette.setColor(QPalette::Inactive, role, p.color(colorGroup, role));
+    }
+  setPalette(m_ui->mdiArea, previewPalette);
 }
 
 void AppearancePage::updateActions(){
@@ -188,11 +175,11 @@ void AppearancePage::updateActions(){
     m_renameColorSchemeAction->setVisible(false);
     m_removeColorSchemeAction->setVisible(false);
     }
-    else{
-      m_changeColorSchemeAction->setVisible(true);
-      m_renameColorSchemeAction->setVisible(true);
-      m_removeColorSchemeAction->setVisible(m_ui->colorSchemeComboBox->count() > 1);
-      }
+  else{
+    m_changeColorSchemeAction->setVisible(true);
+    m_renameColorSchemeAction->setVisible(true);
+    m_removeColorSchemeAction->setVisible(m_ui->colorSchemeComboBox->count() > 1);
+    }
 }
 
 void AppearancePage::readSettings(){
@@ -208,22 +195,22 @@ void AppearancePage::readSettings(){
   if(m_ui->colorSchemeComboBox->count() == 0){
     m_customPalette = palette(); //load fallback palette
     }
-    else{
-      int index = m_ui->colorSchemeComboBox->findData(colorSchemePath);
-      if(index >= 0)
-      m_ui->colorSchemeComboBox->setCurrentIndex(index);
-      m_customPalette = loadColorScheme(m_ui->colorSchemeComboBox->currentData().toString());
-      }
-    on_styleComboBox_activated(m_ui->styleComboBox->currentText());
-    settings.endGroup();
+  else{
+    int index = m_ui->colorSchemeComboBox->findData(colorSchemePath);
+    if(index >= 0)
+    m_ui->colorSchemeComboBox->setCurrentIndex(index);
+    m_customPalette = loadColorScheme(m_ui->colorSchemeComboBox->currentData().toString());
+    }
+  on_styleComboBox_activated(m_ui->styleComboBox->currentText());
+  settings.endGroup();
 }
 
 void AppearancePage::setStyle(QWidget *w, QStyle *s){
   foreach (QObject *o, w->children()){
-  if(o->isWidgetType()){
-    setStyle(qobject_cast<QWidget *>(o), s);
+    if(o->isWidgetType()){
+      setStyle(qobject_cast<QWidget *>(o), s);
+      }
     }
-  }
   w->setStyle(s);
 }
 
@@ -261,10 +248,10 @@ QPalette AppearancePage::loadColorScheme(const QString &filePath){
       customPalette.setColor(QPalette::Disabled, role, QColor(disabledColors.at(i)));
       }
     }
-    else{
-      customPalette = palette(); //load fallback palette
-      }
-    return customPalette;
+  else{
+    customPalette = palette(); //load fallback palette
+    }
+  return customPalette;
 }
 
 void AppearancePage::createColorScheme(const QString &name, const QPalette &palette){
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp
index cfe002aa..1a09ac0d 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp
@@ -22,22 +22,20 @@ IconThemePage::~IconThemePage(){
 void IconThemePage::writeSettings(){
   QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
   QTreeWidgetItem *item = m_ui->treeWidget->currentItem();
-  if(item)
-    settings.setValue("Appearance/icon_theme", item->data(3, Qt::UserRole));
+  if(item){ settings.setValue("Appearance/icon_theme", item->data(3, Qt::UserRole)); }
 }
 
 void IconThemePage::readSettings(){
   QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
   QString name = settings.value("Appearance/icon_theme").toString();
-  if(name.isEmpty())
-    return;
-    for(int i = 0; i < m_ui->treeWidget->topLevelItemCount(); ++i){
-      QTreeWidgetItem *item = m_ui->treeWidget->topLevelItem(i);
-      if(item->data(3, Qt::UserRole).toString() == name){
-        m_ui->treeWidget->setCurrentItem(item);
-        break;
-        }
+  if(name.isEmpty()){ return; }
+  for(int i = 0; i < m_ui->treeWidget->topLevelItemCount(); ++i){
+    QTreeWidgetItem *item = m_ui->treeWidget->topLevelItem(i);
+    if(item->data(3, Qt::UserRole).toString() == name){
+      m_ui->treeWidget->setCurrentItem(item);
+      break;
       }
+    }
 }
 
 void IconThemePage::loadThemes(){
@@ -61,39 +59,33 @@ void IconThemePage::loadTheme(const QString &path){
   config.setIniCodec("UTF-8");
   config.beginGroup("Icon Theme");
   QStringList dirs = config.value("Directories").toStringList();
-  if(dirs.isEmpty() || config.value("Hidden", false).toBool())
-    return;
-    QString name, comment;
-    QString lang = QLocale::system().name();
-    name = config.value(QString("Name[%1]").arg(lang)).toString();
-    comment = config.value(QString("Comment[%1]").arg(lang)).toString();
-    if(lang.contains("_"))
-      lang = lang.split("_").first();
-      if(name.isEmpty())
-        name = config.value(QString("Name[%1]").arg(lang)).toString();
-        if(comment.isEmpty())
-          comment = config.value(QString("Comment[%1]").arg(lang)).toString();
-          if(name.isEmpty())
-            name = config.value("Name").toString();
-            if(comment.isEmpty())
-              comment = config.value("Comment").toString();
-              config.endGroup();
-              QIcon icon1 = findIcon(path, 24, "document-save");
-              QIcon icon2 = findIcon(path, 24, "document-print");
-              QIcon icon3 = findIcon(path, 24, "media-playback-stop");
-              QTreeWidgetItem *item = new QTreeWidgetItem();
-              item->setIcon(0, icon1);
-              item->setIcon(1, icon2);
-              item->setIcon(2, icon3);
-              item->setText(3, name);
-              item->setData(3, Qt::UserRole, QFileInfo(path).path().section("/", -1));
-              item->setToolTip(3, comment);
-              item->setSizeHint(0, QSize(24,24));
-              m_ui->treeWidget->addTopLevelItem(item);
-              m_ui->treeWidget->resizeColumnToContents(0);
-              m_ui->treeWidget->resizeColumnToContents(1);
-              m_ui->treeWidget->resizeColumnToContents(2);
-              m_ui->treeWidget->resizeColumnToContents(3);
+  if(dirs.isEmpty() || config.value("Hidden", false).toBool()){ return; }
+  QString name, comment;
+  QString lang = QLocale::system().name();
+  name = config.value(QString("Name[%1]").arg(lang)).toString();
+  comment = config.value(QString("Comment[%1]").arg(lang)).toString();
+  if(lang.contains("_")){ lang = lang.split("_").first(); }
+  if(name.isEmpty()){ name = config.value(QString("Name[%1]").arg(lang)).toString(); }
+  if(comment.isEmpty()){ comment = config.value(QString("Comment[%1]").arg(lang)).toString(); }
+  if(name.isEmpty()){ name = config.value("Name").toString(); }
+  if(comment.isEmpty()){ comment = config.value("Comment").toString(); }
+  config.endGroup();
+  QIcon icon1 = findIcon(path, 24, "document-save");
+  QIcon icon2 = findIcon(path, 24, "document-print");
+  QIcon icon3 = findIcon(path, 24, "media-playback-stop");
+  QTreeWidgetItem *item = new QTreeWidgetItem();
+  item->setIcon(0, icon1);
+  item->setIcon(1, icon2);
+  item->setIcon(2, icon3);
+  item->setText(3, name);
+  item->setData(3, Qt::UserRole, QFileInfo(path).path().section("/", -1));
+  item->setToolTip(3, comment);
+  item->setSizeHint(0, QSize(24,24));
+  m_ui->treeWidget->addTopLevelItem(item);
+  m_ui->treeWidget->resizeColumnToContents(0);
+  m_ui->treeWidget->resizeColumnToContents(1);
+  m_ui->treeWidget->resizeColumnToContents(2);
+  m_ui->treeWidget->resizeColumnToContents(3);
 }
 
 QIcon IconThemePage::findIcon(const QString &themePath, int size, const QString &name){
@@ -127,18 +119,15 @@ QIcon IconThemePage::findIcon(const QString &themePath, int size, const QString
     }
     config.endGroup();
     }
-  if (!haveInherits)
-    return QIcon();
-    parents.append("hicolor"); //add fallback themes
-    parents.append("gnome");
-    parents.removeDuplicates();
-    foreach (QString parent, parents){
-      QString parentThemePath = QDir(QFileInfo(themePath).path() + "/../" + parent).canonicalPath() + "/index.theme";
-      if(!QFile::exists(parentThemePath) || parentThemePath == themePath)
-        continue;
-        QIcon icon = findIcon(parentThemePath, size, name);
-        if(!icon.isNull())
-          return icon;
-      }
-    return QIcon();
+  if (!haveInherits){ return QIcon(); }
+  parents.append("hicolor"); //add fallback themes
+  parents.append("gnome");
+  parents.removeDuplicates();
+  foreach (QString parent, parents){
+    QString parentThemePath = QDir(QFileInfo(themePath).path() + "/../" + parent).canonicalPath() + "/index.theme";
+    if(!QFile::exists(parentThemePath) || parentThemePath == themePath){ continue; }
+    QIcon icon = findIcon(parentThemePath, size, name);
+    if(!icon.isNull()){ return icon; }
+    }
+  return QIcon();
 }
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp
index a44e75e4..38f6ef8f 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp
@@ -36,22 +36,15 @@ void InterfacePage::writeSettings(){
   settings.setValue("toolbutton_style", m_ui->toolButtonStyleComboBox->currentData());
   settings.setValue("wheel_scroll_lines", m_ui->wheelScrollLinesSpinBox->value());
   QStringList effects;
-  if(m_ui->guiEffectsCheckBox->isChecked())
-    effects << "General";
-    if(m_ui->menuEffectComboBox->currentIndex() == 1)
-       effects << "AnimateMenu";
-    else if(m_ui->menuEffectComboBox->currentIndex() == 2)
-      effects << "FadeMenu";
-      if(m_ui->comboBoxEffectComboBox->currentIndex() == 1)
-        effects << "AnimateCombo";
-        if(m_ui->toolTipEffectComboBox->currentIndex() == 1)
-          effects << "AnimateTooltip";
-        else if(m_ui->toolTipEffectComboBox->currentIndex() == 2)
-          effects << "FadeTooltip";
-          if(m_ui->toolBoxEffectComboBox->currentIndex() == 1)
-            effects << "AnimateToolBox";
-            settings.setValue("gui_effects", effects);
-            settings.endGroup();
+  if(m_ui->guiEffectsCheckBox->isChecked()){ effects << "General";}
+  if(m_ui->menuEffectComboBox->currentIndex() == 1){ effects << "AnimateMenu"; }
+  else if(m_ui->menuEffectComboBox->currentIndex() == 2){ effects << "FadeMenu"; }
+  if(m_ui->comboBoxEffectComboBox->currentIndex() == 1){ effects << "AnimateCombo"; }
+  if(m_ui->toolTipEffectComboBox->currentIndex() == 1){ effects << "AnimateTooltip"; }
+  else if(m_ui->toolTipEffectComboBox->currentIndex() == 2){ effects << "FadeTooltip"; }
+  if(m_ui->toolBoxEffectComboBox->currentIndex() == 1){ effects << "AnimateToolBox"; }
+  settings.setValue("gui_effects", effects);
+  settings.endGroup();
 }
 
 void InterfacePage::readSettings(){
@@ -62,27 +55,19 @@ void InterfacePage::readSettings(){
   m_ui->guiEffectsCheckBox->setChecked(qApp->isEffectEnabled(Qt::UI_General));
   int layout = settings.value("buttonbox_layout", style()->styleHint(QStyle::SH_DialogButtonLayout)).toInt();
   int index = m_ui->buttonLayoutComboBox->findData(layout);
-  if(index >= 0)
-    m_ui->buttonLayoutComboBox->setCurrentIndex(index);
-    if(qApp->isEffectEnabled(Qt::UI_AnimateMenu))
-      m_ui->menuEffectComboBox->setCurrentIndex(1);
-    else if(qApp->isEffectEnabled(Qt::UI_FadeMenu))
-      m_ui->menuEffectComboBox->setCurrentIndex(2);
-    if(qApp->isEffectEnabled(Qt::UI_AnimateCombo))
-      m_ui->comboBoxEffectComboBox->setCurrentIndex(1);
-      if(qApp->isEffectEnabled(Qt::UI_AnimateTooltip))
-        m_ui->toolTipEffectComboBox->setCurrentIndex(1);
-      else  if(qApp->isEffectEnabled(Qt::UI_FadeTooltip))
-        m_ui->toolTipEffectComboBox->setCurrentIndex(2);
-        if(qApp->isEffectEnabled(Qt::UI_AnimateToolBox))
-          m_ui->toolBoxEffectComboBox->setCurrentIndex(1);
-          m_ui->singleClickCheckBox->setCheckState((Qt::CheckState)settings.value("activate_item_on_single_click", Qt::PartiallyChecked).toInt());
-          m_ui->dialogIconsCheckBox->setCheckState((Qt::CheckState)settings.value("dialog_buttons_have_icons", Qt::PartiallyChecked).toInt());
-          m_ui->menuIconsCheckBox->setChecked(!qApp->testAttribute(Qt::AA_DontShowIconsInMenus));
-          int toolbarStyle = settings.value("toolbutton_style", Qt::ToolButtonFollowStyle).toInt();
-          index = m_ui->toolButtonStyleComboBox->findData(toolbarStyle);
-          if(index >= 0)
-            m_ui->toolButtonStyleComboBox->setCurrentIndex(index);
-            m_ui->wheelScrollLinesSpinBox->setValue(settings.value("wheel_scroll_lines", 3).toInt());
-            settings.endGroup();
+  if(index >= 0){ m_ui->buttonLayoutComboBox->setCurrentIndex(index); }
+  if(qApp->isEffectEnabled(Qt::UI_AnimateMenu)){ m_ui->menuEffectComboBox->setCurrentIndex(1); }
+  else if(qApp->isEffectEnabled(Qt::UI_FadeMenu)){ m_ui->menuEffectComboBox->setCurrentIndex(2); }
+  if(qApp->isEffectEnabled(Qt::UI_AnimateCombo)){ m_ui->comboBoxEffectComboBox->setCurrentIndex(1); }
+  if(qApp->isEffectEnabled(Qt::UI_AnimateTooltip)){ m_ui->toolTipEffectComboBox->setCurrentIndex(1); }
+  else if(qApp->isEffectEnabled(Qt::UI_FadeTooltip)){ m_ui->toolTipEffectComboBox->setCurrentIndex(2); }
+  if(qApp->isEffectEnabled(Qt::UI_AnimateToolBox)){ m_ui->toolBoxEffectComboBox->setCurrentIndex(1); }
+  m_ui->singleClickCheckBox->setCheckState((Qt::CheckState)settings.value("activate_item_on_single_click", Qt::PartiallyChecked).toInt());
+  m_ui->dialogIconsCheckBox->setCheckState((Qt::CheckState)settings.value("dialog_buttons_have_icons", Qt::PartiallyChecked).toInt());
+  m_ui->menuIconsCheckBox->setChecked(!qApp->testAttribute(Qt::AA_DontShowIconsInMenus));
+  int toolbarStyle = settings.value("toolbutton_style", Qt::ToolButtonFollowStyle).toInt();
+  index = m_ui->toolButtonStyleComboBox->findData(toolbarStyle);
+  if(index >= 0){ m_ui->toolButtonStyleComboBox->setCurrentIndex(index); }
+  m_ui->wheelScrollLinesSpinBox->setValue(settings.value("wheel_scroll_lines", 3).toInt());
+  settings.endGroup();
 }
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp
index 979c8c43..36b0c2fa 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp
@@ -25,19 +25,16 @@ QStringList lthemeengine::iconPaths(){
     paths << "/usr/local/share/icons";
     }
   else{
-    foreach (QString p, xdgDataDirs.split(":"))
-    paths << QDir(p + "/icons/").absolutePath();
+    foreach (QString p, xdgDataDirs.split(":")){ paths << QDir(p + "/icons/").absolutePath(); }
+    }
+  if(xdgDataHome.isEmpty()){ xdgDataHome = QDir::homePath() + "/.local/share"; }
+  paths << "/usr/share/pixmaps";
+  paths << xdgDataHome + "/icons";
+  paths.removeDuplicates();
+  //remove invalid
+  foreach (QString p, paths){
+    if(!QDir(p).exists()){ paths.removeAll(p); }
     }
-  if(xdgDataHome.isEmpty())
-    xdgDataHome = QDir::homePath() + "/.local/share";
-    paths << "/usr/share/pixmaps";
-    paths << xdgDataHome + "/icons";
-    paths.removeDuplicates();
-    //remove invalid
-    foreach (QString p, paths){
-      if(!QDir(p).exists())
-      paths.removeAll(p);
-      }
   return paths;
 }
 
@@ -49,12 +46,8 @@ QStringList lthemeengine::sharedStyleSheetPath(){
   QStringList dirs;
   dirs << QString(getenv("XDG_CONFIG_HOME"));
   dirs << QString(getenv("XDG_CONFIG_DIRS")).split(":");
-  for(int i=0; i<dirs.length(); i++){
-    dirs[i].append("/lthemeengine/colors/");
-    }
-  if(dirs.isEmpty()){
-    dirs << LTHEMEENGINE_DATADIR"/lthemeengine/qss/"; //no XDG settings - use the hardcoded path
-    }
+  for(int i=0; i<dirs.length(); i++){ dirs[i].append("/lthemeengine/colors/"); }
+  if(dirs.isEmpty()){ dirs << LTHEMEENGINE_DATADIR"/lthemeengine/qss/"; } //no XDG settings - use the hardcoded path
   return dirs;
  }
 
@@ -66,24 +59,17 @@ QStringList lthemeengine::sharedColorSchemePath(){
   QStringList dirs;
   dirs << QString(getenv("XDG_CONFIG_HOME"));
   dirs << QString(getenv("XDG_CONFIG_DIRS")).split(":");
-  for(int i=0; i<dirs.length(); i++){
-    dirs[i].append("/lthemeengine/colors/");
-    }
-  if(dirs.isEmpty()){
-    dirs << LTHEMEENGINE_DATADIR"/lthemeengine/colors/"; //no XDG settings - use the hardcoded path
-    }
+  for(int i=0; i<dirs.length(); i++){ dirs[i].append("/lthemeengine/colors/"); }
+  if(dirs.isEmpty()){ dirs << LTHEMEENGINE_DATADIR"/lthemeengine/colors/"; } //no XDG settings - use the hardcoded path
   return dirs;
 }
 
 QString lthemeengine::systemLanguageID(){
 #ifdef Q_OS_UNIX
   QByteArray v = qgetenv ("LC_ALL");
-  if (v.isEmpty())
-    v = qgetenv ("LC_MESSAGES");
-    if (v.isEmpty())
-      v = qgetenv ("LANG");
-      if (!v.isEmpty())
-        return QLocale (v).name();
+  if (v.isEmpty()){ v = qgetenv ("LC_MESSAGES"); }
+  if (v.isEmpty()){ v = qgetenv ("LANG"); }
+  if (!v.isEmpty()){ return QLocale (v).name(); }
 #endif
   return  QLocale::system().name();
 }
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp
index 55d0fc36..4c1b89fa 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp
@@ -22,15 +22,9 @@ int main(int argc, char **argv){
   //checking environment
   QStringList errorMessages;
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-  if(env.contains("QT_STYLE_OVERRIDE")){
-    errorMessages << app.translate("main", "Please remove the <b>QT_STYLE_OVERRIDE</b> environment variable");
-    }
-  if(env.value("QT_QPA_PLATFORMTHEME") != "lthemeengine"){
-    errorMessages << app.translate("main", "The <b>QT_QPA_PLATFORMTHEME</b> environment variable is not set correctly");
-    }
-  if(!QStyleFactory::keys().contains("lthemeengine-style")){
-    errorMessages << app.translate("main", "Unable to find <b>liblthemeengine-style.so</b>");
-    }
+  if(env.contains("QT_STYLE_OVERRIDE")){ errorMessages << app.translate("main", "Please remove the <b>QT_STYLE_OVERRIDE</b> environment variable"); }
+  if(env.value("QT_QPA_PLATFORMTHEME") != "lthemeengine"){ errorMessages << app.translate("main", "The <b>QT_QPA_PLATFORMTHEME</b> environment variable is not set correctly"); }
+  if(!QStyleFactory::keys().contains("lthemeengine-style")){ errorMessages << app.translate("main", "Unable to find <b>liblthemeengine-style.so</b>"); }
   if(!errorMessages.isEmpty()){
     QMessageBox::critical(0, app.translate("main", "Error"), errorMessages.join("<br><br>"));
     return 0;
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp
index c93b1052..719a0f49 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp
@@ -38,9 +38,8 @@ void MainWindow::on_buttonBox_clicked(QAbstractButton *button){
   if(id == QDialogButtonBox::Ok || id == QDialogButtonBox::Apply){
     for(int i = 0; i < m_ui->tabWidget->count(); ++i){
       TabPage *p = qobject_cast<TabPage*>(m_ui->tabWidget->widget(i));
-      if(p)
-        p->writeSettings();
-        }
+      if(p) { p->writeSettings(); }
+      }
     }
   if(id == QDialogButtonBox::Ok || id == QDialogButtonBox::Cancel){
     close();
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp
index 8a8e86d0..9cce5a6e 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp
@@ -37,15 +37,12 @@ QPalette PaletteEditDialog::selectedPalette() const{
 
 void PaletteEditDialog::setPalette(const QPalette &palette){
   for(int i = 0; i < QPalette::NColorRoles; i++){
-    if(!m_ui->tableWidget->item(i,0))
-      m_ui->tableWidget->setItem(i, 0, new QTableWidgetItem());
-      if(!m_ui->tableWidget->item(i,1))
-        m_ui->tableWidget->setItem(i, 1, new QTableWidgetItem());
-        if(!m_ui->tableWidget->item(i,2))
-          m_ui->tableWidget->setItem(i, 2, new QTableWidgetItem());
-          m_ui->tableWidget->item(i,0)->setBackgroundColor(palette.color(QPalette::Active, QPalette::ColorRole(i)));
-          m_ui->tableWidget->item(i,1)->setBackgroundColor(palette.color(QPalette::Inactive, QPalette::ColorRole(i)));
-          m_ui->tableWidget->item(i,2)->setBackgroundColor(palette.color(QPalette::Disabled, QPalette::ColorRole(i)));
+    if(!m_ui->tableWidget->item(i,0)){ m_ui->tableWidget->setItem(i, 0, new QTableWidgetItem()); }
+    if(!m_ui->tableWidget->item(i,1)){ m_ui->tableWidget->setItem(i, 1, new QTableWidgetItem()); }
+    if(!m_ui->tableWidget->item(i,2)){ m_ui->tableWidget->setItem(i, 2, new QTableWidgetItem()); }
+    m_ui->tableWidget->item(i,0)->setBackgroundColor(palette.color(QPalette::Active, QPalette::ColorRole(i)));
+    m_ui->tableWidget->item(i,1)->setBackgroundColor(palette.color(QPalette::Inactive, QPalette::ColorRole(i)));
+    m_ui->tableWidget->item(i,2)->setBackgroundColor(palette.color(QPalette::Disabled, QPalette::ColorRole(i)));
     }
   QStringList labels;
   labels << tr("Window text") << tr("Button background") << tr("Bright") << tr("Less bright") << tr("Dark") << tr("Less dark") << tr("Normal text") << tr("Bright text") << tr("Button text") << tr("Normal background") << tr("Window") << tr("Shadow") << tr("Highlight") << tr("Highlighted text")  << tr("Link")  << tr("Visited link") << tr("Alternate background") << tr("Default") << tr("Tooltip background")  << tr("Tooltip text");
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp
index aa4bb810..97d4ea1a 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp
@@ -36,10 +36,6 @@ void QSSEditorDialog::on_buttonBox_clicked(QAbstractButton *button){
     save();
     accept();
     }
-  else if(id == QDialogButtonBox::Save){
-    save();
-    }
-  else{
-  reject();
-  }
+  else if(id == QDialogButtonBox::Save){ save(); }
+  else{ reject(); }
 }
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp
index c9bfc14a..d690ef5d 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp
@@ -36,10 +36,9 @@ void QSSPage::writeSettings(){
   QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
   for(int i = 0; i < m_ui->qssListWidget->count(); ++i){
     QListWidgetItem *item = m_ui->qssListWidget->item(i);
-    if(item->checkState() == Qt::Checked)
-      styleSheets << item->data(QSS_FULL_PATH_ROLE).toString();
-    }
+    if(item->checkState() == Qt::Checked){ styleSheets << item->data(QSS_FULL_PATH_ROLE).toString(); }
   settings.setValue("Interface/stylesheets", styleSheets);
+  }
 }
 
 void QSSPage::on_qssListWidget_currentItemChanged(QListWidgetItem *current, QListWidgetItem *){
@@ -57,26 +56,24 @@ void QSSPage::on_qssListWidget_currentItemChanged(QListWidgetItem *current, QLis
 
 void QSSPage::on_createButton_clicked(){
   QString name = QInputDialog::getText(this, tr("Enter Style Sheet Name"), tr("File name:"));
-  if(name.isEmpty())
+  if(name.isEmpty()){ return; }
+  if(!name.endsWith(".qss", Qt::CaseInsensitive)){ name.append(".qss"); }
+  QString filePath = lthemeengine::userStyleSheetPath() + name;
+  if(QFile::exists(filePath)){
+    QMessageBox::warning(this, tr("Error"), tr("The file \"%1\" already exists").arg(filePath));
     return;
-    if(!name.endsWith(".qss", Qt::CaseInsensitive))
-      name.append(".qss");
-      QString filePath = lthemeengine::userStyleSheetPath() + name;
-      if(QFile::exists(filePath)){
-        QMessageBox::warning(this, tr("Error"), tr("The file \"%1\" already exists").arg(filePath));
-        return;
-        }
-      //creating empty file
-      QFile file(filePath);
-      file.open(QIODevice::WriteOnly);
-      file.close();
-      //creating item
-      QFileInfo info(filePath);
-      QListWidgetItem *item = new QListWidgetItem(info.fileName(),  m_ui->qssListWidget);
-      item->setToolTip(info.filePath());
-      item->setData(QSS_FULL_PATH_ROLE, info.filePath());
-      item->setData(QSS_WRITABLE_ROLE, info.isWritable());
-      item->setCheckState(Qt::Unchecked);
+    }
+  //creating empty file
+  QFile file(filePath);
+  file.open(QIODevice::WriteOnly);
+  file.close();
+  //creating item
+  QFileInfo info(filePath);
+  QListWidgetItem *item = new QListWidgetItem(info.fileName(),  m_ui->qssListWidget);
+  item->setToolTip(info.filePath());
+  item->setData(QSS_FULL_PATH_ROLE, info.filePath());
+  item->setData(QSS_WRITABLE_ROLE, info.isWritable());
+  item->setCheckState(Qt::Unchecked);
 }
 
 void QSSPage::on_editButton_clicked(){
@@ -89,13 +86,10 @@ void QSSPage::on_editButton_clicked(){
 
 void QSSPage::on_removeButton_clicked(){
   QListWidgetItem *item = m_ui->qssListWidget->currentItem();
-  if(!item)
-    return;
-    int button = QMessageBox::question(this, tr("Confirm Remove"),tr("Are you sure you want to remove style sheet \"%1\"?").arg(item->text()), QMessageBox::Yes | QMessageBox::No);
-    if(button == QMessageBox::Yes){
-      QFile::remove(item->data(QSS_FULL_PATH_ROLE).toString());
-      delete item;
-      }
+  if(!item){ return; }
+  int button = QMessageBox::question(this, tr("Confirm Remove"),tr("Are you sure you want to remove style sheet \"%1\"?").arg(item->text()), QMessageBox::Yes | QMessageBox::No);
+  if(button == QMessageBox::Yes){ QFile::remove(item->data(QSS_FULL_PATH_ROLE).toString()); }
+  delete item;
 }
 
 void QSSPage::readSettings(){
@@ -107,10 +101,8 @@ void QSSPage::readSettings(){
   QStringList styleSheets = settings.value("Interface/stylesheets").toStringList();
   for(int i = 0; i < m_ui->qssListWidget->count(); ++i){
     QListWidgetItem *item = m_ui->qssListWidget->item(i);
-    if(styleSheets.contains(item->data(QSS_FULL_PATH_ROLE).toString()))
-      item->setCheckState(Qt::Checked);
-    else
-       item->setCheckState(Qt::Unchecked);
+    if(styleSheets.contains(item->data(QSS_FULL_PATH_ROLE).toString())){ item->setCheckState(Qt::Checked); }
+    else { item->setCheckState(Qt::Unchecked); }
     }
 }
 
@@ -128,29 +120,25 @@ void QSSPage::findStyleSheets(const QString &path){
 
 void QSSPage::on_renameButton_clicked(){
   QListWidgetItem *item = m_ui->qssListWidget->currentItem();
-  if(!item)
+  if(!item){ return; }
+  QString name = QInputDialog::getText(this, tr("Rename Style Sheet"), tr("Style sheet name:"), QLineEdit::Normal, item->text(), 0);
+  if(name.isEmpty()){ return; }
+  if(!m_ui->qssListWidget->findItems(name, Qt::MatchExactly).isEmpty()){
+    QMessageBox::warning(this, tr("Error"), tr("The style sheet \"%1\" already exists").arg(name));
     return;
-    QString name = QInputDialog::getText(this, tr("Rename Style Sheet"), tr("Style sheet name:"), QLineEdit::Normal, item->text(), 0);
-    if(name.isEmpty())
-      return;
-        if(!m_ui->qssListWidget->findItems(name, Qt::MatchExactly).isEmpty()){
-          QMessageBox::warning(this, tr("Error"), tr("The style sheet \"%1\" already exists").arg(name));
-          return;
-          }
-    if(!name.endsWith(".qss", Qt::CaseInsensitive)) name.append(".qss");
-      QString newPath = lthemeengine::userStyleSheetPath() + name;
-      if(!QFile::rename(item->data(QSS_FULL_PATH_ROLE).toString(), newPath)){
-        QMessageBox::warning(this, tr("Error"), tr("Unable to rename file"));
-         return;
-         }
-      item->setText(name);
-      item->setData(QSS_FULL_PATH_ROLE, newPath);
-      item->setToolTip(newPath);
+    }
+  if(!name.endsWith(".qss", Qt::CaseInsensitive)){ name.append(".qss"); }
+  QString newPath = lthemeengine::userStyleSheetPath() + name;
+  if(!QFile::rename(item->data(QSS_FULL_PATH_ROLE).toString(), newPath)){
+    QMessageBox::warning(this, tr("Error"), tr("Unable to rename file"));
+    return;
+    }
+  item->setText(name);
+  item->setData(QSS_FULL_PATH_ROLE, newPath);
+  item->setToolTip(newPath);
 }
 
 void QSSPage::on_qssListWidget_customContextMenuRequested(const QPoint &pos){
   QListWidgetItem *item = m_ui->qssListWidget->currentItem();
-    if(item && item->data(QSS_WRITABLE_ROLE).toBool()){
-      m_menu->exec(m_ui->qssListWidget->viewport()->mapToGlobal(pos));
-      }
+  if(item && item->data(QSS_WRITABLE_ROLE).toBool()){ m_menu->exec(m_ui->qssListWidget->viewport()->mapToGlobal(pos)); }
 }