napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[machineid][hostinfo] Reduce warnings

Browse Source 
- stray ;
 - clang-tidy had re-ordered the moc-warnings.h header, needs to go
   **before** the .moc so split into its own group
This commit is contained in:
Adriaan de Groot 2019-11-28 23:31:50 +01:00
parent bd5b63b02e
commit 8b4bd52a26
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/hostinfo/Tests.cpp
View File

@ -65,5 +65,6 @@ HostInfoTests::testHostOS()
QTEST_GUILESS_MAIN( HostInfoTests ) QTEST_GUILESS_MAIN( HostInfoTests )
#include "Tests.moc"
#include "utils/moc-warnings.h" #include "utils/moc-warnings.h"
#include "Tests.moc"

3
src/modules/machineid/Tests.cpp
View File

@ -104,5 +104,6 @@ MachineIdTests::testPoolSize()
QTEST_GUILESS_MAIN( MachineIdTests ) QTEST_GUILESS_MAIN( MachineIdTests )
#include "Tests.moc"
#include "utils/moc-warnings.h" #include "utils/moc-warnings.h"
#include "Tests.moc"

2
src/modules/machineid/Workers.cpp
View File

@ -192,7 +192,7 @@ createDBusMachineId( const QString& rootMountPoint, const QString& fileName )
Calamares::JobResult Calamares::JobResult
createDBusLink( const QString& rootMountPoint, const QString& fileName, const QString& systemdFileName ) 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 } ); return runCmd( QStringList { QStringLiteral( "ln" ), QStringLiteral( "-s" ), systemdFileName, fileName } );
} }