diff options
Diffstat (limited to 'src/corelib/thread/qreadwritelock.h')
-rw-r--r-- | src/corelib/thread/qreadwritelock.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h index 4260d090b6..6b48b6ebd9 100644 --- a/src/corelib/thread/qreadwritelock.h +++ b/src/corelib/thread/qreadwritelock.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -172,18 +172,18 @@ class Q_CORE_EXPORT QReadWriteLock { public: enum RecursionMode { NonRecursive, Recursive }; - inline explicit QReadWriteLock(RecursionMode = NonRecursive) { } + inline explicit QReadWriteLock(RecursionMode = NonRecursive) Q_DECL_NOTHROW { } inline ~QReadWriteLock() { } - static inline void lockForRead() { } - static inline bool tryLockForRead() { return true; } - static inline bool tryLockForRead(int timeout) { Q_UNUSED(timeout); return true; } + static inline void lockForRead() Q_DECL_NOTHROW { } + static inline bool tryLockForRead() Q_DECL_NOTHROW { return true; } + static inline bool tryLockForRead(int timeout) Q_DECL_NOTHROW { Q_UNUSED(timeout); return true; } - static inline void lockForWrite() { } - static inline bool tryLockForWrite() { return true; } - static inline bool tryLockForWrite(int timeout) { Q_UNUSED(timeout); return true; } + static inline void lockForWrite() Q_DECL_NOTHROW { } + static inline bool tryLockForWrite() Q_DECL_NOTHROW { return true; } + static inline bool tryLockForWrite(int timeout) Q_DECL_NOTHROW { Q_UNUSED(timeout); return true; } - static inline void unlock() { } + static inline void unlock() Q_DECL_NOTHROW { } private: Q_DISABLE_COPY(QReadWriteLock) @@ -192,12 +192,12 @@ private: class Q_CORE_EXPORT QReadLocker { public: - inline QReadLocker(QReadWriteLock *) { } - inline ~QReadLocker() { } + inline QReadLocker(QReadWriteLock *) Q_DECL_NOTHROW { } + inline ~QReadLocker() Q_DECL_NOTHROW { } - static inline void unlock() { } - static inline void relock() { } - static inline QReadWriteLock *readWriteLock() { return 0; } + static inline void unlock() Q_DECL_NOTHROW { } + static inline void relock() Q_DECL_NOTHROW { } + static inline QReadWriteLock *readWriteLock() Q_DECL_NOTHROW { return Q_NULLPTR; } private: Q_DISABLE_COPY(QReadLocker) @@ -206,12 +206,12 @@ private: class Q_CORE_EXPORT QWriteLocker { public: - inline explicit QWriteLocker(QReadWriteLock *) { } - inline ~QWriteLocker() { } + inline explicit QWriteLocker(QReadWriteLock *) Q_DECL_NOTHROW { } + inline ~QWriteLocker() Q_DECL_NOTHROW { } - static inline void unlock() { } - static inline void relock() { } - static inline QReadWriteLock *readWriteLock() { return 0; } + static inline void unlock() Q_DECL_NOTHROW { } + static inline void relock() Q_DECL_NOTHROW { } + static inline QReadWriteLock *readWriteLock() Q_DECL_NOTHROW { return Q_NULLPTR; } private: Q_DISABLE_COPY(QWriteLocker) |