From 177d6fe861e917662fd0f8ce5360d81478e32e69 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 24 Mar 2020 22:57:36 +0100
Subject: [PATCH] [libcalamares] Apply coding style

---
 src/libcalamares/locale/TimeZone.cpp | 11 ++++++----
 src/libcalamares/locale/TimeZone.h   | 30 ++++++++++++++++------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/libcalamares/locale/TimeZone.cpp b/src/libcalamares/locale/TimeZone.cpp
index fb224f9c4..9d9d7d18e 100644
--- a/src/libcalamares/locale/TimeZone.cpp
+++ b/src/libcalamares/locale/TimeZone.cpp
@@ -239,7 +239,8 @@ CStringListModel::CStringListModel( CStringPairList l )
 {
 }
 
-void CStringListModel::setList(CalamaresUtils::Locale::CStringPairList l)
+void
+CStringListModel::setList( CalamaresUtils::Locale::CStringPairList l )
 {
     beginResetModel();
     m_list = l;
@@ -270,10 +271,12 @@ CStringListModel::data( const QModelIndex& index, int role ) const
 }
 
 void
-CStringListModel::setCurrentIndex(const int &index)
+CStringListModel::setCurrentIndex( const int& index )
 {
     if ( ( index < 0 ) || ( index >= m_list.count() ) )
+    {
         return;
+    }
 
     m_currentIndex = index;
     emit currentIndexChanged();
@@ -285,10 +288,10 @@ CStringListModel::currentIndex() const
     return m_currentIndex;
 }
 
-QHash<int, QByteArray>
+QHash< int, QByteArray >
 CStringListModel::roleNames() const
 {
-    return {{Qt::DisplayRole,"label"}, {Qt::UserRole, "key"}};
+    return { { Qt::DisplayRole, "label" }, { Qt::UserRole, "key" } };
 }
 
 const CStringPair*
diff --git a/src/libcalamares/locale/TimeZone.h b/src/libcalamares/locale/TimeZone.h
index 32c4622cf..774bf8af3 100644
--- a/src/libcalamares/locale/TimeZone.h
+++ b/src/libcalamares/locale/TimeZone.h
@@ -141,7 +141,7 @@ protected:
 class CStringListModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
+    Q_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged )
 
 public:
     /// @brief Create empty model
@@ -154,24 +154,28 @@ public:
     QVariant data( const QModelIndex& index, int role ) const override;
 
     const CStringPair* item( int index ) const;
-    QHash<int, QByteArray> roleNames() const override;
+    QHash< int, QByteArray > roleNames() const override;
 
-    void setCurrentIndex(const int &index);
+    void setCurrentIndex( const int& index );
     int currentIndex() const;
 
-    void setList(CStringPairList);
+    void setList( CStringPairList );
 
-    inline int indexOf(const QString &key)
+    inline int indexOf( const QString& key )
     {
-        const auto it = std::find_if(m_list.constBegin(), m_list.constEnd(), [&](const  CalamaresUtils::Locale::CStringPair *item) -> bool
+        const auto it = std::find_if(
+            m_list.constBegin(), m_list.constEnd(), [&]( const CalamaresUtils::Locale::CStringPair* item ) -> bool {
+                return item->key() == key;
+            } );
+
+        if ( it != m_list.constEnd() )
         {
-            return item->key() == key;
-
-        });
-
-        if(it != m_list.constEnd())
-            return std::distance(m_list.constBegin(), it);
-        else return -1;
+            return std::distance( m_list.constBegin(), it );
+        }
+        else
+        {
+            return -1;
+        }
     }