From 8b4bd52a26fef01b9ff129b33d16f8fdafec3acc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 28 Nov 2019 23:31:50 +0100
Subject: [PATCH] [machineid][hostinfo] Reduce warnings

 - stray ;
 - clang-tidy had re-ordered the moc-warnings.h header, needs to go
   **before** the .moc so split into its own group
---
 src/modules/hostinfo/Tests.cpp    | 3 ++-
 src/modules/machineid/Tests.cpp   | 3 ++-
 src/modules/machineid/Workers.cpp | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/hostinfo/Tests.cpp b/src/modules/hostinfo/Tests.cpp
index 32fce19ed..8241ef022 100644
--- a/src/modules/hostinfo/Tests.cpp
+++ b/src/modules/hostinfo/Tests.cpp
@@ -65,5 +65,6 @@ HostInfoTests::testHostOS()
 
 QTEST_GUILESS_MAIN( HostInfoTests )
 
-#include "Tests.moc"
 #include "utils/moc-warnings.h"
+
+#include "Tests.moc"
diff --git a/src/modules/machineid/Tests.cpp b/src/modules/machineid/Tests.cpp
index cfd96bbdd..273645e22 100644
--- a/src/modules/machineid/Tests.cpp
+++ b/src/modules/machineid/Tests.cpp
@@ -104,5 +104,6 @@ MachineIdTests::testPoolSize()
 
 QTEST_GUILESS_MAIN( MachineIdTests )
 
-#include "Tests.moc"
 #include "utils/moc-warnings.h"
+
+#include "Tests.moc"
diff --git a/src/modules/machineid/Workers.cpp b/src/modules/machineid/Workers.cpp
index e6379f3f1..178f03de5 100644
--- a/src/modules/machineid/Workers.cpp
+++ b/src/modules/machineid/Workers.cpp
@@ -192,7 +192,7 @@ createDBusMachineId( const QString& rootMountPoint, const QString& fileName )
 Calamares::JobResult
 createDBusLink( const QString& rootMountPoint, const QString& fileName, const QString& systemdFileName )
 {
-    Q_UNUSED( rootMountPoint );
+    Q_UNUSED( rootMountPoint )
     return runCmd( QStringList { QStringLiteral( "ln" ), QStringLiteral( "-s" ), systemdFileName, fileName } );
 }