refactor: Fix readability-use-concise-preprocessor-directives

Author: ltoenning

.clang-tidy

@@ -51,6 +51,7 @@ Checks: >
   cppcoreguidelines-init-variables,
   readability-static-accessed-through-instance,
   readability-simplify-boolean-expr,
+  readability-use-concise-preprocessor-directives,
 
 CheckOptions:
   - key: readability-identifier-naming.ClassCase

src/core/swiftcoreexport.h

@@ -14,7 +14,7 @@
  */
 
 #ifndef WITH_STATIC
-#    if defined(BUILD_SWIFT_CORE_LIB)
+#    ifdef BUILD_SWIFT_CORE_LIB
 #        define SWIFT_CORE_EXPORT Q_DECL_EXPORT
 #    else
 #        define SWIFT_CORE_EXPORT Q_DECL_IMPORT

src/gui/swiftguiexport.h

@@ -13,7 +13,7 @@
  * Export a class or function from the library
  */
 #ifndef WITH_STATIC
-#    if defined(BUILD_SWIFT_GUI_LIB)
+#    ifdef BUILD_SWIFT_GUI_LIB
 #        define SWIFT_GUI_EXPORT Q_DECL_EXPORT
 #    else
 #        define SWIFT_GUI_EXPORT Q_DECL_IMPORT

src/input/joystick.cpp

@@ -3,7 +3,7 @@
 
 #include "joystick.h"
 
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
 #    include "win/joystickwindows.h"
 #elif defined(Q_OS_LINUX)
 #    include "linux/joysticklinux.h"
@@ -20,7 +20,7 @@ namespace swift::input
 
     std::unique_ptr<IJoystick> IJoystick::create(QObject *parent)
     {
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
         std::unique_ptr<IJoystick> ptr(new CJoystickWindows(parent));
 #elif defined(Q_OS_LINUX)
         std::unique_ptr<IJoystick> ptr(new CJoystickLinux(parent));

src/input/keyboard.cpp

@@ -3,7 +3,7 @@
 
 #include "keyboard.h"
 
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
 #    include "win/keyboardwindows.h"
 #elif defined(Q_OS_LINUX)
 #    include "linux/keyboardlinux.h"
@@ -19,7 +19,7 @@ namespace swift::input
 
     std::unique_ptr<IKeyboard> IKeyboard::create(QObject *parent)
     {
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
         std::unique_ptr<IKeyboard> ptr(new CKeyboardWindows(parent));
 #elif defined(Q_OS_LINUX)
         std::unique_ptr<IKeyboard> ptr(new CKeyboardLinux(parent));

src/input/swiftinputexport.h

@@ -14,7 +14,7 @@
  */
 
 #ifndef WITH_STATIC
-#    if defined(BUILD_SWIFT_INPUT_LIB)
+#    ifdef BUILD_SWIFT_INPUT_LIB
 #        define SWIFT_INPUT_EXPORT Q_DECL_EXPORT
 #    else
 #        define SWIFT_INPUT_EXPORT Q_DECL_IMPORT

src/misc/atomicfile.cpp

@@ -12,7 +12,7 @@
 
 #include "misc/algorithm.h"
 
-#if defined(Q_OS_POSIX)
+#ifdef Q_OS_POSIX
 #    include <errno.h>
 #    include <stdio.h>
 #elif defined(Q_OS_WIN32)
@@ -29,7 +29,7 @@ namespace swift::misc
     {
         bool ok = true;
         {
-#if defined(Q_OS_WIN32)
+#ifdef Q_OS_WIN32
             QNtfsPermissionCheckGuard permissionGuard;
 #endif
             if ((mode & CAtomicFile::ReadOnly) && !fileInfo.isReadable()) { ok = false; }
@@ -71,7 +71,7 @@ namespace swift::misc
     {
         if (!isOpen()) { return; }
 
-#if defined(Q_OS_WIN32)
+#ifdef Q_OS_WIN32
         FlushFileBuffers(reinterpret_cast<HANDLE>(_get_osfhandle(handle())));
 #endif
 
@@ -118,7 +118,7 @@ namespace swift::misc
             36, QChar('0'));
     }
 
-#if defined(Q_OS_POSIX)
+#ifdef Q_OS_POSIX
     void CAtomicFile::replaceOriginal()
     {
         auto result = ::rename(qPrintable(fileName()), qPrintable(m_originalFilename));

src/misc/cputime.cpp

@@ -5,7 +5,7 @@
 
 #include <QtGlobal>
 
-#if defined(Q_OS_WIN32)
+#ifdef Q_OS_WIN32
 #    include <windows.h>
 #elif defined(Q_OS_UNIX)
 #    include <ctime>
@@ -14,7 +14,7 @@
 namespace swift::misc
 {
 
-#if defined(Q_OS_WIN32)
+#ifdef Q_OS_WIN32
 
     static int getCpuTimeMs(const FILETIME &kernelTime, const FILETIME &userTime)
     {

src/misc/processinfo.cpp

@@ -8,7 +8,7 @@
 #include <QFile>
 #include <QFileInfo>
 
-#if defined(Q_OS_MACOS)
+#ifdef Q_OS_MACOS
 #    include <libproc.h>
 #elif defined(Q_OS_WIN)
 #    ifndef NOMINMAX
@@ -30,7 +30,7 @@ namespace swift::misc
         return QStringLiteral("{ %1, %2 }").arg(QString::number(m_pid), m_name);
     }
 
-#if defined(Q_OS_LINUX)
+#ifdef Q_OS_LINUX
     QString CProcessInfo::processNameFromId(qint64 pid)
     {
         QString path = QFileInfo(QStringLiteral("/proc/%1/exe").arg(pid)).symLinkTarget();

src/misc/simulation/xplane/xplaneutil.cpp

@@ -15,7 +15,7 @@
 #include "misc/fileutils.h"
 #include "misc/swiftdirectories.h"
 
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
 #    include <ShlObj.h>
 #endif
 
@@ -47,7 +47,7 @@ namespace swift::misc::simulation::xplane
         return lastLine;
     }
 
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
     QString getWindowsLocalAppDataPath()
     {
         QString result;
@@ -85,7 +85,7 @@ namespace swift::misc::simulation::xplane
     {
         //! \fixme KB 8/17 we could also use the runtime CBuildConfig decision here, which looks nicer (I personally
         //! always try to avoid ifdef)
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
         return CFileUtils::appendFilePathsAndFixUnc(getWindowsLocalAppDataPath(), xplaneInstallFile);
 #elif defined(Q_OS_LINUX)
         static const QString xp(".x-plane");