[contextualprocess] Apply current coding style

src/modules/contextualprocess/ContextualProcessJob.cpp

@@ -18,13 +18,13 @@
 
 #include "ContextualProcessJob.h"
 
-#include <QProcess>
 #include <QDateTime>
+#include <QProcess>
 #include <QThread>
 
 #include "CalamaresVersion.h"
-#include "JobQueue.h"
 #include "GlobalStorage.h"
+#include "JobQueue.h"
 
 #include "utils/CommandList.h"
 #include "utils/Logger.h"
@@ -67,19 +67,25 @@ struct ContextualProcessBinding
     {
         checks.append( ValueCheck( value, commands ) );
         if ( value == QString( "*" ) )
+        {
             wildcard = commands;
         }
+    }
 
     Calamares::JobResult run( const QString& value ) const
     {
         for ( const auto& c : checks )
         {
             if ( value == c.value() )
+            {
                 return c.commands()->run();
             }
+        }
 
         if ( wildcard )
+        {
             return wildcard->run();
+        }
 
         return Calamares::JobResult::ok();
     }
@@ -129,11 +135,15 @@ ContextualProcessJob::exec()
         {
             Calamares::JobResult r = binding->run( gs->value( binding->variable ).toString() );
             if ( !r )
+            {
                 return r;
             }
+        }
         else
+        {
             cWarning() << "ContextualProcess checks for unknown variable" << binding->variable;
         }
+    }
     return Calamares::JobResult::ok();
 }
 
@@ -144,13 +154,17 @@ ContextualProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
     bool dontChroot = CalamaresUtils::getBool( configurationMap, "dontChroot", false );
     int timeout = CalamaresUtils::getInteger( configurationMap, "timeout", 10 );
     if ( timeout < 1 )
+    {
         timeout = 10;
+    }
 
     for ( QVariantMap::const_iterator iter = configurationMap.cbegin(); iter != configurationMap.cend(); ++iter )
     {
         QString variableName = iter.key();
         if ( variableName.isEmpty() || ( variableName == "dontChroot" ) || ( variableName == "timeout" ) )
+        {
             continue;
+        }
 
         if ( iter.value().type() != QVariant::Map )
         {
@@ -166,11 +180,13 @@ ContextualProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
             QString valueString = valueiter.key();
             if ( variableName.isEmpty() )
             {
-                cWarning() << moduleInstanceKey() << "variable" << variableName << "unrecognized value" << valueiter.key();
+                cWarning() << moduleInstanceKey() << "variable" << variableName << "unrecognized value"
+                           << valueiter.key();
                 continue;
             }
 
-            CalamaresUtils::CommandList* commands = new CalamaresUtils::CommandList( valueiter.value(), !dontChroot, std::chrono::seconds( timeout ) );
+            CalamaresUtils::CommandList* commands
+                = new CalamaresUtils::CommandList( valueiter.value(), !dontChroot, std::chrono::seconds( timeout ) );
 
             binding->append( valueString, commands );
         }
@@ -188,7 +204,9 @@ ContextualProcessJob::count(const QString& variableName)
 {
     for ( const ContextualProcessBinding* binding : m_commands )
         if ( binding->variable == variableName )
+        {
             return binding->checks.count();
+        }
     return -1;
 }
 

src/modules/contextualprocess/Tests.cpp

@@ -31,13 +31,9 @@ QTEST_GUILESS_MAIN( ContextualProcessTests )
 
 using CommandList = CalamaresUtils::CommandList;
 
-ContextualProcessTests::ContextualProcessTests()
+ContextualProcessTests::ContextualProcessTests() {}
-{
-}
 
-ContextualProcessTests::~ContextualProcessTests()
+ContextualProcessTests::~ContextualProcessTests() {}
-{
-}
 
 void
 ContextualProcessTests::initTestCase()
@@ -66,4 +62,3 @@ ContextualProcessTests::testProcessListSampleConfig()
     QCOMPARE( job.count(), 1 );  // Only "firmwareType"
     QCOMPARE( job.count( "firmwareType" ), 4 );
 }
-