Code cleanup, no functional changes intended.

Change-Id: Iaf594b4a1cb267e4186afa089f292f83d13d6de4
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>

7 files changed, 29 insertions, 20 deletions

diff --git a/src/libs/kdtools/kdlockfile.cpp b/src/libs/kdtools/kdlockfile.cpp
index db9509f0b..d4bfd6365 100644
--- a/src/libs/kdtools/kdlockfile.cpp
+++ b/src/libs/kdtools/kdlockfile.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -44,7 +45,7 @@ KDLockFile::Private::Private(const QString &filename_)
 }
 
 KDLockFile::KDLockFile(const QString &name)
-    : d( new Private(name))
+    : d(new Private(name))
 {
 }
 
diff --git a/src/libs/kdtools/kdlockfile.h b/src/libs/kdtools/kdlockfile.h
index 0a6309461..348d2f72e 100644
--- a/src/libs/kdtools/kdlockfile.h
+++ b/src/libs/kdtools/kdlockfile.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -32,13 +33,15 @@
 **
 ****************************************************************************/
 
-#ifndef KDTOOLS_KDLOCKFILE_H
-#define KDTOOLS_KDLOCKFILE_H
+#ifndef KDLOCKFILE_H
+#define KDLOCKFILE_H
 
 #include <kdtoolsglobal.h>
 
 class KDTOOLS_EXPORT KDLockFile
 {
+    Q_DISABLE_COPY(KDLockFile)
+
 public:
     explicit KDLockFile(const QString &name);
     ~KDLockFile();
@@ -49,9 +52,8 @@ public:
     bool unlock();
 
 private:
-    Q_DISABLE_COPY(KDLockFile)
     class Private;
     Private *d;
 };
 
-#endif // KDTOOLS_KDLOCKFILE_H
+#endif // KDLOCKFILE_H
diff --git a/src/libs/kdtools/kdlockfile_p.h b/src/libs/kdtools/kdlockfile_p.h
index 992935b5a..56d779b7a 100644
--- a/src/libs/kdtools/kdlockfile_p.h
+++ b/src/libs/kdtools/kdlockfile_p.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -32,13 +33,15 @@
 **
 ****************************************************************************/
 
-#ifndef __KDTOOLSCORE_KDLOCKFILE_P_H__
-#define __KDTOOLSCORE_KDLOCKFILE_P_H__
+#ifndef KDLOCKFILE_P_H
+#define KDLOCKFILE_P_H
 
 #include "kdlockfile.h"
-#include <QtCore/QString>
+
+#include <QString>
+
 #ifdef Q_OS_WIN
-#include <windows.h>
+# include <qt_windows.h>
 #endif
 
 class KDLockFile::Private
@@ -61,4 +64,4 @@ private:
     bool locked;
 };
 
-#endif // LOCKFILE_P_H
+#endif // KDLOCKFILE_P_H
diff --git a/src/libs/kdtools/kdlockfile_unix.cpp b/src/libs/kdtools/kdlockfile_unix.cpp
index c7f40d287..5c5a052d1 100644
--- a/src/libs/kdtools/kdlockfile_unix.cpp
+++ b/src/libs/kdtools/kdlockfile_unix.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -34,12 +35,10 @@
 
 #include "kdlockfile_p.h"
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 #include <cerrno>
-
 #include <sys/file.h>
-
 #include <unistd.h>
 
 KDLockFile::Private::~Private()
diff --git a/src/libs/kdtools/kdlockfile_win.cpp b/src/libs/kdtools/kdlockfile_win.cpp
index ad6a6181c..6a75401f2 100644
--- a/src/libs/kdtools/kdlockfile_win.cpp
+++ b/src/libs/kdtools/kdlockfile_win.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -35,8 +36,8 @@
 #include "kdlockfile.h"
 #include "kdlockfile_p.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFileInfo>
+#include <QCoreApplication>
+#include <QFileInfo>
 
 KDLockFile::Private::~Private()
 {
diff --git a/src/libs/kdtools/kdrunoncechecker.cpp b/src/libs/kdtools/kdrunoncechecker.cpp
index f75744e47..7be12d425 100644
--- a/src/libs/kdtools/kdrunoncechecker.cpp
+++ b/src/libs/kdtools/kdrunoncechecker.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -36,10 +37,10 @@
 #include "kdlockfile.h"
 #include "kdsysinfo.h"
 
-#include <QtCore/QList>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFileInfo>
+#include <QList>
 
 #include <algorithm>
 
diff --git a/src/libs/kdtools/kdrunoncechecker.h b/src/libs/kdtools/kdrunoncechecker.h
index cb2cdbfcc..5c43e596e 100644
--- a/src/libs/kdtools/kdrunoncechecker.h
+++ b/src/libs/kdtools/kdrunoncechecker.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -41,6 +42,8 @@
 
 class KDTOOLS_EXPORT KDRunOnceChecker
 {
+    Q_DISABLE_COPY(KDRunOnceChecker)
+
 public:
     enum Dependencies { ProcessList, Lockfile, Both };
 
@@ -49,7 +52,6 @@ public:
     bool isRunning(Dependencies depends);
 
 private:
-    Q_DISABLE_COPY(KDRunOnceChecker)
     class Private;
     Private *d;
 };