diff options
Diffstat (limited to 'src/corelib')
33 files changed, 202 insertions, 202 deletions
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 9869d7e500..8b4685948e 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -121,7 +121,7 @@ void QPropertyAnimationPrivate::updateMetaProperty() qWarning("QPropertyAnimation: you're trying to animate a non-existing property %s of your QObject", propertyName.constData()); } else if (!targetValue->metaObject()->property(propertyIndex).isWritable()) { qWarning("QPropertyAnimation: you're trying to animate the non-writable property %s of your QObject", propertyName.constData()); - } + } } void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue) diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h index 98937c7551..8c0793965e 100644 --- a/src/corelib/arch/qatomic_ia64.h +++ b/src/corelib/arch/qatomic_ia64.h @@ -302,7 +302,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValu x = &_q_value; T *expectedValueCopy = expectedValue; return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy)) - == quintptr(expectedValue)); + == quintptr(expectedValue)); } template <typename T> @@ -315,7 +315,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValu x = &_q_value; T *expectedValueCopy = expectedValue; return (_InterlockedCompareExchange64_rel(p, quintptr(newValue), quintptr(expectedValueCopy)) - == quintptr(expectedValue)); + == quintptr(expectedValue)); } template <typename T> diff --git a/src/corelib/doc/snippets/code/doc_src_properties.cpp b/src/corelib/doc/snippets/code/doc_src_properties.cpp index 7a70200cce..f76fef6ebd 100644 --- a/src/corelib/doc/snippets/code/doc_src_properties.cpp +++ b/src/corelib/doc/snippets/code/doc_src_properties.cpp @@ -48,7 +48,7 @@ Q_PROPERTY(type name [DESIGNABLE bool] [SCRIPTABLE bool] [STORED bool] - [USER bool] + [USER bool] [CONSTANT] [FINAL]) //! [0] diff --git a/src/corelib/doc/snippets/code/doc_src_qalgorithms.cpp b/src/corelib/doc/snippets/code/doc_src_qalgorithms.cpp index 4ff7e87b16..54d9f01cc4 100644 --- a/src/corelib/doc/snippets/code/doc_src_qalgorithms.cpp +++ b/src/corelib/doc/snippets/code/doc_src_qalgorithms.cpp @@ -274,9 +274,9 @@ list.insert(i, 12); QVector<int> vect; vect << 3 << 3 << 6 << 6 << 6 << 8; QVector<int>::iterator begin6 = - qLowerBound(vect.begin(), vect.end(), 6); + qLowerBound(vect.begin(), vect.end(), 6); QVector<int>::iterator end6 = - qUpperBound(begin6, vect.end(), 6); + qUpperBound(begin6, vect.end(), 6); QVector<int>::iterator i = begin6; while (i != end6) { @@ -305,9 +305,9 @@ list.insert(i, 12); QVector<int> vect; vect << 3 << 3 << 6 << 6 << 6 << 8; QVector<int>::iterator begin6 = - qLowerBound(vect.begin(), vect.end(), 6); + qLowerBound(vect.begin(), vect.end(), 6); QVector<int>::iterator end6 = - qUpperBound(vect.begin(), vect.end(), 6); + qUpperBound(vect.begin(), vect.end(), 6); QVector<int>::iterator i = begin6; while (i != end6) { @@ -323,7 +323,7 @@ QVector<int> vect; vect << 3 << 3 << 6 << 6 << 6 << 8; QVector<int>::iterator i = - qBinaryFind(vect.begin(), vect.end(), 6); + qBinaryFind(vect.begin(), vect.end(), 6); // i == vect.begin() + 2 (or 3 or 4) //! [22] diff --git a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp index af8f87b1c6..eec7a96a38 100644 --- a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp +++ b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp @@ -218,7 +218,7 @@ QMutableListIterator<int> i(list); while (i.hasNext()) { int val = i.next(); if (val < -32768 || val > 32767) - i.remove(); + i.remove(); } //! [19] @@ -228,7 +228,7 @@ QMutableLinkedListIterator<int> i(list); while (i.hasNext()) { int val = i.next(); if (val < -32768 || val > 32767) - i.remove(); + i.remove(); } //! [20] @@ -238,7 +238,7 @@ QMutableVectorIterator<int> i(vector); while (i.hasNext()) { int val = i.next(); if (val < -32768 || val > 32767) - i.remove(); + i.remove(); } //! [21] @@ -248,7 +248,7 @@ QMutableSetIterator<int> i(set); while (i.hasNext()) { int val = i.next(); if (val < -32768 || val > 32767) - i.remove(); + i.remove(); } //! [22] @@ -305,7 +305,7 @@ while (i.hasPrevious()) { QMapIterator<int, QWidget *> i(map); while (i.findNext(widget)) { qDebug() << "Found widget " << widget << " under key " - << i.key(); + << i.key(); } //! [28] @@ -335,7 +335,7 @@ while (i.hasPrevious()) { QHashIterator<int, QWidget *> i(hash); while (i.findNext(widget)) { qDebug() << "Found widget " << widget << " under key " - << i.key(); + << i.key(); } //! [31] @@ -365,7 +365,7 @@ while (i.hasPrevious()) { QMutableMapIterator<int, QWidget *> i(map); while (i.findNext(widget)) { qDebug() << "Found widget " << widget << " under key " - << i.key(); + << i.key(); } //! [34] @@ -405,7 +405,7 @@ while (i.hasPrevious()) { QMutableHashIterator<int, QWidget *> i(hash); while (i.findNext(widget)) { qDebug() << "Found widget " << widget << " under key " - << i.key(); + << i.key(); } //! [38] diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp index 59f05592be..3a18eb8007 100644 --- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp @@ -523,10 +523,10 @@ class MyClass : public QObject //! [45] //! [46] - // Instead of comparing with 0.0 - qFuzzyCompare(0.0,1.0e-200); // This will return false - // Compare adding 1 to both values will fix the problem - qFuzzyCompare(1 + 0.0, 1 + 1.0e-200); // This will return true + // Instead of comparing with 0.0 + qFuzzyCompare(0.0,1.0e-200); // This will return false + // Compare adding 1 to both values will fix the problem + qFuzzyCompare(1 + 0.0, 1 + 1.0e-200); // This will return true //! [46] //! [47] diff --git a/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp b/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp index 1711d4d599..67abe6573c 100644 --- a/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp +++ b/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp @@ -50,11 +50,11 @@ ButtonWidget::ButtonWidget(QStringList texts, QWidget *parent) QGridLayout *gridLayout = new QGridLayout; for (int i = 0; i < texts.size(); ++i) { - QPushButton *button = new QPushButton(texts[i]); - connect(button, SIGNAL(clicked()), signalMapper, SLOT(map())); + QPushButton *button = new QPushButton(texts[i]); + connect(button, SIGNAL(clicked()), signalMapper, SLOT(map())); //! [0] //! [1] - signalMapper->setMapping(button, texts[i]); - gridLayout->addWidget(button, i / 3, i % 3); + signalMapper->setMapping(button, texts[i]); + gridLayout->addWidget(button, i / 3, i % 3); } connect(signalMapper, SIGNAL(mapped(QString)), diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 22a9980812..6ad94b5067 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -160,23 +160,23 @@ QSettings *QLibraryInfoPrivate::findConfiguration() #else if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { #ifdef Q_OS_MAC - CFBundleRef bundleRef = CFBundleGetMainBundle(); + CFBundleRef bundleRef = CFBundleGetMainBundle(); if (bundleRef) { - QCFType<CFURLRef> urlRef = CFBundleCopyResourceURL(bundleRef, - QCFString(QLatin1String("qt.conf")), - 0, - 0); - if (urlRef) { - QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle); - qtconfig = QDir::cleanPath(path); - } - } - if (qtconfig.isEmpty()) + QCFType<CFURLRef> urlRef = CFBundleCopyResourceURL(bundleRef, + QCFString(QLatin1String("qt.conf")), + 0, + 0); + if (urlRef) { + QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle); + qtconfig = QDir::cleanPath(path); + } + } + if (qtconfig.isEmpty()) #endif { QDir pwd(QCoreApplication::applicationDirPath()); qtconfig = pwd.filePath(QLatin1String("qt.conf")); - } + } } #endif if (QFile::exists(qtconfig)) diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp index c731f3d417..5fd20c6d74 100644 --- a/src/corelib/io/qfilesystemwatcher_inotify.cpp +++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp @@ -129,9 +129,9 @@ # define __NR_inotify_rm_watch 271 # define __NR_inotify_init1 314 #elif defined (__avr32__) -# define __NR_inotify_init 240 -# define __NR_inotify_add_watch 241 -# define __NR_inotify_rm_watch 242 +# define __NR_inotify_init 240 +# define __NR_inotify_add_watch 241 +# define __NR_inotify_rm_watch 242 // no inotify_init1 for AVR32 #elif defined (__mc68000__) # define __NR_inotify_init 284 diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index ab2a69d054..483650afcb 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -2388,14 +2388,14 @@ int QProcess::execute(const QString &program) identifier of the started process. */ bool QProcess::startDetached(const QString &program, - const QStringList &arguments, - const QString &workingDirectory, + const QStringList &arguments, + const QString &workingDirectory, qint64 *pid) { return QProcessPrivate::startDetached(program, - arguments, - workingDirectory, - pid); + arguments, + workingDirectory, + pid); } /*! @@ -2414,7 +2414,7 @@ bool QProcess::startDetached(const QString &program, The started process will run as a regular standalone process. */ bool QProcess::startDetached(const QString &program, - const QStringList &arguments) + const QStringList &arguments) { return QProcessPrivate::startDetached(program, arguments); } diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 3c6d294916..4076ec5855 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -1107,7 +1107,7 @@ bool QProcessPrivate::waitForStarted(int msecs) #if defined (QPROCESS_DEBUG) qDebug("QProcessPrivate::waitForStarted(%d) waiting for child to start (fd = %d)", msecs, - childStartedPipe[0]); + childStartedPipe[0]); #endif fd_set fds; @@ -1172,32 +1172,32 @@ bool QProcessPrivate::waitForReadyRead(int msecs) if (ret == 0) { processError = QProcess::Timedout; q->setErrorString(QProcess::tr("Process operation timed out")); - return false; - } + return false; + } - if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) { + if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) { if (!_q_startupNotification()) return false; - } + } bool readyReadEmitted = false; - if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread)) { - bool canRead = _q_canReadStandardOutput(); + if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread)) { + bool canRead = _q_canReadStandardOutput(); if (processChannel == QProcess::StandardOutput && canRead) readyReadEmitted = true; - } - if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread)) { - bool canRead = _q_canReadStandardError(); + } + if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread)) { + bool canRead = _q_canReadStandardError(); if (processChannel == QProcess::StandardError && canRead) readyReadEmitted = true; - } + } if (readyReadEmitted) return true; - if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite)) - _q_canWrite(); + if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite)) + _q_canWrite(); - if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) { + if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) { if (_q_processDied()) return false; } @@ -1248,26 +1248,26 @@ bool QProcessPrivate::waitForBytesWritten(int msecs) } if (ret == 0) { - processError = QProcess::Timedout; - q->setErrorString(QProcess::tr("Process operation timed out")); - return false; - } + processError = QProcess::Timedout; + q->setErrorString(QProcess::tr("Process operation timed out")); + return false; + } - if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) { - if (!_q_startupNotification()) - return false; - } + if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) { + if (!_q_startupNotification()) + return false; + } - if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite)) - return _q_canWrite(); + if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite)) + return _q_canWrite(); - if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread)) - _q_canReadStandardOutput(); + if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread)) + _q_canReadStandardOutput(); - if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread)) - _q_canReadStandardError(); + if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread)) + _q_canReadStandardError(); - if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) { + if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) { if (_q_processDied()) return false; } @@ -1317,29 +1317,29 @@ bool QProcessPrivate::waitForFinished(int msecs) if (ret < 0) { break; } - if (ret == 0) { - processError = QProcess::Timedout; - q->setErrorString(QProcess::tr("Process operation timed out")); - return false; - } - - if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) { - if (!_q_startupNotification()) - return false; - } - if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite)) - _q_canWrite(); - - if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread)) - _q_canReadStandardOutput(); - - if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread)) - _q_canReadStandardError(); - - if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) { + if (ret == 0) { + processError = QProcess::Timedout; + q->setErrorString(QProcess::tr("Process operation timed out")); + return false; + } + + if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) { + if (!_q_startupNotification()) + return false; + } + if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite)) + _q_canWrite(); + + if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread)) + _q_canReadStandardOutput(); + + if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread)) + _q_canReadStandardError(); + + if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) { if (_q_processDied()) return true; - } + } } return false; } diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index fc2adb783e..d7050034bd 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -623,7 +623,7 @@ static BOOL QT_WIN_CALLBACK qt_terminateApp(HWND hwnd, LPARAM procId) DWORD currentProcId = 0; GetWindowThreadProcessId(hwnd, ¤tProcId); if (currentProcId == (DWORD)procId) - PostMessage(hwnd, WM_CLOSE, 0, 0); + PostMessage(hwnd, WM_CLOSE, 0, 0); return TRUE; } diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index c16b8d79a2..bfd0eef64f 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -1092,8 +1092,8 @@ QResource::unregisterResource(const QString &rccFilename, const QString &resourc for(int i = 0; i < list->size(); ++i) { QResourceRoot *res = list->at(i); if(res->type() == QResourceRoot::Resource_File) { - QDynamicFileResourceRoot *root = reinterpret_cast<QDynamicFileResourceRoot*>(res); - if(root->mappingFile() == rccFilename && root->mappingRoot() == r) { + QDynamicFileResourceRoot *root = reinterpret_cast<QDynamicFileResourceRoot*>(res); + if (root->mappingFile() == rccFilename && root->mappingRoot() == r) { resourceList()->removeAt(i); if(!root->ref.deref()) { delete root; @@ -1101,7 +1101,7 @@ QResource::unregisterResource(const QString &rccFilename, const QString &resourc } return false; } - } + } } return false; } @@ -1163,16 +1163,16 @@ QResource::unregisterResource(const uchar *rccData, const QString &resourceRoot) for(int i = 0; i < list->size(); ++i) { QResourceRoot *res = list->at(i); if(res->type() == QResourceRoot::Resource_Buffer) { - QDynamicBufferResourceRoot *root = reinterpret_cast<QDynamicBufferResourceRoot*>(res); - if(root->mappingBuffer() == rccData && root->mappingRoot() == r) { + QDynamicBufferResourceRoot *root = reinterpret_cast<QDynamicBufferResourceRoot*>(res); + if (root->mappingBuffer() == rccData && root->mappingRoot() == r) { resourceList()->removeAt(i); if(!root->ref.deref()) { delete root; return true; } - return false; + return false; } - } + } } return false; } @@ -1381,13 +1381,13 @@ QString QResourceFileEngine::fileName(FileName file) const { Q_D(const QResourceFileEngine); if(file == BaseName) { - int slash = d->resource.fileName().lastIndexOf(QLatin1Char('/')); - if (slash == -1) - return d->resource.fileName(); - return d->resource.fileName().mid(slash + 1); + int slash = d->resource.fileName().lastIndexOf(QLatin1Char('/')); + if (slash == -1) + return d->resource.fileName(); + return d->resource.fileName().mid(slash + 1); } else if(file == PathName || file == AbsolutePathName) { const QString path = (file == AbsolutePathName) ? d->resource.absoluteFilePath() : d->resource.fileName(); - const int slash = path.lastIndexOf(QLatin1Char('/')); + const int slash = path.lastIndexOf(QLatin1Char('/')); if (slash == -1) return QLatin1String(":"); else if (slash <= 1) diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 043af9635e..a3727a6a4b 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -94,11 +94,11 @@ using namespace ABI::Windows::Storage; #endif #ifndef CSIDL_COMMON_APPDATA -#define CSIDL_COMMON_APPDATA 0x0023 // All Users\Application Data +#define CSIDL_COMMON_APPDATA 0x0023 // All Users\Application Data #endif #ifndef CSIDL_APPDATA -#define CSIDL_APPDATA 0x001a // <username>\Application Data +#define CSIDL_APPDATA 0x001a // <username>\Application Data #endif #ifdef Q_AUTOTEST_EXPORT diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index a720b3d709..f44b99d009 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -117,7 +117,7 @@ public: QSettings(Scope scope, const QString &organization, const QString &application = QString(), QObject *parent = 0); QSettings(Format format, Scope scope, const QString &organization, - const QString &application = QString(), QObject *parent = 0); + const QString &application = QString(), QObject *parent = 0); QSettings(const QString &fileName, Format format, QObject *parent = 0); explicit QSettings(QObject *parent = 0); #else diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index b3a17eae7e..3cade0ed25 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -77,7 +77,7 @@ typedef int NativeFileHandle; /* * Copyright (c) 1987, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp index 988d076025..bf2c07e0e0 100644 --- a/src/corelib/io/qurlidna.cpp +++ b/src/corelib/io/qurlidna.cpp @@ -73,7 +73,7 @@ inline bool operator<(const NameprepCaseFoldingEntry &one, uint other) { return one.uc < other; } static const NameprepCaseFoldingEntry NameprepCaseFolding[] = { -/* { 0x0041, { 0x0061, 0x0000, 0x0000, 0x0000 } }, +/* { 0x0041, { 0x0061, 0x0000, 0x0000, 0x0000 } }, { 0x0042, { 0x0062, 0x0000, 0x0000, 0x0000 } }, { 0x0043, { 0x0063, 0x0000, 0x0000, 0x0000 } }, { 0x0044, { 0x0064, 0x0000, 0x0000, 0x0000 } }, diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp index 1808081d01..daa8068734 100644 --- a/src/corelib/io/qwindowspipewriter.cpp +++ b/src/corelib/io/qwindowspipewriter.cpp @@ -114,7 +114,7 @@ void QWindowsPipeWriter::run() if (quitNow) { lock.unlock(); quitNow = false; - break; + break; } QByteArray copy = data; @@ -153,7 +153,7 @@ void QWindowsPipeWriter::run() totalWritten += written; #if defined QPIPEWRITER_DEBUG qDebug("QWindowsPipeWriter::run() wrote %d %d/%d bytes", - written, int(totalWritten), int(maxlen)); + written, int(totalWritten), int(maxlen)); #endif lock.lock(); data.remove(0, written); diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 63e0374740..68f6c2ebf2 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -949,8 +949,8 @@ void QSortFilterProxyModelPrivate::updateChildrenMapping(const QModelIndex &sour // update mapping Mapping *cm = source_index_mapping.take(source_child_index); Q_ASSERT(cm); - // we do not reinsert right away, because the new index might be identical with another, old index - moved_source_index_mappings.append(QPair<QModelIndex, Mapping*>(new_index, cm)); + // we do not reinsert right away, because the new index might be identical with another, old index + moved_source_index_mappings.append(QPair<QModelIndex, Mapping*>(new_index, cm)); } } @@ -1128,7 +1128,7 @@ QSet<int> QSortFilterProxyModelPrivate::handle_filter_changed( } void QSortFilterProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &source_top_left, - const QModelIndex &source_bottom_right) + const QModelIndex &source_bottom_right) { Q_Q(QSortFilterProxyModel); if (!source_top_left.isValid() || !source_bottom_right.isValid()) @@ -1200,8 +1200,8 @@ void QSortFilterProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &sourc source_parent, Qt::Vertical, false); update_persistent_indexes(source_indexes); emit q->layoutChanged(parents, QAbstractItemModel::VerticalSortHint); - // Make sure we also emit dataChanged for the rows - source_rows_change += source_rows_resort; + // Make sure we also emit dataChanged for the rows + source_rows_change += source_rows_resort; } if (!source_rows_change.isEmpty()) { 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 <typename X> X as() const { return reinterpret_cast<X>(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"); diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index 2aed877e6b..e89d6396f6 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -190,7 +190,7 @@ bool QLibraryPrivate::load_sys() } #endif -#if defined(Q_OS_AIX) // Not sure if any other platform actually support this thing. +#if defined(Q_OS_AIX) // Not sure if any other platform actually support this thing. if (loadHints & QLibrary::LoadArchiveMemberHint) { dlFlags |= RTLD_MEMBER; } diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 4dba12e1b0..d2e2368ca9 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -665,62 +665,62 @@ void QStateMachinePrivate::addStatesToEnter(QAbstractState *s, QState *root, QSet<QAbstractState*> &statesToEnter, QSet<QAbstractState*> &statesForDefaultEntry) { - if (QHistoryState *h = toHistoryState(s)) { - QList<QAbstractState*> hconf = QHistoryStatePrivate::get(h)->configuration; - if (!hconf.isEmpty()) { - for (int k = 0; k < hconf.size(); ++k) { - QAbstractState *s0 = hconf.at(k); - addStatesToEnter(s0, root, statesToEnter, statesForDefaultEntry); - } - #ifdef QSTATEMACHINE_DEBUG - qDebug() <<q_func() << ": restoring" - << ((QHistoryStatePrivate::get(h)->historyType == QHistoryState::DeepHistory) ? "deep" : "shallow") - << "history from" << s << ':' << hconf; - #endif - } else { - QList<QAbstractState*> hlst; - if (QHistoryStatePrivate::get(h)->defaultState) - hlst.append(QHistoryStatePrivate::get(h)->defaultState); - - if (hlst.isEmpty()) { - setError(QStateMachine::NoDefaultStateInHistoryStateError, h); - } else { - for (int k = 0; k < hlst.size(); ++k) { - QAbstractState *s0 = hlst.at(k); - addStatesToEnter(s0, root, statesToEnter, statesForDefaultEntry); - } - #ifdef QSTATEMACHINE_DEBUG - qDebug() << q_func() << ": initial history targets for" << s << ':' << hlst; - #endif - } - } - } else { - if (s == rootState()) { - // Error has already been set by exitStates(). - Q_ASSERT(error != QStateMachine::NoError); + if (QHistoryState *h = toHistoryState(s)) { + QList<QAbstractState*> hconf = QHistoryStatePrivate::get(h)->configuration; + if (!hconf.isEmpty()) { + for (int k = 0; k < hconf.size(); ++k) { + QAbstractState *s0 = hconf.at(k); + addStatesToEnter(s0, root, statesToEnter, statesForDefaultEntry); + } +#ifdef QSTATEMACHINE_DEBUG + qDebug() << q_func() << ": restoring" + << ((QHistoryStatePrivate::get(h)->historyType == QHistoryState::DeepHistory) ? "deep" : "shallow") + << "history from" << s << ':' << hconf; +#endif + } else { + QList<QAbstractState*> hlst; + if (QHistoryStatePrivate::get(h)->defaultState) + hlst.append(QHistoryStatePrivate::get(h)->defaultState); + + if (hlst.isEmpty()) { + setError(QStateMachine::NoDefaultStateInHistoryStateError, h); + } else { + for (int k = 0; k < hlst.size(); ++k) { + QAbstractState *s0 = hlst.at(k); + addStatesToEnter(s0, root, statesToEnter, statesForDefaultEntry); + } +#ifdef QSTATEMACHINE_DEBUG + qDebug() << q_func() << ": initial history targets for" << s << ':' << hlst; +#endif + } + } + } else { + if (s == rootState()) { + // Error has already been set by exitStates(). + Q_ASSERT(error != QStateMachine::NoError); + return; + } + statesToEnter.insert(s); + if (isParallel(s)) { + QState *grp = toStandardState(s); + QList<QAbstractState*> lst = QStatePrivate::get(grp)->childStates(); + for (int i = 0; i < lst.size(); ++i) { + QAbstractState *child = lst.at(i); + addStatesToEnter(child, grp, statesToEnter, statesForDefaultEntry); + } + } else if (isCompound(s)) { + statesForDefaultEntry.insert(s); + QState *grp = toStandardState(s); + QAbstractState *initial = grp->initialState(); + if (initial != 0) { + Q_ASSERT(initial->machine() == q_func()); + addStatesToEnter(initial, grp, statesToEnter, statesForDefaultEntry); + } else { + setError(QStateMachine::NoInitialStateError, grp); return; } - statesToEnter.insert(s); - if (isParallel(s)) { - QState *grp = toStandardState(s); - QList<QAbstractState*> lst = QStatePrivate::get(grp)->childStates(); - for (int i = 0; i < lst.size(); ++i) { - QAbstractState *child = lst.at(i); - addStatesToEnter(child, grp, statesToEnter, statesForDefaultEntry); - } - } else if (isCompound(s)) { - statesForDefaultEntry.insert(s); - QState *grp = toStandardState(s); - QAbstractState *initial = grp->initialState(); - if (initial != 0) { - Q_ASSERT(initial->machine() == q_func()); - addStatesToEnter(initial, grp, statesToEnter, statesForDefaultEntry); - } else { - setError(QStateMachine::NoInitialStateError, grp); - return; - } - } - } + } + } } void QStateMachinePrivate::addAncestorStatesToEnter(QAbstractState *s, QState *root, diff --git a/src/corelib/thread/qwaitcondition.h b/src/corelib/thread/qwaitcondition.h index 1468951373..ce073c21e9 100644 --- a/src/corelib/thread/qwaitcondition.h +++ b/src/corelib/thread/qwaitcondition.h @@ -84,9 +84,9 @@ public: bool wait(QMutex *mutex, unsigned long time = ULONG_MAX) { - Q_UNUSED(mutex); - Q_UNUSED(time); - return true; + Q_UNUSED(mutex); + Q_UNUSED(time); + return true; } void wakeOne() {} diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp index f583444d3c..2e22cf8340 100644 --- a/src/corelib/tools/qbitarray.cpp +++ b/src/corelib/tools/qbitarray.cpp @@ -746,8 +746,8 @@ QDataStream &operator>>(QDataStream &in, QBitArray &ba) quint32 len; in >> len; if (len == 0) { - ba.clear(); - return in; + ba.clear(); + return in; } const quint32 Step = 8 * 1024 * 1024; diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 03b10903ab..a9cfd604c7 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -132,10 +132,10 @@ char *qstrcpy(char *dst, const char *src) return 0; #if defined(_MSC_VER) && _MSC_VER >= 1400 const int len = int(strlen(src)); - // This is actually not secure!!! It will be fixed - // properly in a later release! + // This is actually not secure!!! It will be fixed + // properly in a later release! if (len >= 0 && strcpy_s(dst, len+1, src) == 0) - return dst; + return dst; return 0; #else return strcpy(dst, src); @@ -166,7 +166,7 @@ char *qstrncpy(char *dst, const char *src, uint len) if (!src || !dst) return 0; #if defined(_MSC_VER) && _MSC_VER >= 1400 - strncpy_s(dst, len, src, len-1); + strncpy_s(dst, len, src, len-1); #else strncpy(dst, src, len); #endif diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 79a62cb87c..bdacdbcd26 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -170,7 +170,7 @@ public: inline const_iterator(Node *n) : i(n) {} inline const_iterator(const const_iterator &o) : i(o.i){} inline const_iterator(iterator ci) : i(ci.i){} - inline const_iterator &operator=(const const_iterator &o) { i = o.i; return *this; } + inline const_iterator &operator=(const const_iterator &o) { i = o.i; return *this; } inline const T &operator*() const { return i->t; } inline const T *operator->() const { return &i->t; } inline bool operator==(const const_iterator &o) const { return i == o.i; } diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 581a12e0c7..4b5b4d67b5 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -321,8 +321,8 @@ public: typedef QVarLengthArray<char, 256> CharBuff; bool numberToCLocale(const QChar *str, int len, - GroupSeparatorMode group_sep_mode, - CharBuff *result) const; + GroupSeparatorMode group_sep_mode, + CharBuff *result) const; inline char digitToCLocale(QChar c) const; static void updateSystemPrivate(); diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index 26b0b78317..115fceb18b 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -68,7 +68,7 @@ public: QRegExp(); explicit QRegExp(const QString &pattern, Qt::CaseSensitivity cs = Qt::CaseSensitive, - PatternSyntax syntax = RegExp); + PatternSyntax syntax = RegExp); QRegExp(const QRegExp &rx); ~QRegExp(); QRegExp &operator=(const QRegExp &rx); diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index 46997b731c..6b0b39c7bb 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -455,7 +455,7 @@ QString QtPrivate::QStringList_join(const QStringList *that, const QChar *sep, i QString res; if (totalLength == 0) - return res; + return res; res.reserve(totalLength); for (int i = 0; i < that->size(); ++i) { if (i) diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index 2a26c2ede4..5461139582 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -3170,7 +3170,7 @@ QXmlStreamPrivateTagStack::NamespaceDeclaration &QXmlStreamWriterPrivate::findNa --j; if (j < 0) break; - } + } namespaceDeclaration.prefix = addToStringStorage(s); } namespaceDeclaration.namespaceUri = addToStringStorage(namespaceUri); |