From 882bf3475c8926abe62ed71e6719458b024caac0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 13 Jan 2014 15:48:44 +0100 Subject: expand tabs and related whitespace fixes in *.{cpp,h,qdoc} the diff -w for this commit is empty. Started-by: Thiago Macieira Change-Id: I77bb84e71c63ce75e0709e5b94bee18e3ce6ab9e Reviewed-by: Thiago Macieira --- src/corelib/kernel/qcore_mac_p.h | 14 +++++++------- src/corelib/kernel/qcorecmdlineargs_p.h | 2 +- src/corelib/kernel/qsharedmemory.cpp | 4 ++-- src/corelib/kernel/qsystemsemaphore_win.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index f491be9768..e92a2d2978 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -105,13 +105,13 @@ public: inline operator T() { return type; } inline QCFType operator =(const QCFType &helper) { - if (helper.type) - CFRetain(helper.type); - CFTypeRef type2 = type; - type = helper.type; - if (type2) - CFRelease(type2); - return *this; + if (helper.type) + CFRetain(helper.type); + CFTypeRef type2 = type; + type = helper.type; + if (type2) + CFRelease(type2); + return *this; } inline T *operator&() { return &type; } template X as() const { return reinterpret_cast(type); } diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h index bbbee7df25..93c80205ab 100644 --- a/src/corelib/kernel/qcorecmdlineargs_p.h +++ b/src/corelib/kernel/qcorecmdlineargs_p.h @@ -154,7 +154,7 @@ static inline QStringList qCmdLineArgs(int argc, char *argv[]) static inline QStringList qCmdLineArgs(int argc, char *argv[]) { QStringList args; - for (int i = 0; i != argc; ++i) + for (int i = 0; i != argc; ++i) args += QString::fromLocal8Bit(argv[i]); return args; } diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp index 1f53b94c4d..407a6a4e02 100644 --- a/src/corelib/kernel/qsharedmemory.cpp +++ b/src/corelib/kernel/qsharedmemory.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE */ QString QSharedMemoryPrivate::makePlatformSafeKey(const QString &key, - const QString &prefix) + const QString &prefix) { if (key.isEmpty()) return QString(); @@ -350,7 +350,7 @@ bool QSharedMemory::create(int size, AccessMode mode) if (size <= 0) { d->error = QSharedMemory::InvalidSize; d->errorString = - QSharedMemory::tr("%1: create size is less then 0").arg(function); + QSharedMemory::tr("%1: create size is less then 0").arg(function); return false; } diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp index edf90a31ac..77f7a60814 100644 --- a/src/corelib/kernel/qsystemsemaphore_win.cpp +++ b/src/corelib/kernel/qsystemsemaphore_win.cpp @@ -115,7 +115,7 @@ bool QSystemSemaphorePrivate::modifySemaphore(int count) return false; if (count > 0) { - if (0 == ReleaseSemaphore(semaphore, count, 0)) { + if (0 == ReleaseSemaphore(semaphore, count, 0)) { setErrorString(QLatin1String("QSystemSemaphore::modifySemaphore")); #if defined QSYSTEMSEMAPHORE_DEBUG qDebug() << QLatin1String("QSystemSemaphore::modifySemaphore ReleaseSemaphore failed"); -- cgit v1.2.3