From 0d0e2cf9e0a2acf5ce13c323544ea67b14d60122 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Wed, 15 Mar 2017 18:35:16 +0000
Subject: [PATCH] refs #884 Refactoring: moved method.

---
 src/blackmisc/datacache.cpp | 24 +++---------------------
 src/blackmisc/fileutils.cpp | 18 ++++++++++++++++++
 src/blackmisc/fileutils.h   |  4 ++++
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp
index 3c863d911..02f36e71f 100644
--- a/src/blackmisc/datacache.cpp
+++ b/src/blackmisc/datacache.cpp
@@ -180,24 +180,6 @@ namespace BlackMisc
         return p;
     }
 
-    QString lockFileError(const QLockFile &lock)
-    {
-        switch (lock.error())
-        {
-        case QLockFile::NoError: return "No error";
-        case QLockFile::PermissionError: return "Insufficient permission";
-        case QLockFile::UnknownError: return "Unknown filesystem error";
-        case QLockFile::LockFailedError:
-            {
-                QString hostname, appname;
-                qint64 pid = 0;
-                lock.getLockInfo(&pid, &hostname, &appname);
-                return QString("Lock open in another process (%1 %2 on %3)").arg(hostname, QString::number(pid), appname);
-            }
-        default: return "Bad error number";
-        }
-    }
-
     void CDataCache::saveToStoreAsync(const BlackMisc::CValueCachePacket &values)
     {
         singleShot(0, &m_serializer, [this, values]
@@ -370,7 +352,7 @@ namespace BlackMisc
 
         if (! m_lockFile.lock())
         {
-            CLogMessage(this).error("Failed to lock %1: %2") << m_basename << lockFileError(m_lockFile);
+            CLogMessage(this).error("Failed to lock %1: %2") << m_basename << CFileUtils::lockFileError(m_lockFile);
             return {};
         }
         m_updateInProgress = true;
@@ -636,7 +618,7 @@ namespace BlackMisc
 
         if (! m_lockFile.lock())
         {
-            CLogMessage(this).error("Failed to lock %1: %2") << m_basename << lockFileError(m_lockFile);
+            CLogMessage(this).error("Failed to lock %1: %2") << m_basename << CFileUtils::lockFileError(m_lockFile);
             m_lockFile.unlock();
             return;
         }
@@ -672,7 +654,7 @@ namespace BlackMisc
 
         if (! m_lockFile.lock())
         {
-            CLogMessage(this).error("Failed to lock %1: %2") << m_basename << lockFileError(m_lockFile);
+            CLogMessage(this).error("Failed to lock %1: %2") << m_basename << CFileUtils::lockFileError(m_lockFile);
             m_lockFile.unlock();
             return 0;
         }
diff --git a/src/blackmisc/fileutils.cpp b/src/blackmisc/fileutils.cpp
index 9f47e7272..e4069f02a 100644
--- a/src/blackmisc/fileutils.cpp
+++ b/src/blackmisc/fileutils.cpp
@@ -328,4 +328,22 @@ namespace BlackMisc
         );
         return executables;
     }
+
+    QString CFileUtils::lockFileError(const QLockFile &lockFile)
+    {
+        switch (lockFile.error())
+        {
+        case QLockFile::NoError: return QStringLiteral("No error");
+        case QLockFile::PermissionError: return QStringLiteral("Insufficient permission");
+        case QLockFile::UnknownError: return QStringLiteral("Unknown error");
+        case QLockFile::LockFailedError:
+            {
+                QString hostname, appname;
+                qint64 pid = 0;
+                lockFile.getLockInfo(&pid, &hostname, &appname);
+                return QStringLiteral("Lock open in another process (%1 %2 on %3)").arg(hostname, QString::number(pid), appname);
+            }
+        default: return QStringLiteral("Bad error number");
+        }
+    }
 } // ns
diff --git a/src/blackmisc/fileutils.h b/src/blackmisc/fileutils.h
index e305da0e9..2aaf46dd5 100644
--- a/src/blackmisc/fileutils.h
+++ b/src/blackmisc/fileutils.h
@@ -17,6 +17,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QFileInfoList>
+#include <QLockFile>
 #include <QString>
 #include <QStringList>
 #include <Qt>
@@ -122,6 +123,9 @@ namespace BlackMisc
 
         //! Get all swift executables
         static const QStringList &getSwiftExecutables();
+
+        //! Error message explaining why a QLockFile failed to lock.
+        static QString lockFileError(const QLockFile &lockFile);
     };
 } // ns