projects / packages / QtSingleApplication.git / blame
| Commit | Line | Data |
|---|---|---|
| 5c92ed78 ER |
1 | diff -rupN src/qtlocalpeer.cpp.old src/qtlocalpeer.cpp |
| 2 | --- src/qtlocalpeer.cpp.old 2014-02-12 22:46:28.000000000 +0100 | |
| 3 | +++ src/qtlocalpeer.cpp 2014-08-14 19:03:48.684940326 +0200 | |
| 4 | @@ -55,15 +55,6 @@ static PProcessIdToSessionId pProcessIdT | |
| 5 | #include <unistd.h> | |
| 6 | #endif | |
| 7 | ||
| 8 | -namespace QtLP_Private { | |
| 9 | -#include "qtlockedfile.cpp" | |
| 10 | -#if defined(Q_OS_WIN) | |
| 11 | -#include "qtlockedfile_win.cpp" | |
| 12 | -#else | |
| 13 | -#include "qtlockedfile_unix.cpp" | |
| 14 | -#endif | |
| 15 | -} | |
| 16 | - | |
| 17 | const char* QtLocalPeer::ack = "ack"; | |
| 18 | ||
| 19 | QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId) | |
| 20 | @@ -114,7 +105,7 @@ bool QtLocalPeer::isClient() | |
| 21 | if (lockFile.isLocked()) | |
| 22 | return false; | |
| 23 | ||
| 24 | - if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false)) | |
| 25 | + if (!lockFile.lock(QtLockedFile::WriteLock, false)) | |
| 26 | return true; | |
| 27 | ||
| 28 | bool res = server->listen(socketName); | |
| 29 | I file binari src/.qtlocalpeer.cpp.swp e src/.qtlocalpeer.cpp.swp sono.old diversi | |
| 30 | diff -rupN src/qtlocalpeer.h.old src/qtlocalpeer.h | |
| 31 | --- src/qtlocalpeer.h.old 2014-02-12 22:46:28.000000000 +0100 | |
| 32 | +++ src/qtlocalpeer.h 2014-08-14 19:04:28.166323264 +0200 | |
| 33 | @@ -68,7 +68,7 @@ protected: | |
| 34 | QString id; | |
| 35 | QString socketName; | |
| 36 | QLocalServer* server; | |
| 37 | - QtLP_Private::QtLockedFile lockFile; | |
| 38 | + QtLockedFile lockFile; | |
| 39 | ||
| 40 | private: | |
| 41 | static const char* ack; | |
| 42 | diff -rupN src/qtsingleapplication.pri.old src/qtsingleapplication.pri | |
| 43 | --- src/qtsingleapplication.pri.old 2014-02-12 22:46:28.000000000 +0100 | |
| 44 | +++ src/qtsingleapplication.pri 2014-08-14 19:05:18.161808149 +0200 | |
| 45 | @@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD | |
| 46 | DEPENDPATH += $$PWD | |
| 47 | QT *= network | |
| 48 | greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets | |
| 49 | +CONFIG *= qtlockedfile | |
| 50 | ||
| 51 | qtsingleapplication-uselib:!qtsingleapplication-buildlib { | |
| 52 | LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME | |
| 53 | --- src/qtsinglecoreapplication.pri.old 2014-08-15 16:21:57.614300927 +0200 | |
| 54 | +++ src/qtsinglecoreapplication.pri 2014-08-15 16:22:34.117645461 +0200 | |
| 55 | @@ -4,6 +4,7 @@ DEPENDPATH += $$PWD | |
| 56 | ||
| 57 | QT *= network | |
| 58 | QT -= gui | |
| 59 | +CONFIG *= qtlockedfile | |
| 60 | ||
| 61 | qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib { | |
| 62 | LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME |