Remove automatic unlock, we do not automatically lock either.

Change and shuffle some parts of the code. Move constructor code
into private file. Remove Destructor. Do not automatically unlock
on destruction, we do not lock automatically on construction either.

Change-Id: I48624a64266954bdc0434a523519a008afc6aac7
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

4 files changed, 6 insertions, 20 deletions

diff --git a/src/libs/kdtools/kdlockfile.cpp b/src/libs/kdtools/kdlockfile.cpp
index d4bfd6365..42d6d5711 100644
--- a/src/libs/kdtools/kdlockfile.cpp
+++ b/src/libs/kdtools/kdlockfile.cpp
@@ -34,16 +34,8 @@
 ****************************************************************************/
 
 #include "kdlockfile.h"
-
 #include "kdlockfile_p.h"
 
-KDLockFile::Private::Private(const QString &filename_)
-    : filename(filename_)
-    , handle(0)
-    , locked(false)
-{
-}
-
 KDLockFile::KDLockFile(const QString &name)
     : d(new Private(name))
 {
diff --git a/src/libs/kdtools/kdlockfile_p.h b/src/libs/kdtools/kdlockfile_p.h
index 56d779b7a..152393b85 100644
--- a/src/libs/kdtools/kdlockfile_p.h
+++ b/src/libs/kdtools/kdlockfile_p.h
@@ -47,8 +47,12 @@
 class KDLockFile::Private
 {
 public:
-    explicit Private( const QString& filename );
-    ~Private();
+    explicit Private(const QString& name)
+        : filename(name)
+        , handle(0)
+        , locked(false)
+    {}
+
     bool lock();
     bool unlock();
 
diff --git a/src/libs/kdtools/kdlockfile_unix.cpp b/src/libs/kdtools/kdlockfile_unix.cpp
index 5c5a052d1..e6b3dbe9d 100644
--- a/src/libs/kdtools/kdlockfile_unix.cpp
+++ b/src/libs/kdtools/kdlockfile_unix.cpp
@@ -41,11 +41,6 @@
 #include <sys/file.h>
 #include <unistd.h>
 
-KDLockFile::Private::~Private()
-{
-    unlock();
-}
-
 bool KDLockFile::Private::lock()
 {
     if (locked)
diff --git a/src/libs/kdtools/kdlockfile_win.cpp b/src/libs/kdtools/kdlockfile_win.cpp
index 6a75401f2..c9ace2de8 100644
--- a/src/libs/kdtools/kdlockfile_win.cpp
+++ b/src/libs/kdtools/kdlockfile_win.cpp
@@ -39,11 +39,6 @@
 #include <QCoreApplication>
 #include <QFileInfo>
 
-KDLockFile::Private::~Private()
-{
-    unlock();
-}
-
 bool KDLockFile::Private::lock()
 {
     const QFileInfo fi(filename);