diff -rupN src/qtlocalpeer.cpp.old src/qtlocalpeer.cpp
--- src/qtlocalpeer.cpp.old 2014-02-12 22:46:28.000000000 +0100
+++ src/qtlocalpeer.cpp 2014-08-14 19:03:48.684940326 +0200
@@ -55,15 +55,6 @@ static PProcessIdToSessionId pProcessIdT
#include <unistd.h>
#endif
-namespace QtLP_Private {
-#include "qtlockedfile.cpp"
-#if defined(Q_OS_WIN)
-#include "qtlockedfile_win.cpp"
-#else
-#include "qtlockedfile_unix.cpp"
-#endif
-}
-
const char* QtLocalPeer::ack = "ack";
QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
@@ -114,7 +105,7 @@ bool QtLocalPeer::isClient()
if (lockFile.isLocked())
return false;
- if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
+ if (!lockFile.lock(QtLockedFile::WriteLock, false))
return true;
bool res = server->listen(socketName);
I file binari src/.qtlocalpeer.cpp.swp e src/.qtlocalpeer.cpp.swp sono.old diversi
diff -rupN src/qtlocalpeer.h.old src/qtlocalpeer.h
--- src/qtlocalpeer.h.old 2014-02-12 22:46:28.000000000 +0100
+++ src/qtlocalpeer.h 2014-08-14 19:04:28.166323264 +0200
@@ -68,7 +68,7 @@ protected:
QString id;
QString socketName;
QLocalServer* server;
- QtLP_Private::QtLockedFile lockFile;
+ QtLockedFile lockFile;
private:
static const char* ack;
diff -rupN src/qtsingleapplication.pri.old src/qtsingleapplication.pri
--- src/qtsingleapplication.pri.old 2014-02-12 22:46:28.000000000 +0100
+++ src/qtsingleapplication.pri 2014-08-14 19:05:18.161808149 +0200
@@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
QT *= network
greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
+CONFIG *= qtlockedfile
qtsingleapplication-uselib:!qtsingleapplication-buildlib {
LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
--- src/qtsinglecoreapplication.pri.old 2014-08-15 16:21:57.614300927 +0200
+++ src/qtsinglecoreapplication.pri 2014-08-15 16:22:34.117645461 +0200
@@ -4,6 +4,7 @@ DEPENDPATH += $$PWD
QT *= network
QT -= gui
+CONFIG *= qtlockedfile
qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib {
LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME