From 76041a21841d61c6c7fafd8d9206890915bbdacd Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 9 Aug 2019 16:34:53 +0200
Subject: [PATCH] [dummycpp] Reduce warnings and apply coding style

 - tired of the (IMO, bogus) clang warnings from the
   switch() statement with a default:, so swap it out for
   some cascaded ifs.
---
 src/modules/dummycpp/DummyCppJob.cpp | 61 ++++++++++++++++------------
 src/modules/dummycpp/DummyCppJob.h   |  2 +-
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/modules/dummycpp/DummyCppJob.cpp b/src/modules/dummycpp/DummyCppJob.cpp
index b404eaf63..a38cddc40 100644
--- a/src/modules/dummycpp/DummyCppJob.cpp
+++ b/src/modules/dummycpp/DummyCppJob.cpp
@@ -20,13 +20,13 @@
 
 #include "DummyCppJob.h"
 
-#include <QProcess>
 #include <QDateTime>
+#include <QProcess>
 #include <QThread>
 
 #include "CalamaresVersion.h"
-#include "JobQueue.h"
 #include "GlobalStorage.h"
+#include "JobQueue.h"
 
 #include "utils/Logger.h"
 
@@ -36,9 +36,7 @@ DummyCppJob::DummyCppJob( QObject* parent )
 }
 
 
-DummyCppJob::~DummyCppJob()
-{
-}
+DummyCppJob::~DummyCppJob() {}
 
 
 QString
@@ -56,19 +54,20 @@ static QString variantHashToString( const QVariantHash& variantHash );
 static QString
 variantToString( const QVariant& variant )
 {
-    switch ( variant.type() )
+    if ( variant.type() == QVariant::Map )
     {
-    case QVariant::Map:
         return variantMapToString( variant.toMap() );
-
-    case QVariant::Hash:
+    }
+    else if ( variant.type() == QVariant::Hash )
+    {
         return variantHashToString( variant.toHash() );
-
-    case QVariant::List:
-    case QVariant::StringList:
+    }
+    else if ( ( variant.type() == QVariant::List ) || ( variant.type() == QVariant::StringList ) )
+    {
         return variantListToString( variant.toList() );
-
-    default:
+    }
+    else
+    {
         return variant.toString();
     }
 }
@@ -79,8 +78,10 @@ variantListToString( const QVariantList& variantList )
 {
     QStringList result;
     for ( const QVariant& variant : variantList )
+    {
         result.append( variantToString( variant ) );
-    return '{' + result.join(',') + '}';
+    }
+    return '{' + result.join( ',' ) + '}';
 }
 
 
@@ -89,8 +90,10 @@ variantMapToString( const QVariantMap& variantMap )
 {
     QStringList result;
     for ( auto it = variantMap.constBegin(); it != variantMap.constEnd(); ++it )
+    {
         result.append( it.key() + '=' + variantToString( it.value() ) );
-    return '[' + result.join(',') + ']';
+    }
+    return '[' + result.join( ',' ) + ']';
 }
 
 
@@ -99,8 +102,10 @@ variantHashToString( const QVariantHash& variantHash )
 {
     QStringList result;
     for ( auto it = variantHash.constBegin(); it != variantHash.constEnd(); ++it )
+    {
         result.append( it.key() + '=' + variantToString( it.value() ) );
-    return '<' + result.join(',') + '>';
+    }
+    return '<' + result.join( ',' ) + '>';
 }
 
 
@@ -108,24 +113,28 @@ Calamares::JobResult
 DummyCppJob::exec()
 {
     // Ported from dummypython
-    QProcess::execute( "/bin/sh", QStringList() << "-c" << "touch ~/calamares-dummycpp" );
+    QProcess::execute( "/bin/sh",
+                       QStringList() << "-c"
+                                     << "touch ~/calamares-dummycpp" );
     QString accumulator = QDateTime::currentDateTimeUtc().toString( Qt::ISODate ) + '\n';
     accumulator += QStringLiteral( "Calamares version: " ) + CALAMARES_VERSION_SHORT + '\n';
     accumulator += QStringLiteral( "This job's name: " ) + prettyName() + '\n';
     accumulator += QStringLiteral( "Configuration map: %1\n" ).arg( variantMapToString( m_configurationMap ) );
     accumulator += QStringLiteral( "   *** globalstorage test ***\n" );
-    Calamares::GlobalStorage *globalStorage = Calamares::JobQueue::instance()->globalStorage();
-    accumulator += QStringLiteral( "lala: " ) + (globalStorage->contains( "lala" ) ? QStringLiteral( "true" ) : QStringLiteral( "false" )) + '\n';
-    accumulator += QStringLiteral( "foo: " ) + (globalStorage->contains( "foo" ) ? QStringLiteral( "true" ) : QStringLiteral( "false" )) + '\n';
+    Calamares::GlobalStorage* globalStorage = Calamares::JobQueue::instance()->globalStorage();
+    accumulator += QStringLiteral( "lala: " )
+        + ( globalStorage->contains( "lala" ) ? QStringLiteral( "true" ) : QStringLiteral( "false" ) ) + '\n';
+    accumulator += QStringLiteral( "foo: " )
+        + ( globalStorage->contains( "foo" ) ? QStringLiteral( "true" ) : QStringLiteral( "false" ) ) + '\n';
     accumulator += QStringLiteral( "count: " ) + QString::number( globalStorage->count() ) + '\n';
     globalStorage->insert( "item2", "value2" );
     globalStorage->insert( "item3", 3 );
     accumulator += QStringLiteral( "keys: %1\n" ).arg( globalStorage->keys().join( ',' ) );
     accumulator += QStringLiteral( "remove: %1\n" ).arg( QString::number( globalStorage->remove( "item2" ) ) );
-    accumulator += QStringLiteral( "values: %1 %2 %3\n" ).arg(
-        globalStorage->value( "foo" ).toString(),
-        globalStorage->value( "item2" ).toString(),
-        globalStorage->value( "item3" ).toString() );
+    accumulator += QStringLiteral( "values: %1 %2 %3\n" )
+                       .arg( globalStorage->value( "foo" ).toString(),
+                             globalStorage->value( "item2" ).toString(),
+                             globalStorage->value( "item3" ).toString() );
 
     emit progress( 0.1 );
     cDebug() << "[DUMMYCPP]: " << accumulator;
@@ -145,4 +154,4 @@ DummyCppJob::setConfigurationMap( const QVariantMap& configurationMap )
     m_configurationMap = configurationMap;
 }
 
-CALAMARES_PLUGIN_FACTORY_DEFINITION( DummyCppJobFactory, registerPlugin<DummyCppJob>(); )
+CALAMARES_PLUGIN_FACTORY_DEFINITION( DummyCppJobFactory, registerPlugin< DummyCppJob >(); )
diff --git a/src/modules/dummycpp/DummyCppJob.h b/src/modules/dummycpp/DummyCppJob.h
index 98c4d19d6..4a79d0378 100644
--- a/src/modules/dummycpp/DummyCppJob.h
+++ b/src/modules/dummycpp/DummyCppJob.h
@@ -49,4 +49,4 @@ private:
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( DummyCppJobFactory )
 
-#endif // DUMMYCPPJOB_H
+#endif  // DUMMYCPPJOB_H