diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 21:33:57 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 21:33:57 +0100 |
commit | a6ca348636dd92ab1445cff2286b3293163f5cea (patch) | |
tree | a7eba2d2bf7928ebff553f300dd4bacd824bce75 /src/shared/qtlockedfile | |
parent | 07da7ccfdf6e991c282dafdc9b4337db81a1a054 (diff) |
remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
Diffstat (limited to 'src/shared/qtlockedfile')
-rw-r--r-- | src/shared/qtlockedfile/qtlockedfile.h | 6 | ||||
-rw-r--r-- | src/shared/qtlockedfile/qtlockedfile_unix.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/shared/qtlockedfile/qtlockedfile.h b/src/shared/qtlockedfile/qtlockedfile.h index ebf7217182..3ee58a8076 100644 --- a/src/shared/qtlockedfile/qtlockedfile.h +++ b/src/shared/qtlockedfile/qtlockedfile.h @@ -52,18 +52,18 @@ namespace SharedTools { class QT_QTLOCKEDFILE_EXPORT QtLockedFile : public QFile { -public: +public: enum LockMode { NoLock = 0, ReadLock, WriteLock }; QtLockedFile(); QtLockedFile(const QString &name); ~QtLockedFile(); - + bool lock(LockMode mode, bool block = true); bool unlock(); bool isLocked() const; LockMode lockMode() const; - + private: #ifdef Q_OS_WIN Qt::HANDLE m_semaphore_hnd; diff --git a/src/shared/qtlockedfile/qtlockedfile_unix.cpp b/src/shared/qtlockedfile/qtlockedfile_unix.cpp index b83129e370..32930ef003 100644 --- a/src/shared/qtlockedfile/qtlockedfile_unix.cpp +++ b/src/shared/qtlockedfile/qtlockedfile_unix.cpp @@ -42,10 +42,10 @@ bool QtLockedFile::lock(LockMode mode, bool block) qWarning("QtLockedFile::lock(): file is not opened"); return false; } - + if (mode == NoLock) return unlock(); - + if (mode == m_lock_mode) return true; @@ -59,14 +59,14 @@ bool QtLockedFile::lock(LockMode mode, bool block) fl.l_type = (mode == ReadLock) ? F_RDLCK : F_WRLCK; int cmd = block ? F_SETLKW : F_SETLK; int ret = fcntl(handle(), cmd, &fl); - + if (ret == -1) { if (errno != EINTR && errno != EAGAIN) qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno)); return false; } - + m_lock_mode = mode; return true; } @@ -88,12 +88,12 @@ bool QtLockedFile::unlock() fl.l_len = 0; fl.l_type = F_UNLCK; int ret = fcntl(handle(), F_SETLKW, &fl); - + if (ret == -1) { qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno)); return false; } - + m_lock_mode = NoLock; return true; } |