projects / packages / QtSingleApplication.git / blame
| Commit | Line | Data |
|---|---|---|
| e21d7483 ER |
1 | diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp |
| 2 | --- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp 2009-12-16 05:43:33.000000000 -0500 | |
| 099d1b50 | 3 | +++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2010-07-21 22:10:43.000000000 -0400 |
| e21d7483 ER |
4 | @@ -59,15 +59,6 @@ static PProcessIdToSessionId pProcessIdT |
| 5 | #include <time.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 | @@ -118,7 +109,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 | diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h | |
| 30 | --- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h 2009-12-16 05:43:33.000000000 -0500 | |
| 099d1b50 | 31 | +++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h 2010-07-21 22:10:43.000000000 -0400 |
| e21d7483 ER |
32 | @@ -49,9 +49,7 @@ |
| 33 | #include <QtNetwork/QLocalSocket> | |
| 34 | #include <QtCore/QDir> | |
| 35 | ||
| 36 | -namespace QtLP_Private { | |
| 37 | #include "qtlockedfile.h" | |
| 38 | -} | |
| 39 | ||
| 40 | class QtLocalPeer : public QObject | |
| 41 | { | |
| 42 | @@ -74,7 +72,7 @@ protected: | |
| 43 | QString id; | |
| 44 | QString socketName; | |
| 45 | QLocalServer* server; | |
| 46 | - QtLP_Private::QtLockedFile lockFile; | |
| 47 | + QtLockedFile lockFile; | |
| 48 | ||
| 49 | private: | |
| 50 | static const char* ack; | |
| 51 | diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri | |
| 52 | --- qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri 2009-12-16 05:43:33.000000000 -0500 | |
| 099d1b50 | 53 | +++ qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri 2010-07-21 22:11:08.000000000 -0400 |
| e21d7483 ER |
54 | @@ -2,6 +2,7 @@ include(../common.pri) |
| 55 | INCLUDEPATH += $$PWD | |
| 56 | DEPENDPATH += $$PWD | |
| 57 | QT *= network | |
| 58 | +CONFIG *= qtlockedfile | |
| 59 | ||
| 60 | qtsingleapplication-uselib:!qtsingleapplication-buildlib { | |
| 61 | LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME | |
| 62 | diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri | |
| 099d1b50 ER |
63 | --- qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri 2010-07-21 22:12:19.000000000 -0400 |
| 64 | +++ qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri 2010-07-21 22:10:29.000000000 -0400 | |
| 65 | @@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD | |
| 66 | DEPENDPATH += $$PWD | |
| e21d7483 | 67 | QT *= network |
| 099d1b50 ER |
68 | QT -= gui |
| 69 | +CONFIG *= qtlockedfile | |
| e21d7483 | 70 | |
| 099d1b50 ER |
71 | qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib { |
| 72 | LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME |