[libcalamares] Apply newer clang-formatting

src/libcalamares/DllMacro.h

@@ -12,7 +12,7 @@
 #define DLLMACRO_H
 
 #ifndef CALAMARES_EXPORT
-#define CALAMARES_EXPORT __attribute__((visibility("default")))
+#define CALAMARES_EXPORT __attribute__( ( visibility( "default" ) ) )
 #endif
 
 /*

src/libcalamares/JobQueue.cpp

@@ -135,8 +135,7 @@ PowerManagementInterface::inhibitSleep()
                                                        QStringLiteral( "/org/freedesktop/PowerManagement/Inhibit" ),
                                                        QStringLiteral( "org.freedesktop.PowerManagement.Inhibit" ),
                                                        QStringLiteral( "Inhibit" ) );
-    inhibitCall.setArguments(
+    inhibitCall.setArguments( { { tr( "Calamares" ) }, { tr( "Installation in progress", "@status" ) } } );
-        { { tr( "Calamares" ) }, { tr( "Installation in progress", "@status" ) } } );
 
     auto asyncReply = sessionBus.asyncCall( inhibitCall );
     auto* replyWatcher = new QDBusPendingCallWatcher( asyncReply, this );

src/libcalamares/modulesystem/Descriptor.h

@@ -74,7 +74,7 @@ public:
     Interface interface() const { return m_interface; }
 
     bool isEmergency() const { return m_isEmergeny; }
-    bool hasConfig() const { return m_hasConfig; } // TODO: 3.5 rename to noConfig() to match descriptor key
+    bool hasConfig() const { return m_hasConfig; }  // TODO: 3.5 rename to noConfig() to match descriptor key
     int weight() const { return m_weight < 1 ? 1 : m_weight; }
     bool explicitWeight() const { return m_weight > 0; }
 

src/libcalamares/packages/Globals.h

@@ -26,17 +26,17 @@ namespace Packages
  * Returns @c true if anything was changed, @c false otherwise.
  */
 DLLEXPORT bool setGSPackageAdditions( Calamares::GlobalStorage* gs,
-                            const Calamares::ModuleSystem::InstanceKey& module,
+                                      const Calamares::ModuleSystem::InstanceKey& module,
-                            const QVariantList& installPackages,
+                                      const QVariantList& installPackages,
-                            const QVariantList& tryInstallPackages );
+                                      const QVariantList& tryInstallPackages );
 /** @brief Sets the install-packages GS keys for the given module
  *
  * This replaces previously-set install-packages lists. Use this with
  * plain lists of package names. It does not support try-install.
  */
 DLLEXPORT bool setGSPackageAdditions( Calamares::GlobalStorage* gs,
-                            const Calamares::ModuleSystem::InstanceKey& module,
+                                      const Calamares::ModuleSystem::InstanceKey& module,
-                            const QStringList& installPackages );
+                                      const QStringList& installPackages );
 // void setGSPackageRemovals( const Calamares::ModuleSystem::InstanceKey& key, const QVariantList& removePackages );
 }  // namespace Packages
 }  // namespace Calamares

src/libcalamares/partition/Tests.cpp

@@ -110,7 +110,8 @@ PartitionServiceTests::testUnitComparison()
 }
 
 /* Operator to make the table in testUnitNormalisation_data easier to write */
-constexpr qint64 operator""_qi( unsigned long long m )
+constexpr qint64
+operator""_qi( unsigned long long m )
 {
     return qint64( m );
 }

src/libcalamares/utils/Units.h

@@ -24,39 +24,45 @@ namespace Units
 {
 
 /** User defined literals, 1_KB is 1 KiloByte (= 10^3 bytes) */
-constexpr qint64 operator""_KB( unsigned long long m )
+constexpr qint64
+operator""_KB( unsigned long long m )
 {
     return qint64( m ) * 1000;
 }
 
 /** User defined literals, 1_KiB is 1 KibiByte (= 2^10 bytes) */
-constexpr qint64 operator""_KiB( unsigned long long m )
+constexpr qint64
+operator""_KiB( unsigned long long m )
 {
     return qint64( m ) * 1024;
 }
 
 /** User defined literals, 1_MB is 1 MegaByte (= 10^6 bytes) */
-constexpr qint64 operator""_MB( unsigned long long m )
+constexpr qint64
+operator""_MB( unsigned long long m )
 {
-    return operator""_KB(m)*1000;
+    return operator""_KB( m ) * 1000;
 }
 
 /** User defined literals, 1_MiB is 1 MibiByte (= 2^20 bytes) */
-constexpr qint64 operator""_MiB( unsigned long long m )
+constexpr qint64
+operator""_MiB( unsigned long long m )
 {
-    return operator""_KiB(m)*1024;
+    return operator""_KiB( m ) * 1024;
 }
 
 /** User defined literals, 1_GB is 1 GigaByte (= 10^9 bytes) */
-constexpr qint64 operator""_GB( unsigned long long m )
+constexpr qint64
+operator""_GB( unsigned long long m )
 {
-    return operator""_MB(m)*1000;
+    return operator""_MB( m ) * 1000;
 }
 
 /** User defined literals, 1_GiB is 1 GibiByte (= 2^30 bytes) */
-constexpr qint64 operator""_GiB( unsigned long long m )
+constexpr qint64
+operator""_GiB( unsigned long long m )
 {
-    return operator""_MiB(m)*1024;
+    return operator""_MiB( m ) * 1024;
 }
 
 }  // namespace Units