diff options
author | Kevin Ottens <kevin.ottens@nextcloud.com> | 2020-05-18 21:39:16 +0300 |
---|---|---|
committer | Michael Schuster <michael@schuster.ms> | 2020-05-20 03:21:26 +0300 |
commit | dea6ebaa35072f6e7c6374193ab0396fb9d8a3a8 (patch) | |
tree | f5a65fad08a060fab58cc50ae143bae8778e3f11 /src/3rdparty | |
parent | 0c040c9686fe01002e6a665bed20c4610fc1b602 (diff) |
Use nullptr when appropriate
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/qtsingleapplication/qtlocalpeer.cpp | 2 | ||||
-rw-r--r-- | src/3rdparty/qtsingleapplication/qtsingleapplication.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp index 3ebba6e6f..f7229df5a 100644 --- a/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp +++ b/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp @@ -123,7 +123,7 @@ bool QtLocalPeer::sendMessage(const QString &message, int timeout, bool block) Sleep(DWORD(ms)); #else struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 }; - nanosleep(&ts, NULL); + nanosleep(&ts, nullptr); #endif } if (!connOk) diff --git a/src/3rdparty/qtsingleapplication/qtsingleapplication.cpp b/src/3rdparty/qtsingleapplication/qtsingleapplication.cpp index 844824cb4..5934d1cb3 100644 --- a/src/3rdparty/qtsingleapplication/qtsingleapplication.cpp +++ b/src/3rdparty/qtsingleapplication/qtsingleapplication.cpp @@ -53,7 +53,7 @@ static QString instancesLockFilename(const QString &appSessionId) QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char **argv) : QApplication(argc, argv), firstPeer(-1), - pidPeer(0) + pidPeer(nullptr) { this->appId = appId; @@ -61,7 +61,7 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char * // This shared memory holds a zero-terminated array of active (or crashed) instances instances = new QSharedMemory(appSessionId, this); - actWin = 0; + actWin = nullptr; block = false; // First instance creates the shared memory, later instances attach to it @@ -71,7 +71,7 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char * qWarning() << "Failed to initialize instances shared memory: " << instances->errorString(); delete instances; - instances = 0; + instances = nullptr; return; } } |