Adjust include guards.

Change-Id: I0252c934b3bcdca254ae6915904d84d5cf013f5a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

22 files changed, 66 insertions, 66 deletions

diff --git a/src/libs/kdtools/environment.h b/src/libs/kdtools/environment.h
index d590d6dcd..b86c5f6c4 100644
--- a/src/libs/kdtools/environment.h
+++ b/src/libs/kdtools/environment.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef LIBINSTALLER_ENVIRONMENT_H
-#define LIBINSTALLER_ENVIRONMENT_H
+#ifndef ENVIRONMENT_H
+#define ENVIRONMENT_H
 
 #include "kdtoolsglobal.h"
 
@@ -70,4 +70,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif
+#endif // ENVIRONMENT_H
diff --git a/src/libs/kdtools/filedownloader.h b/src/libs/kdtools/filedownloader.h
index a74097625..fcc695d5f 100644
--- a/src/libs/kdtools/filedownloader.h
+++ b/src/libs/kdtools/filedownloader.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_FILE_DOWNLOADER_H
-#define KD_UPDATER_FILE_DOWNLOADER_H
+#ifndef FILEDOWNLOADER_H
+#define FILEDOWNLOADER_H
 
 #include "kdtoolsglobal.h"
 
@@ -144,4 +144,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_FILE_DOWNLOADER_H
+#endif // FILEDOWNLOADER_H
diff --git a/src/libs/kdtools/filedownloader_p.h b/src/libs/kdtools/filedownloader_p.h
index b787e8392..d2b5826f6 100644
--- a/src/libs/kdtools/filedownloader_p.h
+++ b/src/libs/kdtools/filedownloader_p.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_FILE_DOWNLOADER_P_H
-#define KD_UPDATER_FILE_DOWNLOADER_P_H
+#ifndef FILEDOWNLOADER_P_H
+#define FILEDOWNLOADER_P_H
 
 #include "filedownloader.h"
 
@@ -147,4 +147,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_FILE_DOWNLOADER_P_H
+#endif // FILEDOWNLOADER_P_H
diff --git a/src/libs/kdtools/filedownloaderfactory.h b/src/libs/kdtools/filedownloaderfactory.h
index 6f3740489..cc1ef66a5 100644
--- a/src/libs/kdtools/filedownloaderfactory.h
+++ b/src/libs/kdtools/filedownloaderfactory.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_FILE_DOWNLOADER_FACTORY_H
-#define KD_UPDATER_FILE_DOWNLOADER_FACTORY_H
+#ifndef FILEDOWNLOADERFACTORY_H
+#define FILEDOWNLOADERFACTORY_H
 
 #include "genericfactory.h"
 #include "updater.h"
@@ -104,4 +104,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_FILE_DOWNLOADER_FACTORY_H
+#endif // FILEDOWNLOADERFACTORY_H
diff --git a/src/libs/kdtools/genericfactory.h b/src/libs/kdtools/genericfactory.h
index 29051e22a..9b9b97275 100644
--- a/src/libs/kdtools/genericfactory.h
+++ b/src/libs/kdtools/genericfactory.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KDTOOLS__KDGENERICFACTORY_H
-#define KDTOOLS__KDGENERICFACTORY_H
+#ifndef GENERICFACTORY_H
+#define GENERICFACTORY_H
 
 #include "kdtoolsglobal.h"
 
@@ -88,4 +88,4 @@ private:
     QHash<IDENTIFIER, FactoryFunction> m_hash;
 };
 
-#endif
+#endif // GENERICFACTORY_H
diff --git a/src/libs/kdtools/job.h b/src/libs/kdtools/job.h
index 14231e7ed..1da87ae6b 100644
--- a/src/libs/kdtools/job.h
+++ b/src/libs/kdtools/job.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KDTOOLS_KDJOB_H
-#define KDTOOLS_KDJOB_H
+#ifndef JOB_H
+#define JOB_H
 
 #include "kdtoolsglobal.h"
 
@@ -118,4 +118,4 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(KDJob::Capabilities)
 
-#endif // KDTOOLS_KDJOB_H
+#endif // JOB_H
diff --git a/src/libs/kdtools/kdtoolsglobal.h b/src/libs/kdtools/kdtoolsglobal.h
index 5daedb9c5..9a40aa40c 100644
--- a/src/libs/kdtools/kdtoolsglobal.h
+++ b/src/libs/kdtools/kdtoolsglobal.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KDTOOLS_KDTOOLSGLOBAL_H
-#define KDTOOLS_KDTOOLSGLOBAL_H
+#ifndef KDTOOLSGLOBAL_H
+#define KDTOOLSGLOBAL_H
 
 #include <QtCore/QtGlobal>
 
@@ -47,5 +47,5 @@
 #  define KDTOOLS_EXPORT
 #endif // KDTOOLS_SHARED
 
-#endif // KDTOOLS_KDTOOLSGLOBAL_H
+#endif // KDTOOLSGLOBAL_H
 
diff --git a/src/libs/kdtools/localpackagehub.h b/src/libs/kdtools/localpackagehub.h
index 540b24481..0a7b8513c 100644
--- a/src/libs/kdtools/localpackagehub.h
+++ b/src/libs/kdtools/localpackagehub.h
@@ -33,8 +33,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_PACKAGES_INFO_H
-#define KD_UPDATER_PACKAGES_INFO_H
+#ifndef LOCALPACKAGEHUB_H
+#define LOCALPACKAGEHUB_H
 
 #include "updater.h"
 
@@ -121,4 +121,4 @@ private:
 
 } // KDUpdater
 
-#endif // KD_UPDATER_PACKAGES_INFO_H
+#endif // LOCALPACKAGEHUB_H
diff --git a/src/libs/kdtools/lockfile.h b/src/libs/kdtools/lockfile.h
index 9a762a716..ea008f115 100644
--- a/src/libs/kdtools/lockfile.h
+++ b/src/libs/kdtools/lockfile.h
@@ -33,8 +33,8 @@
 **
 ****************************************************************************/
 
-#ifndef KDLOCKFILE_H
-#define KDLOCKFILE_H
+#ifndef LOCKFILE_H
+#define LOCKFILE_H
 
 #include "kdtoolsglobal.h"
 
@@ -56,4 +56,4 @@ private:
     Private *d;
 };
 
-#endif // KDLOCKFILE_H
+#endif // LOCKFILE_H
diff --git a/src/libs/kdtools/lockfile_p.h b/src/libs/kdtools/lockfile_p.h
index 7bdd74494..81a9d0038 100644
--- a/src/libs/kdtools/lockfile_p.h
+++ b/src/libs/kdtools/lockfile_p.h
@@ -33,8 +33,8 @@
 **
 ****************************************************************************/
 
-#ifndef KDLOCKFILE_P_H
-#define KDLOCKFILE_P_H
+#ifndef LOCKFILE_P_H
+#define LOCKFILE_P_H
 
 #include "lockfile.h"
 
@@ -68,4 +68,4 @@ private:
     bool locked;
 };
 
-#endif // KDLOCKFILE_P_H
+#endif // LOCKFILE_P_H
diff --git a/src/libs/kdtools/runoncechecker.h b/src/libs/kdtools/runoncechecker.h
index cc64e9d06..2c1c4c0e0 100644
--- a/src/libs/kdtools/runoncechecker.h
+++ b/src/libs/kdtools/runoncechecker.h
@@ -33,8 +33,8 @@
 **
 ****************************************************************************/
 
-#ifndef KDTOOLS_RUNONCECHECKER_H
-#define KDTOOLS_RUNONCECHECKER_H
+#ifndef RUNONCECHECKER_H
+#define RUNONCECHECKER_H
 
 #include "lockfile.h"
 
@@ -60,4 +60,4 @@ private:
     KDLockFile m_lockfile;
 };
 
-#endif // KDTOOLS_RUNONCECHECKER_H
+#endif // RUNONCECHECKER_H
diff --git a/src/libs/kdtools/selfrestarter.h b/src/libs/kdtools/selfrestarter.h
index 3808ac207..4d532b2ec 100644
--- a/src/libs/kdtools/selfrestarter.h
+++ b/src/libs/kdtools/selfrestarter.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KDTOOLS_KDSELFRESTARTER_H
-#define KDTOOLS_KDSELFRESTARTER_H
+#ifndef SELFRESTARTER_H
+#define SELFRESTARTER_H
 
 #include "kdtoolsglobal.h"
 
@@ -52,4 +52,4 @@ private:
     Private *d;
 };
 
-#endif // KDTOOLS_KDSELFRESTARTER_H
+#endif // SELFRESTARTER_H
diff --git a/src/libs/kdtools/sysinfo.h b/src/libs/kdtools/sysinfo.h
index 34192f60e..be061c29b 100644
--- a/src/libs/kdtools/sysinfo.h
+++ b/src/libs/kdtools/sysinfo.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KDSYSINFO_H
-#define KDSYSINFO_H
+#ifndef SYSINFO_H
+#define SYSINFO_H
 
 #include "kdtoolsglobal.h"
 
@@ -94,4 +94,4 @@ QT_END_NAMESPACE
 QDebug operator<<(QDebug dbg, KDUpdater::VolumeInfo volume);
 QDebug operator<<(QDebug dbg, KDUpdater::ProcessInfo process);
 
-#endif // KDSYSINFO_H
+#endif // SYSINFO_H
diff --git a/src/libs/kdtools/task.h b/src/libs/kdtools/task.h
index 66e85e662..c975db41e 100644
--- a/src/libs/kdtools/task.h
+++ b/src/libs/kdtools/task.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_TASK_H
-#define KD_UPDATER_TASK_H
+#ifndef TASK_H
+#define TASK_H
 
 #include "updater.h"
 
@@ -117,4 +117,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_TASK_H
+#endif // TASK_H
diff --git a/src/libs/kdtools/update.h b/src/libs/kdtools/update.h
index d301a5360..e2a48a26e 100644
--- a/src/libs/kdtools/update.h
+++ b/src/libs/kdtools/update.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_UPDATE_H
-#define KD_UPDATER_UPDATE_H
+#ifndef UPDATE_H
+#define UPDATE_H
 
 #include "packagesource.h"
 #include "updatesinfo_p.h"
@@ -59,4 +59,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_UPDATE_H
+#endif // UPDATE_H
diff --git a/src/libs/kdtools/updatefinder.h b/src/libs/kdtools/updatefinder.h
index 1cb75d05a..6fca1ef43 100644
--- a/src/libs/kdtools/updatefinder.h
+++ b/src/libs/kdtools/updatefinder.h
@@ -33,8 +33,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_UPDATE_FINDER_H
-#define KD_UPDATER_UPDATE_FINDER_H
+#ifndef UPDATEFINDER_H
+#define UPDATEFINDER_H
 
 #include "task.h"
 #include "packagesource.h"
@@ -73,4 +73,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_UPDATE_FINDER_H
+#endif // UPDATEFINDER_H
diff --git a/src/libs/kdtools/updateoperation.h b/src/libs/kdtools/updateoperation.h
index 17c399c6f..d1c00a43f 100644
--- a/src/libs/kdtools/updateoperation.h
+++ b/src/libs/kdtools/updateoperation.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_UPDATE_OPERATION_H
-#define KD_UPDATER_UPDATE_OPERATION_H
+#ifndef UPDATEOPERATION_H
+#define UPDATEOPERATION_H
 
 #include "updater.h"
 
@@ -110,4 +110,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_UPDATE_OPERATION_H
+#endif // UPDATEOPERATION_H
diff --git a/src/libs/kdtools/updateoperationfactory.h b/src/libs/kdtools/updateoperationfactory.h
index 22b0c7f58..e790a66ea 100644
--- a/src/libs/kdtools/updateoperationfactory.h
+++ b/src/libs/kdtools/updateoperationfactory.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_UPDATE_OPERATION_FACTORY_H
-#define KD_UPDATER_UPDATE_OPERATION_FACTORY_H
+#ifndef UPDATEOPERATIONFACTORY_H
+#define UPDATEOPERATIONFACTORY_H
 
 #include "genericfactory.h"
 
@@ -67,4 +67,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_UPDATE_OPERATION_FACTORY_H
+#endif // UPDATEOPERATIONFACTORY_H
diff --git a/src/libs/kdtools/updateoperations.h b/src/libs/kdtools/updateoperations.h
index b0a49a08d..261e382fd 100644
--- a/src/libs/kdtools/updateoperations.h
+++ b/src/libs/kdtools/updateoperations.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_UPDATE_OPERATIONS_H
-#define KD_UPDATER_UPDATE_OPERATIONS_H
+#ifndef UPDATEOPERATIONS_H
+#define UPDATEOPERATIONS_H
 
 #include "updateoperation.h"
 
@@ -128,4 +128,4 @@ public:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_UPDATE_OPERATIONS_H
+#endif // UPDATEOPERATIONS_H
diff --git a/src/libs/kdtools/updater.h b/src/libs/kdtools/updater.h
index bd873227a..47c571419 100644
--- a/src/libs/kdtools/updater.h
+++ b/src/libs/kdtools/updater.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_H
-#define KD_UPDATER_H
+#ifndef UPDATER_H
+#define UPDATER_H
 
 #include "kdtoolsglobal.h"
 
@@ -51,4 +51,4 @@ namespace KDUpdater
     KDTOOLS_EXPORT int compareVersion(const QString &v1, const QString &v2);
 }
 
-#endif
+#endif // UPDATER_H
diff --git a/src/libs/kdtools/updatesinfo_p.h b/src/libs/kdtools/updatesinfo_p.h
index 831440a62..6838222ca 100644
--- a/src/libs/kdtools/updatesinfo_p.h
+++ b/src/libs/kdtools/updatesinfo_p.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_UPDATE_INFO_H
-#define KD_UPDATER_UPDATE_INFO_H
+#ifndef UPDATESINFO_P_H
+#define UPDATESINFO_P_H
 
 #include "updater.h"
 #include "updatesinfodata_p.h"
@@ -88,4 +88,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_UPDATE_INFO_H
+#endif // UPDATESINFO_P_H
diff --git a/src/libs/kdtools/updatesinfodata_p.h b/src/libs/kdtools/updatesinfodata_p.h
index 402c25567..a04b15f18 100644
--- a/src/libs/kdtools/updatesinfodata_p.h
+++ b/src/libs/kdtools/updatesinfodata_p.h
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef KD_UPDATER_UPDATE_INFO_DATA_H
-#define KD_UPDATER_UPDATE_INFO_DATA_H
+#ifndef UPDATESINFODATA_P_H
+#define UPDATESINFODATA_P_H
 
 #include <QCoreApplication>
 #include <QSharedData>
@@ -70,4 +70,4 @@ private:
 
 } // namespace KDUpdater
 
-#endif // KD_UPDATER_UPDATE_INFO_DATA_H
+#endif // UPDATESINFODATA_P_H