Coding standard

This commit is contained in:
Atlante45 2015-11-10 18:22:30 -08:00
parent 7cf2ad2215
commit 4d8fa58dd3
2 changed files with 30 additions and 30 deletions

View file

@ -30,22 +30,22 @@ public:
private:
Q_DISABLE_COPY(QTryReadLocker)
quintptr q_val;
quintptr _val;
};
// Implementation
inline QTryReadLocker::QTryReadLocker(QReadWriteLock *areadWriteLock) :
q_val(reinterpret_cast<quintptr>(areadWriteLock))
inline QTryReadLocker::QTryReadLocker(QReadWriteLock* areadWriteLock) :
_val(reinterpret_cast<quintptr>(areadWriteLock))
{
Q_ASSERT_X((q_val & quintptr(1u)) == quintptr(0),
Q_ASSERT_X((_val & quintptr(1u)) == quintptr(0),
"QTryReadLocker", "QTryReadLocker pointer is misaligned");
tryRelock();
}
inline QTryReadLocker::QTryReadLocker(QReadWriteLock *areadWriteLock, int timeout) :
q_val(reinterpret_cast<quintptr>(areadWriteLock))
inline QTryReadLocker::QTryReadLocker(QReadWriteLock* areadWriteLock, int timeout) :
_val(reinterpret_cast<quintptr>(areadWriteLock))
{
Q_ASSERT_X((q_val & quintptr(1u)) == quintptr(0),
Q_ASSERT_X((_val & quintptr(1u)) == quintptr(0),
"QTryReadLocker", "QTryReadLocker pointer is misaligned");
tryRelock(timeout);
}
@ -55,20 +55,20 @@ inline QTryReadLocker::~QTryReadLocker() {
}
inline bool QTryReadLocker::isLocked() const {
return (q_val & quintptr(1u)) == quintptr(1u);
return (_val & quintptr(1u)) == quintptr(1u);
}
inline void QTryReadLocker::unlock() {
if (q_val && isLocked()) {
q_val &= ~quintptr(1u);
if (_val && isLocked()) {
_val &= ~quintptr(1u);
readWriteLock()->unlock();
}
}
inline bool QTryReadLocker::tryRelock() {
if (q_val && !isLocked()) {
if (_val && !isLocked()) {
if (readWriteLock()->tryLockForRead()) {
q_val |= quintptr(1u);
_val |= quintptr(1u);
return true;
}
}
@ -76,9 +76,9 @@ inline bool QTryReadLocker::tryRelock() {
}
inline bool QTryReadLocker::tryRelock(int timeout) {
if (q_val && !isLocked()) {
if (_val && !isLocked()) {
if (readWriteLock()->tryLockForRead(timeout)) {
q_val |= quintptr(1u);
_val |= quintptr(1u);
return true;
}
}
@ -86,7 +86,7 @@ inline bool QTryReadLocker::tryRelock(int timeout) {
}
inline QReadWriteLock* QTryReadLocker::readWriteLock() const {
return reinterpret_cast<QReadWriteLock*>(q_val & ~quintptr(1u));
return reinterpret_cast<QReadWriteLock*>(_val & ~quintptr(1u));
}
#endif // hifi_QTryReadLocker_h

View file

@ -30,22 +30,22 @@ public:
private:
Q_DISABLE_COPY(QTryWriteLocker)
quintptr q_val;
quintptr _val;
};
// Implementation
inline QTryWriteLocker::QTryWriteLocker(QReadWriteLock *readWriteLock) :
q_val(reinterpret_cast<quintptr>(readWriteLock))
inline QTryWriteLocker::QTryWriteLocker(QReadWriteLock* readWriteLock) :
_val(reinterpret_cast<quintptr>(readWriteLock))
{
Q_ASSERT_X((q_val & quintptr(1u)) == quintptr(0),
Q_ASSERT_X((_val & quintptr(1u)) == quintptr(0),
"QTryWriteLocker", "QTryWriteLocker pointer is misaligned");
tryRelock();
}
inline QTryWriteLocker::QTryWriteLocker(QReadWriteLock *readWriteLock, int timeout) :
q_val(reinterpret_cast<quintptr>(readWriteLock))
inline QTryWriteLocker::QTryWriteLocker(QReadWriteLock* readWriteLock, int timeout) :
_val(reinterpret_cast<quintptr>(readWriteLock))
{
Q_ASSERT_X((q_val & quintptr(1u)) == quintptr(0),
Q_ASSERT_X((_val & quintptr(1u)) == quintptr(0),
"QTryWriteLocker", "QTryWriteLocker pointer is misaligned");
tryRelock(timeout);
}
@ -55,20 +55,20 @@ inline QTryWriteLocker::~QTryWriteLocker() {
}
inline bool QTryWriteLocker::isLocked() const {
return (q_val & quintptr(1u)) == quintptr(1u);
return (_val & quintptr(1u)) == quintptr(1u);
}
inline void QTryWriteLocker::unlock() {
if (q_val && isLocked()) {
q_val &= ~quintptr(1u);
if (_val && isLocked()) {
_val &= ~quintptr(1u);
readWriteLock()->unlock();
}
}
inline bool QTryWriteLocker::tryRelock() {
if (q_val && !isLocked()) {
if (_val && !isLocked()) {
if (readWriteLock()->tryLockForWrite()) {
q_val |= quintptr(1u);
_val |= quintptr(1u);
return true;
}
}
@ -76,9 +76,9 @@ inline bool QTryWriteLocker::tryRelock() {
}
inline bool QTryWriteLocker::tryRelock(int timeout) {
if (q_val && !isLocked()) {
if (_val && !isLocked()) {
if (readWriteLock()->tryLockForWrite(timeout)) {
q_val |= quintptr(1u);
_val |= quintptr(1u);
return true;
}
}
@ -86,7 +86,7 @@ inline bool QTryWriteLocker::tryRelock(int timeout) {
}
inline QReadWriteLock* QTryWriteLocker::readWriteLock() const {
return reinterpret_cast<QReadWriteLock*>(q_val & ~quintptr(1u));
return reinterpret_cast<QReadWriteLock*>(_val & ~quintptr(1u));
}
#endif // hifi_QTryWriteLocker_h