diff options
Diffstat (limited to 'src/corelib')
69 files changed, 195 insertions, 195 deletions
diff --git a/src/corelib/animation/qsequentialanimationgroup.cpp b/src/corelib/animation/qsequentialanimationgroup.cpp index 2fbb844367..42debea782 100644 --- a/src/corelib/animation/qsequentialanimationgroup.cpp +++ b/src/corelib/animation/qsequentialanimationgroup.cpp @@ -266,8 +266,8 @@ QSequentialAnimationGroup::~QSequentialAnimationGroup() /*! Adds a pause of \a msecs to this animation group. - The pause is considered as a special type of animation, thus - \l{QAnimationGroup::animationCount()}{animationCount} will be + The pause is considered as a special type of animation, thus + \l{QAnimationGroup::animationCount()}{animationCount} will be increased by one. \sa insertPause(), QAnimationGroup::addAnimation() diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index 72a7c7264a..f69d9dd8de 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -222,7 +222,7 @@ void QVariantAnimationPrivate::updateInterpolator() interpolator = getInterpolator(type); else interpolator = 0; - + //we make sure that the interpolator is always set to something if (!interpolator) interpolator = &defaultInterpolator; @@ -252,7 +252,7 @@ void QVariantAnimationPrivate::recalculateCurrentInterval(bool force/*=false*/) qMakePair(progress, QVariant()), animationValueLessThan); if (it == keyValues.constBegin()) { - //the item pointed to by it is the start element in the range + //the item pointed to by it is the start element in the range if (it->first == 0 && keyValues.count() > 1) { currentInterval.start = *it; currentInterval.end = *(it+1); diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h index d4b187ffea..ed72036076 100644 --- a/src/corelib/arch/qatomic_ia64.h +++ b/src/corelib/arch/qatomic_ia64.h @@ -219,28 +219,28 @@ inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue) inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast<int>(_InterlockedCompareExchange(&_q_value, - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast<int>(_InterlockedCompareExchange(&_q_value, + newValue, + expectedValueCopy)) + == expectedValue); } inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast<int>(_InterlockedCompareExchange_acq(reinterpret_cast<volatile uint *>(&_q_value), - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast<int>(_InterlockedCompareExchange_acq(reinterpret_cast<volatile uint *>(&_q_value), + newValue, + expectedValueCopy)) + == expectedValue); } inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast<int>(_InterlockedCompareExchange_rel(reinterpret_cast<volatile uint *>(&_q_value), - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast<int>(_InterlockedCompareExchange_rel(reinterpret_cast<volatile uint *>(&_q_value), + newValue, + expectedValueCopy)) + == expectedValue); } inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd) @@ -286,10 +286,10 @@ template <typename T> Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue) { register T *expectedValueCopy = expectedValue; - return (_InterlockedCompareExchangePointer(reinterpret_cast<void * volatile*>(&_q_value), - newValue, - expectedValueCopy) - == expectedValue); + return (_InterlockedCompareExchangePointer(reinterpret_cast<void * volatile*>(&_q_value), + newValue, + expectedValueCopy) + == expectedValue); } template <typename T> @@ -301,7 +301,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValu }; x = &_q_value; register T *expectedValueCopy = expectedValue; - return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy)) + return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy)) == quintptr(expectedValue)); } diff --git a/src/corelib/arch/sparc/arch.pri b/src/corelib/arch/sparc/arch.pri index b3ca399640..a201c83c6a 100644 --- a/src/corelib/arch/sparc/arch.pri +++ b/src/corelib/arch/sparc/arch.pri @@ -3,7 +3,7 @@ # *-64* { SOURCES += $$PWD/qatomic64.s -} +} else { SOURCES += $$PWD/qatomic32.s \ $$PWD/qatomic_sparc.cpp diff --git a/src/corelib/arch/sparc/qatomic_sparc.cpp b/src/corelib/arch/sparc/qatomic_sparc.cpp index d0a9eb8d29..8ea270e90a 100644 --- a/src/corelib/arch/sparc/qatomic_sparc.cpp +++ b/src/corelib/arch/sparc/qatomic_sparc.cpp @@ -60,7 +60,7 @@ Q_CORE_EXPORT int q_atomic_lock_int(volatile int *addr) sched_yield(); returnValue = *addr; } while (returnValue == INT_MIN); - + // try again returnValue = q_atomic_trylock_int(addr); } while (returnValue == INT_MIN); diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp index a6d75666d5..20ba1e85d6 100644 --- a/src/corelib/codecs/qeuckrcodec.cpp +++ b/src/corelib/codecs/qeuckrcodec.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -// Most of the cp949 code was originally written by Joon-Kyu Park, and is included +// Most of the cp949 code was originally written by Joon-Kyu Park, and is included // in Qt with the author's permission and the grateful thanks of the Qt team. /*! \class QEucKrCodec @@ -3405,7 +3405,7 @@ QByteArray QCP949Codec::convertFromUnicode(const QChar *uc, int len, ConverterSt row = internal_code / 178; column = internal_code % 178; } - else { + else { // code between a1-fe internal_code -= 3008; row = internal_code / 84; diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp index 01b90fe527..60b13ac4e1 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp @@ -374,7 +374,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt delete temporaryState; return QString(uc, len).toLatin1(); } - + size_t outBytesLeft = len; QByteArray ba(outBytesLeft, Qt::Uninitialized); outBytes = ba.data(); diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp index 95ffe11f75..9513621dfe 100644 --- a/src/corelib/codecs/qjpunicode.cpp +++ b/src/corelib/codecs/qjpunicode.cpp @@ -10537,7 +10537,7 @@ static unsigned short const sjis208ibmvdc_unicode[] = { uint QJpUnicodeConv::sjisibmvdcToUnicode(uint h, uint l) const { - if (((rule & IBM_VDC) || (rule & Microsoft_CP932)) && IsSjisIBMVDCChar1(h)) + if (((rule & IBM_VDC) || (rule & Microsoft_CP932)) && IsSjisIBMVDCChar1(h)) return sjis208ibmvdc_unicode[((h - 0x00fa)*189 + (l-0x0040))]; else return 0; @@ -10632,9 +10632,9 @@ static unsigned short const cp932_ed_ee_unicode[] = { uint QJpUnicodeConv::cp932ToUnicode(uint h, uint l) const { if (rule & Microsoft_CP932) { - if (h == 0x0087 && (l >= 0x0040 && l <= 0x009c)) + if (h == 0x0087 && (l >= 0x0040 && l <= 0x009c)) return cp932_87_unicode[l-0x0040]; - else if ((h == 0x00ed || h == 0x00ee) && (l >= 0x0040 && l <= 0x00fc)) + else if ((h == 0x00ed || h == 0x00ee) && (l >= 0x0040 && l <= 0x00fc)) return cp932_ed_ee_unicode[((h - 0x00ed)*189 + (l-0x0040))]; } return 0; 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 7d7d71ac50..59f05592be 100644 --- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp @@ -501,7 +501,7 @@ namespace QT_NAMESPACE { //! [43] class MyClass : public QObject { - + private: Q_DISABLE_COPY(MyClass) }; @@ -511,7 +511,7 @@ class MyClass : public QObject //! [44] class MyClass : public QObject { - + private: MyClass(const MyClass &); MyClass &operator=(const MyClass &); diff --git a/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp index de1a7cea19..92a6e77866 100644 --- a/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp @@ -84,6 +84,6 @@ forever { mutex.lock(); } keyPressed.wakeAll(); - mutex.unlock(); + mutex.unlock(); } //! [3] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp index 7e221cfaab..4f8c4c095e 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp @@ -405,7 +405,7 @@ QString tmp = "test"; QByteArray text = tmp.toLocal8Bit(); char *data = new char[text.size()] strcpy(data, text.data()); -delete [] data; +delete [] data; //! [46] //! [47] diff --git a/src/corelib/doc/snippets/fileinfo/main.cpp b/src/corelib/doc/snippets/fileinfo/main.cpp index 57d7e32cb5..50acdb2550 100644 --- a/src/corelib/doc/snippets/fileinfo/main.cpp +++ b/src/corelib/doc/snippets/fileinfo/main.cpp @@ -54,12 +54,12 @@ int main(int argc, char *argv[]) QFileInfo fileInfo1("~/examples/191697/."); QFileInfo fileInfo2("~/examples/191697/.."); QFileInfo fileInfo3("~/examples/191697/main.cpp"); -//! [0] -//! [1] +//! [0] +//! [1] QFileInfo fileInfo4("."); QFileInfo fileInfo5(".."); QFileInfo fileInfo6("main.cpp"); -//! [1] +//! [1] qDebug() << fileInfo1.fileName(); qDebug() << fileInfo2.fileName(); diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp index 6ee3088138..bf45a31c29 100644 --- a/src/corelib/doc/snippets/qstring/main.cpp +++ b/src/corelib/doc/snippets/qstring/main.cpp @@ -552,7 +552,7 @@ void Widget::replaceFunction() //! [86] QString equis = "xxxxxx"; equis.replace("xx", "x"); - // equis == "xxx" + // equis == "xxx" //! [86] //! [87] diff --git a/src/corelib/doc/snippets/sharedemployee/employee.h b/src/corelib/doc/snippets/sharedemployee/employee.h index 8025015a2e..2df1f71c51 100644 --- a/src/corelib/doc/snippets/sharedemployee/employee.h +++ b/src/corelib/doc/snippets/sharedemployee/employee.h @@ -69,11 +69,11 @@ class Employee setName(name); } //! [2] //! [7] - Employee(const Employee &other) - : d (other.d) - { - } -//! [7] + Employee(const Employee &other) + : d (other.d) + { + } +//! [7] //! [3] void setId(int id) { d->id = id; } //! [3] //! [4] diff --git a/src/corelib/doc/snippets/signalmapper/filereader.cpp b/src/corelib/doc/snippets/signalmapper/filereader.cpp index 42660b9551..cb83ea9362 100644 --- a/src/corelib/doc/snippets/signalmapper/filereader.cpp +++ b/src/corelib/doc/snippets/signalmapper/filereader.cpp @@ -73,7 +73,7 @@ FileReader::FileReader(QWidget *parent) /* //! [2] //slower due to signature normalization at runtime - + connect(signalMapper, SIGNAL(mapped(const QString &)), this, SLOT(readFile(const QString &))); //! [2] @@ -93,7 +93,7 @@ FileReader::FileReader(QWidget *parent) void FileReader::readFile(const QString &filename) { QFile file(filename); - + if (!file.open(QIODevice::ReadOnly)) { QMessageBox::information(this, tr("Unable to open file"), file.errorString()); diff --git a/src/corelib/doc/snippets/statemachine/eventtest.cpp b/src/corelib/doc/snippets/statemachine/eventtest.cpp index c83e92ab77..7454344680 100644 --- a/src/corelib/doc/snippets/statemachine/eventtest.cpp +++ b/src/corelib/doc/snippets/statemachine/eventtest.cpp @@ -55,11 +55,11 @@ protected: if (wrappedEvent->type() == QEvent::KeyPress) { QKeyEvent *keyEvent = static_cast<QKeyEvent *>(wrappedEvent); // Do your event test - } + } } return false; } -//![0] +//![0] void onTransition(QEvent *event) { diff --git a/src/corelib/doc/snippets/statemachine/main4.cpp b/src/corelib/doc/snippets/statemachine/main4.cpp index f1ecabd535..19b40a10b4 100644 --- a/src/corelib/doc/snippets/statemachine/main4.cpp +++ b/src/corelib/doc/snippets/statemachine/main4.cpp @@ -69,7 +69,7 @@ protected: StringEvent *se = static_cast<StringEvent*>(e); return (m_value == se->value); } - + virtual void onTransition(QEvent *) {} private: diff --git a/src/corelib/doc/snippets/streaming/main.cpp b/src/corelib/doc/snippets/streaming/main.cpp index 66808a5a6b..673df075ee 100644 --- a/src/corelib/doc/snippets/streaming/main.cpp +++ b/src/corelib/doc/snippets/streaming/main.cpp @@ -85,12 +85,12 @@ int main(int argc, char *argv[]) QByteArray byteArray; QDataStream stream(&byteArray, QIODevice::WriteOnly); stream << m; - + // display qDebug() << m.id << m.releaseDate << m.title; Movie m2; - + int id2; QString title2; QDate date2; diff --git a/src/corelib/doc/snippets/timers/timers.cpp b/src/corelib/doc/snippets/timers/timers.cpp index 4d74e7cc27..8257bf57a7 100644 --- a/src/corelib/doc/snippets/timers/timers.cpp +++ b/src/corelib/doc/snippets/timers/timers.cpp @@ -74,5 +74,5 @@ Foo::Foo() int main() { - + } diff --git a/src/corelib/doc/src/objectmodel/object.qdoc b/src/corelib/doc/src/objectmodel/object.qdoc index 1d33c14d0f..89a781da39 100644 --- a/src/corelib/doc/src/objectmodel/object.qdoc +++ b/src/corelib/doc/src/objectmodel/object.qdoc @@ -71,7 +71,7 @@ \section1 Important Classes These classes form the basis of the Qt Object Model. - + \annotatedlist objectmodel \target Identity vs Value @@ -108,7 +108,7 @@ at runtime that are not declared in the C++ class. If we copy a Qt Object, should the copy include the properties that were added to the original? - + \endlist For these reasons, Qt Objects should be treated as identities, not diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc index 37f54621a1..721b98c0f7 100644 --- a/src/corelib/doc/src/objectmodel/properties.qdoc +++ b/src/corelib/doc/src/objectmodel/properties.qdoc @@ -62,7 +62,7 @@ A property behaves like a class data member, but it has additional features accessible through the \l {Meta-Object System}. - \list + \list \li A \c READ accessor function is required if no \c MEMBER variable was specified. It is for reading the property value. Ideally, a const function @@ -130,7 +130,7 @@ gets and sets a widget's \c USER property. \li The presence of the \c CONSTANT attibute indicates that the property - value is constant. For a given object instance, the READ method of a + value is constant. For a given object instance, the READ method of a constant property must return the same value every time it is called. This constant value may be different for different instances of the object. A constant property cannot have a WRITE method or a NOTIFY signal. @@ -272,7 +272,7 @@ Q_DECLARE_METATYPE() macro so that their values can be stored in QVariant objects. This makes them suitable for use with both static properties declared using the Q_PROPERTY() macro in class - definitions and dynamic properties created at run-time. + definitions and dynamic properties created at run-time. \sa Q_DECLARE_METATYPE(), QMetaType, QVariant diff --git a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc index d897c4b9a7..4e285f2966 100644 --- a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc +++ b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc @@ -365,7 +365,7 @@ arguments can have default values. Consider QObject::destroyed(): \code - void destroyed(QObject* = 0); + void destroyed(QObject* = 0); \endcode When a QObject is deleted, it emits this QObject::destroyed() @@ -434,7 +434,7 @@ handle each signal differently. Suppose you have three push buttons that determine which file you - will open: "Tax File", "Accounts File", or "Report File". + will open: "Tax File", "Accounts File", or "Report File". In order to open the correct file, you use QSignalMapper::setMapping() to map all the clicked() signals to a QSignalMapper object. Then you connect diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index a751f9af56..daf853b916 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -238,7 +238,7 @@ // QWheelEvent //#define QT_NO_WHEELEVENT -// +// //#define QT_NO_XMLSTREAM // Animation diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index c27463897f..43db585643 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -325,7 +325,7 @@ SeeAlso: ??? Feature: COMBOBOX Description: Supports comboboxes presenting a list of options to the user. Section: Widgets -Requires: LINEEDIT STANDARDITEMMODEL LISTVIEW +Requires: LINEEDIT STANDARDITEMMODEL LISTVIEW Name: QComboBox SeeAlso: ??? @@ -516,7 +516,7 @@ SeeAlso: ??? Feature: WHATSTHIS Description: Supports displaying "What's this" help. Section: Widgets -Requires: TOOLBUTTON +Requires: TOOLBUTTON Name: QWhatsThis SeeAlso: ??? @@ -636,7 +636,7 @@ SeeAlso: ??? Feature: DIRMODEL Description: Supports a data model for the local filesystem. Section: ItemViews -Requires: ITEMVIEWS FILESYSTEMMODEL +Requires: ITEMVIEWS FILESYSTEMMODEL Name: QDirModel SeeAlso: ??? @@ -1030,7 +1030,7 @@ SeeAlso: ??? Feature: SYSTEMTRAYICON Description: Provides an icon for an application in the system tray. Section: Utilities -Requires: +Requires: Name: QSystemTrayIcon SeeAlso: ??? diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 233743f3ce..c45ad12e99 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -470,7 +470,7 @@ typedef qptrdiff qintptr; # else # define QT_ENSURE_STACK_ALIGNED_FOR_SSE # endif -# define QT_WIN_CALLBACK CALLBACK QT_ENSURE_STACK_ALIGNED_FOR_SSE +# define QT_WIN_CALLBACK CALLBACK QT_ENSURE_STACK_ALIGNED_FOR_SSE #endif typedef int QNoImplicitBoolCast; diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 8f788ac355..5f5e9a8b72 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -743,7 +743,7 @@ QDataStream &QDataStream::operator>>(bool &i) */ QDataStream &QDataStream::operator>>(float &f) -{ +{ if (version() >= QDataStream::Qt_4_6 && floatingPointPrecision() == QDataStream::DoublePrecision) { double d; diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp index fa0711461c..6ac6a3fbd9 100644 --- a/src/corelib/io/qfilesystemwatcher_win.cpp +++ b/src/corelib/io/qfilesystemwatcher_win.cpp @@ -207,7 +207,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, this, SIGNAL(fileChanged(QString,bool))); connect(thread, SIGNAL(directoryChanged(QString,bool)), this, SIGNAL(directoryChanged(QString,bool))); - + thread->msg = '@'; thread->start(); threads.append(thread); diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 4df9c6b911..c8a3f86137 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -1372,7 +1372,7 @@ qint64 QIODevice::write(const char *data, qint64 maxSize) \since 4.5 \overload - + Writes data from a zero-terminated string of 8-bit characters to the device. Returns the number of bytes that were actually written, or -1 if an error occurred. This is equivalent to diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index 3fdaa41206..d632ac70be 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -109,7 +109,7 @@ public: virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames); virtual Iterator *endEntryList(); - + bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0); bool supportsExtension(Extension extension) const; }; diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index d7b100ba3c..a0904fea24 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -1074,7 +1074,7 @@ static void initDefaultPaths(QMutexLocker *locker) QString systemPath; locker->unlock(); - + /* QLibraryInfo::location() uses QSettings, so in order to avoid a dead-lock, we can't hold the global mutex while @@ -3198,7 +3198,7 @@ bool QSettings::isWritable() const } /*! - + Sets the value of setting \a key to \a value. If the \a key already exists, the previous value is overwritten. @@ -3465,7 +3465,7 @@ void QSettings::setPath(Format format, Scope scope, const QString &path) \typedef QSettings::SettingsMap Typedef for QMap<QString, QVariant>. - + \sa registerFormat() */ @@ -3477,8 +3477,8 @@ void QSettings::setPath(Format format, Scope scope, const QString &path) \snippet code/src_corelib_io_qsettings.cpp 27 \c ReadFunc is used in \c registerFormat() as a pointer to a function - that reads a set of key/value pairs. \c ReadFunc should read all the - options in one pass, and return all the settings in the \c SettingsMap + that reads a set of key/value pairs. \c ReadFunc should read all the + options in one pass, and return all the settings in the \c SettingsMap container, which is initially empty. \sa WriteFunc, registerFormat() @@ -3491,7 +3491,7 @@ void QSettings::setPath(Format format, Scope scope, const QString &path) \snippet code/src_corelib_io_qsettings.cpp 28 - \c WriteFunc is used in \c registerFormat() as a pointer to a function + \c WriteFunc is used in \c registerFormat() as a pointer to a function that writes a set of key/value pairs. \c WriteFunc is only called once, so you need to output the settings in one go. diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp index bd127e621e..9ce14f1851 100644 --- a/src/corelib/io/qsettings_win.cpp +++ b/src/corelib/io/qsettings_win.cpp @@ -569,7 +569,7 @@ QWinSettingsPrivate::~QWinSettingsPrivate() { if (deleteWriteHandleOnExit && writeHandle() != 0) { #if defined(Q_OS_WINCE) - remove(regList.at(0).key()); + remove(regList.at(0).key()); #else QString emptyKey; DWORD res = RegDeleteKey(writeHandle(), reinterpret_cast<const wchar_t *>(emptyKey.utf16())); diff --git a/src/corelib/kernel/qfunctions_nacl.h b/src/corelib/kernel/qfunctions_nacl.h index bc44a21cb8..f40807a0d9 100644 --- a/src/corelib/kernel/qfunctions_nacl.h +++ b/src/corelib/kernel/qfunctions_nacl.h @@ -67,7 +67,7 @@ int pthread_cancel(pthread_t thread); int pthread_attr_setinheritsched(pthread_attr_t *attr, int inheritsched); -int pthread_attr_getinheritsched(const pthread_attr_t *attr, +int pthread_attr_getinheritsched(const pthread_attr_t *attr, int *inheritsched); // event dispatcher, select diff --git a/src/corelib/kernel/qmath.qdoc b/src/corelib/kernel/qmath.qdoc index 448b167662..06d8db9277 100644 --- a/src/corelib/kernel/qmath.qdoc +++ b/src/corelib/kernel/qmath.qdoc @@ -25,7 +25,7 @@ ** ****************************************************************************/ -/*! +/*! \headerfile <QtCore/qmath.h> \title Math Functions \ingroup funclists @@ -35,11 +35,11 @@ /*! \fn int qCeil(qreal v) - Return the ceiling of the value \a v. + Return the ceiling of the value \a v. The ceiling is the smallest integer that is not less than \a v. For example, if \a v is 41.2, then the ceiling is 42. - + \relates <QtCore/qmath.h> \sa qFloor() */ diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 14d96e96fd..4399349352 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -1001,7 +1001,7 @@ int QMetaObject::indexOfProperty(const char *name) const Q_ASSERT(priv(this->d.data)->revision >= 3); if (priv(this->d.data)->flags & DynamicMetaObject) { - QAbstractDynamicMetaObject *me = + QAbstractDynamicMetaObject *me = const_cast<QAbstractDynamicMetaObject *>(static_cast<const QAbstractDynamicMetaObject *>(this)); return me->createProperty(name, 0); @@ -2041,8 +2041,8 @@ QMetaMethod QMetaMethod::fromSignalImpl(const QMetaObject *metaObject, void **si \snippet code/src_corelib_kernel_qmetaobject.cpp 8 - QMetaObject::normalizedSignature() is used here to ensure that the format - of the signature is what invoke() expects. E.g. extra whitespace is + QMetaObject::normalizedSignature() is used here to ensure that the format + of the signature is what invoke() expects. E.g. extra whitespace is removed. If the "compute" slot does not take exactly one QString, one int @@ -2970,7 +2970,7 @@ QMetaMethod QMetaProperty::notifySignal() const { int id = notifySignalIndex(); if (id != -1) - return mobj->method(id); + return mobj->method(id); else return QMetaMethod(); } @@ -2978,7 +2978,7 @@ QMetaMethod QMetaProperty::notifySignal() const /*! \since 4.6 - Returns the index of the property change notifying signal if one was + Returns the index of the property change notifying signal if one was specified, otherwise returns -1. \sa hasNotifySignal() diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 3e578b36d7..a60deefe90 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -927,7 +927,7 @@ QObjectPrivate::Connection::~Connection() \relates QObject Returns the given \a object cast to type T if the object is of type - T (or of a subclass); otherwise returns 0. If \a object is 0 then + T (or of a subclass); otherwise returns 0. If \a object is 0 then it will also return 0. The class T must inherit (directly or indirectly) QObject and be @@ -3089,8 +3089,8 @@ bool QMetaObject::disconnect(const QObject *sender, int signal_index, /*! \internal -Disconnect a single signal connection. If QMetaObject::connect() has been called -multiple times for the same sender, signal_index, receiver and method_index only +Disconnect a single signal connection. If QMetaObject::connect() has been called +multiple times for the same sender, signal_index, receiver and method_index only one of these connections will be removed. */ bool QMetaObject::disconnectOne(const QObject *sender, int signal_index, @@ -3368,7 +3368,7 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i return; if (sender->d_func()->declarativeData && QAbstractDeclarativeData::signalEmitted) - QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender, + QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender, signal_index, argv); void *empty_argv[] = { 0 }; diff --git a/src/corelib/kernel/qsystemerror_p.h b/src/corelib/kernel/qsystemerror_p.h index 94bfb5deb4..4b46011129 100644 --- a/src/corelib/kernel/qsystemerror_p.h +++ b/src/corelib/kernel/qsystemerror_p.h @@ -66,14 +66,14 @@ public: StandardLibraryError, NativeError }; - + inline QSystemError(int error, ErrorScope scope); inline QSystemError(); - + QString toString(); inline ErrorScope scope(); inline int error(); - + //data members int errorCode; ErrorScope errorScope; diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp index 6b064c1d52..835a9fde5b 100644 --- a/src/corelib/kernel/qsystemsemaphore_win.cpp +++ b/src/corelib/kernel/qsystemsemaphore_win.cpp @@ -46,7 +46,7 @@ #include <qt_windows.h> QT_BEGIN_NAMESPACE - + #ifndef QT_NO_SYSTEMSEMAPHORE QSystemSemaphorePrivate::QSystemSemaphorePrivate() : diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index e7940e0039..04b9d92f55 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -150,7 +150,7 @@ inline void v_construct(QVariant::Private *x, const T &t) template <class T> inline void v_clear(QVariant::Private *d, T* = 0) { - + if (!QVariantIntegrator<T>::CanUseInternalSpace) { //now we need to cast //because QVariant::PrivateShared doesn't have a virtual destructor diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 4ccf449ae2..4de83c62ee 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -279,7 +279,7 @@ static QUuid createFromName(const QUuid &ns, const QByteArray &baseData, QCrypto The field layouts for the DCE versions listed in the table above are specified in the \l{http://www.ietf.org/rfc/rfc4122.txt} {Network Working Group UUID Specification}. - + Most platforms provide a tool for generating new UUIDs, e.g. \c uuidgen and \c guidgen. You can also use createUuid(). UUIDs generated by createUuid() are of the random type. Their @@ -534,23 +534,23 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes) \header \li Field # \li Source - + \row \li 1 \li data1 - + \row \li 2 \li data2 - + \row \li 3 \li data3 - + \row \li 4 \li data4[0] .. data4[1] - + \row \li 5 \li data4[2] .. data4[7] diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index dae3cb1988..a661d105cf 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -185,7 +185,7 @@ public: void unregisterTransition(QAbstractTransition *transition); void unregisterAllTransitions(); void handleTransitionSignal(QObject *sender, int signalIndex, - void **args); + void **args); void postInternalEvent(QEvent *e); void postExternalEvent(QEvent *e); @@ -195,7 +195,7 @@ public: bool isExternalEventQueueEmpty(); void processEvents(EventProcessingMode processingMode); void cancelAllDelayedEvents(); - + #ifndef QT_NO_PROPERTIES typedef QPair<QPointer<QObject>, QByteArray> RestorableId; QHash<QAbstractState*, QHash<RestorableId, QVariant> > registeredRestorablesForState; @@ -235,7 +235,7 @@ public: bool animated; QPair<QList<QAbstractAnimation*>, QList<QAbstractAnimation*> > - initializeAnimation(QAbstractAnimation *abstractAnimation, + initializeAnimation(QAbstractAnimation *abstractAnimation, const QPropertyAssignment &prop); QHash<QAbstractState*, QList<QAbstractAnimation*> > animationsForState; @@ -274,7 +274,7 @@ public: QHash<int, DelayedEvent> delayedEvents; QHash<int, int> timerIdToDelayedEventId; QMutex delayedEventsMutex; - + typedef QEvent* (*f_cloneEvent)(QEvent*); struct Handler { f_cloneEvent cloneEvent; diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp index 1c83f23df0..11623f80dc 100644 --- a/src/corelib/thread/qatomic.cpp +++ b/src/corelib/thread/qatomic.cpp @@ -49,7 +49,7 @@ For atomic operations on pointers, see the QAtomicPointer class. - An \e atomic operation is a complex operation that completes without interruption. + An \e atomic operation is a complex operation that completes without interruption. The QAtomicInt class provides atomic reference counting, test-and-set, fetch-and-store, and fetch-and-add for integers. diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp index 263f7d19fe..0c17399d33 100644 --- a/src/corelib/thread/qexception.cpp +++ b/src/corelib/thread/qexception.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -/*! +/*! \class QException \inmodule QtCore \brief The QException class provides a base class for exceptions that can transferred across threads. @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE \snippet code/src_corelib_thread_qexception.cpp 3 */ -/*! +/*! \class QUnhandledException \inmodule QtCore diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc index 4ab28e81b2..421e683c4a 100644 --- a/src/corelib/thread/qfuture.qdoc +++ b/src/corelib/thread/qfuture.qdoc @@ -58,7 +58,7 @@ use the isResultReadyAt() function to determine if a result is ready or not. For QFuture objects that report more than one result, the resultCount() function returns the number of continuous results. This - means that it is always safe to iterate through the results from 0 to + means that it is always safe to iterate through the results from 0 to resultCount(). QFuture provides a \l{Java-style iterators}{Java-style iterator} diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index f5590d95f8..0f7d04a7c5 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -288,7 +288,7 @@ void QFutureInterfaceBase::waitForResult(int resultIndex) return; lock.unlock(); - // To avoid deadlocks and reduce the number of threads used, try to + // To avoid deadlocks and reduce the number of threads used, try to // run the runnable in the current thread. QThreadPool::globalInstance()->d_func()->stealRunnable(d->runnable); diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h index d2d58a9332..e0a59697a1 100644 --- a/src/corelib/thread/qfutureinterface.h +++ b/src/corelib/thread/qfutureinterface.h @@ -234,7 +234,7 @@ inline void QFutureInterface<T>::reportResults(const QVector<T> &_results, int b this->reportResultsReady(resultCountBefore, store.count()); } else { const int insertIndex = store.addResults(beginIndex, &_results, count); - this->reportResultsReady(insertIndex, insertIndex + _results.count()); + this->reportResultsReady(insertIndex, insertIndex + _results.count()); } } diff --git a/src/corelib/thread/qfuturesynchronizer.h b/src/corelib/thread/qfuturesynchronizer.h index 426bb42b0d..39dbfc52a8 100644 --- a/src/corelib/thread/qfuturesynchronizer.h +++ b/src/corelib/thread/qfuturesynchronizer.h @@ -80,7 +80,7 @@ public: m_futures[i].cancel(); } } - + for (int i = 0; i < m_futures.count(); ++i) { m_futures[i].waitForFinished(); } diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp index b6bb22b314..0de826fddf 100644 --- a/src/corelib/thread/qreadwritelock.cpp +++ b/src/corelib/thread/qreadwritelock.cpp @@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE \sa QReadLocker, QWriteLocker, QMutex, QSemaphore */ -/*! +/*! \enum QReadWriteLock::RecursionMode \since 4.4 diff --git a/src/corelib/thread/qresultstore.cpp b/src/corelib/thread/qresultstore.cpp index 940fd45027..65c2437064 100644 --- a/src/corelib/thread/qresultstore.cpp +++ b/src/corelib/thread/qresultstore.cpp @@ -97,7 +97,7 @@ bool ResultIteratorBase::canIncrementVectorIndex() const return (m_vectorIndex + 1 < mapIterator.value().m_count); } -ResultStoreBase::ResultStoreBase() +ResultStoreBase::ResultStoreBase() : insertIndex(0), resultCount(0), m_filterMode(false), filteredResults(0) { } void ResultStoreBase::setFilterMode(bool enable) @@ -148,7 +148,7 @@ void ResultStoreBase::syncPendingResults() // check if we can insert any of the pending results: QMap<int, ResultItem>::iterator it = pendingResults.begin(); while (it != pendingResults.end()) { - int index = it.key(); + int index = it.key(); if (index != resultCount + filteredResults) break; @@ -165,7 +165,7 @@ int ResultStoreBase::addResult(int index, const void *result) return insertResultItem(index, resultItem); } -int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount) +int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount) { if (m_filterMode == false || vectorSize == totalCount) { ResultItem resultItem(results, vectorSize); @@ -218,7 +218,7 @@ ResultIteratorBase ResultStoreBase::resultAt(int index) const } const int vectorIndex = index - it.key(); - + if (vectorIndex >= it.value().count()) return ResultIteratorBase(m_results.end()); else if (it.value().isVector() == false && vectorIndex != 0) diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h index c14146656a..11ce23936d 100644 --- a/src/corelib/thread/qresultstore.h +++ b/src/corelib/thread/qresultstore.h @@ -148,7 +148,7 @@ protected: bool m_filterMode; QMap<int, ResultItem> pendingResults; int filteredResults; - + }; template <typename T> diff --git a/src/corelib/thread/qrunnable.cpp b/src/corelib/thread/qrunnable.cpp index eed716af37..e271582b9b 100644 --- a/src/corelib/thread/qrunnable.cpp +++ b/src/corelib/thread/qrunnable.cpp @@ -57,7 +57,7 @@ change the auto-deletion flag. QThreadPool supports executing the same QRunnable more than once - by calling QThreadPool::tryStart(this) from within the run() function. + by calling QThreadPool::tryStart(this) from within the run() function. If autoDelete is enabled the QRunnable will be deleted when the last thread exits the run function. Calling QThreadPool::start() multiple times with the same QRunnable when autoDelete is enabled diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 79199c97e0..dd4d4e74ae 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -524,9 +524,9 @@ int QThread::exec() Note that unlike the C library function of the same name, this function \e does return to the caller -- it is event processing - that stops. - - No QEventLoops will be started anymore in this thread until + that stops. + + No QEventLoops will be started anymore in this thread until QThread::exec() has been called again. If the eventloop in QThread::exec() is not running then the next call to QThread::exec() will also return immediately. diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index 2b099706ff..1616fb9fab 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -133,7 +133,7 @@ void QThreadPoolThread::run() // wait for work, exiting after the expiry timeout is reached expired = !manager->runnableReady.wait(locker.mutex(), manager->expiryTimeout); ++manager->activeThreads; - + if (expired) --manager->waitingThreads; } @@ -223,7 +223,7 @@ void QThreadPoolPrivate::enqueueTask(QRunnable *runnable, int priority) int QThreadPoolPrivate::activeThreadCount() const { - // To improve scalability this function is called without holding + // To improve scalability this function is called without holding // the mutex lock -- keep it thread-safe. return (allThreads.count() - expiredThreads.count() @@ -301,7 +301,7 @@ bool QThreadPoolPrivate::waitForDone(int msecs) QElapsedTimer timer; timer.start(); int t; - while (!(queue.isEmpty() && activeThreads == 0) && + while (!(queue.isEmpty() && activeThreads == 0) && ((t = msecs - timer.elapsed()) > 0)) noActiveThreads.wait(locker.mutex(), t); } @@ -367,11 +367,11 @@ void QThreadPoolPrivate::stealRunnable(QRunnable *runnable) \snippet code/src_corelib_concurrent_qthreadpool.cpp 0 - QThreadPool deletes the QRunnable automatically by default. Use + QThreadPool deletes the QRunnable automatically by default. Use QRunnable::setAutoDelete() to change the auto-deletion flag. QThreadPool supports executing the same QRunnable more than once - by calling tryStart(this) from within QRunnable::run(). + by calling tryStart(this) from within QRunnable::run(). If autoDelete is enabled the QRunnable will be deleted when the last thread exits the run function. Calling start() multiple times with the same QRunnable when autoDelete is enabled @@ -595,8 +595,8 @@ void QThreadPool::releaseThread() } /*! - Waits up to \a msecs milliseconds for all threads to exit and removes all - threads from the thread pool. Returns true if all threads were removed; + Waits up to \a msecs milliseconds for all threads to exit and removes all + threads from the thread pool. Returns true if all threads were removed; otherwise it returns false. If \a msecs is -1 (the default), the timeout is ignored (waits for the last thread to exit). */ diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc index b4558722cb..cc544af868 100644 --- a/src/corelib/tools/qalgorithms.qdoc +++ b/src/corelib/tools/qalgorithms.qdoc @@ -70,7 +70,7 @@ \snippet code/doc_src_qalgorithms.cpp 1 Different algorithms can have different requirements for the - iterators they accept. For example, qFill() accepts two + iterators they accept. For example, qFill() accepts two \l {forward iterators}. The iterator types required are specified for each algorithm. If an iterator of the wrong type is passed (for example, if QList::ConstIterator is passed as an \l {output @@ -369,7 +369,7 @@ of \a value in the variable passed as a reference in argument \a n. This is the same as qSort(\a{container}.begin(), \a{container}.end()); */ -/*! +/*! \fn void qStableSort(RandomAccessIterator begin, RandomAccessIterator end) \relates <QtAlgorithms> @@ -393,7 +393,7 @@ of \a value in the variable passed as a reference in argument \a n. \sa qSort(), {random access iterators} */ -/*! +/*! \fn void qStableSort(RandomAccessIterator begin, RandomAccessIterator end, LessThan lessThan) \relates <QtAlgorithms> @@ -406,7 +406,7 @@ of \a value in the variable passed as a reference in argument \a n. in case-insensitive alphabetical order: \snippet code/doc_src_qalgorithms.cpp 16 - + Note that earlier versions of Qt allowed using a lessThan function that took its arguments by non-const reference. From 4.3 and on this is no longer possible, the arguments has to be passed by const reference or value. @@ -423,7 +423,7 @@ of \a value in the variable passed as a reference in argument \a n. property is often useful when sorting user-visible data. */ -/*! +/*! \fn void qStableSort(Container &container) \relates <QtAlgorithms> @@ -470,7 +470,7 @@ of \a value in the variable passed as a reference in argument \a n. specified by the \a lessThan object. */ -/*! +/*! \fn void qLowerBound(const Container &container, const T &value) \relates <QtAlgorithms> @@ -520,7 +520,7 @@ of \a value in the variable passed as a reference in argument \a n. specified by the \a lessThan object. */ -/*! +/*! \fn void qUpperBound(const Container &container, const T &value) \relates <QtAlgorithms> @@ -568,7 +568,7 @@ of \a value in the variable passed as a reference in argument \a n. specified by the \a lessThan object. */ -/*! +/*! \fn void qBinaryFind(const Container &container, const T &value) \relates <QtAlgorithms> @@ -578,7 +578,7 @@ of \a value in the variable passed as a reference in argument \a n. */ -/*! +/*! \fn void qDeleteAll(ForwardIterator begin, ForwardIterator end) \relates <QtAlgorithms> @@ -601,7 +601,7 @@ of \a value in the variable passed as a reference in argument \a n. \sa {forward iterators} */ -/*! +/*! \fn void qDeleteAll(const Container &c) \relates <QtAlgorithms> diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp index 66ae7d21c2..2b459b2b1b 100644 --- a/src/corelib/tools/qbitarray.cpp +++ b/src/corelib/tools/qbitarray.cpp @@ -173,7 +173,7 @@ int QBitArray::count(bool on) const while (len >= 24) { quint32 v = quint32(bits[0]) | (quint32(bits[1]) << 8) | (quint32(bits[2]) << 16); quint32 c = ((v & 0xfff) * Q_UINT64_C(0x1001001001001) & Q_UINT64_C(0x84210842108421)) % 0x1f; - c += (((v & 0xfff000) >> 12) * Q_UINT64_C(0x1001001001001) & Q_UINT64_C(0x84210842108421)) % 0x1f; + c += (((v & 0xfff000) >> 12) * Q_UINT64_C(0x1001001001001) & Q_UINT64_C(0x84210842108421)) % 0x1f; len -= 24; bits += 3; numBits += int(c); @@ -467,7 +467,7 @@ QBitArray &QBitArray::operator&=(const QBitArray &other) resize(qMax(size(), other.size())); uchar *a1 = reinterpret_cast<uchar*>(d.data()) + 1; const uchar *a2 = reinterpret_cast<const uchar*>(other.d.constData()) + 1; - int n = other.d.size() -1 ; + int n = other.d.size() -1 ; int p = d.size() - 1 - n; while (n-- > 0) *a1++ &= *a2++; @@ -496,7 +496,7 @@ QBitArray &QBitArray::operator|=(const QBitArray &other) resize(qMax(size(), other.size())); uchar *a1 = reinterpret_cast<uchar*>(d.data()) + 1; const uchar *a2 = reinterpret_cast<const uchar *>(other.d.constData()) + 1; - int n = other.d.size() - 1; + int n = other.d.size() - 1; while (n-- > 0) *a1++ |= *a2++; return *this; diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 950d291986..dc3f5f3be9 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -397,7 +397,7 @@ static const quint16 crc_tbl[16] = { 0xc60c, 0xd68d, 0xe70e, 0xf78f }; -/*! +/*! \relates QByteArray Returns the CRC-16 checksum of the first \a len bytes of \a data. @@ -422,7 +422,7 @@ quint16 qChecksum(const char *data, uint len) return ~crc & 0xffff; } -/*! +/*! \fn QByteArray qCompress(const QByteArray& data, int compressionLevel) \relates QByteArray @@ -1370,7 +1370,7 @@ QByteArray::QByteArray(int size, char ch) } /*! - \internal + \internal Constructs a byte array of size \a size with uninitialized contents. */ @@ -1904,7 +1904,7 @@ QByteArray &QByteArray::replace(const QByteArray &before, const QByteArray &afte QByteArray aft = after; if (after.d == d) aft.detach(); - + return replace(before.constData(), before.size(), aft.constData(), aft.size()); } @@ -1921,7 +1921,7 @@ QByteArray &QByteArray::replace(const char *c, const QByteArray &after) QByteArray aft = after; if (after.d == d) aft.detach(); - + return replace(c, qstrlen(c), aft.constData(), aft.size()); } @@ -1954,7 +1954,7 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after memcpy(copy, before, bsize); b = copy; } - + QByteArrayMatcher matcher(before, bsize); int index = 0; int len = d->size; @@ -2044,8 +2044,8 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after ::free((char *)a); if (b != before) ::free((char *)b); - - + + return *this; } @@ -2274,7 +2274,7 @@ int QByteArray::indexOf(const char *c, int from) const const int ol = qstrlen(c); if (ol == 1) return indexOf(*c, from); - + const int l = d->size; if (from > d->size || ol + from > l) return -1; @@ -3580,7 +3580,7 @@ QByteArray QByteArray::toBase64() const return tmp; } -/*! +/*! \fn QByteArray &QByteArray::setNum(int n, int base) Sets the byte array to the printed value of \a n in base \a base (10 @@ -3597,21 +3597,21 @@ QByteArray QByteArray::toBase64() const \sa number(), toInt() */ -/*! +/*! \fn QByteArray &QByteArray::setNum(uint n, int base) \overload \sa toUInt() */ -/*! +/*! \fn QByteArray &QByteArray::setNum(short n, int base) \overload \sa toShort() */ -/*! +/*! \fn QByteArray &QByteArray::setNum(ushort n, int base) \overload @@ -3677,7 +3677,7 @@ QByteArray &QByteArray::setNum(qulonglong n, int base) return *this; } -/*! +/*! \overload Sets the byte array to the printed value of \a n, formatted in format @@ -3736,7 +3736,7 @@ QByteArray &QByteArray::setNum(double n, char f, int prec) return *this; } -/*! +/*! \fn QByteArray &QByteArray::setNum(float n, char f, int prec) \overload @@ -3806,7 +3806,7 @@ QByteArray QByteArray::number(qulonglong n, int base) return s; } -/*! +/*! \overload Returns a byte array that contains the printed value of \a n, diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp index bfef234ae4..b92c4d3fe9 100644 --- a/src/corelib/tools/qcontiguouscache.cpp +++ b/src/corelib/tools/qcontiguouscache.cpp @@ -313,8 +313,8 @@ MyRecord record(int row) const In most cases it is better to use either at() or insert(). - \note This non-const overload of operator[] requires QContiguousCache - to make a deep copy. Use at() for read-only access to a non-const + \note This non-const overload of operator[] requires QContiguousCache + to make a deep copy. Use at() for read-only access to a non-const QContiguousCache. \sa insert(), at() diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index fdf2d1a620..32f5f0b33a 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -308,7 +308,7 @@ void QCryptographicHash::addData(const char *data, int length) sha3Update(&d->sha3Context, reinterpret_cast<const BitSequence *>(data), length*8); break; #endif - } + } d->result.clear(); } @@ -350,7 +350,7 @@ bool QCryptographicHash::addData(QIODevice* device) */ QByteArray QCryptographicHash::result() const { - if (!d->result.isEmpty()) + if (!d->result.isEmpty()) return d->result; switch (d->method) { diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index b8cd076cb6..ed756cbeb6 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -574,7 +574,7 @@ void QHashData::checkSanity() \fn uint qHash(const QPair<T1, T2> &key, uint seed = 0) \since 5.0 \relates QHash - + Returns the hash value for the \a key, using \a seed to seed the calculation. Types \c T1 and \c T2 must be supported by qHash(). diff --git a/src/corelib/tools/qiterator.qdoc b/src/corelib/tools/qiterator.qdoc index 798d25e050..25914967a9 100644 --- a/src/corelib/tools/qiterator.qdoc +++ b/src/corelib/tools/qiterator.qdoc @@ -25,7 +25,7 @@ ** ****************************************************************************/ -/*! +/*! \class QListIterator \inmodule QtCore @@ -78,7 +78,7 @@ \sa QMutableListIterator, QList::const_iterator */ -/*! +/*! \class QLinkedListIterator \inmodule QtCore @@ -126,7 +126,7 @@ \sa QMutableLinkedListIterator, QLinkedList::const_iterator */ -/*! +/*! \class QVectorIterator \inmodule QtCore \brief The QVectorIterator class provides a Java-style const iterator for QVector and QStack. @@ -178,7 +178,7 @@ \sa QMutableVectorIterator, QVector::const_iterator */ -/*! +/*! \class QSetIterator \inmodule QtCore \brief The QSetIterator class provides a Java-style const iterator for QSet. @@ -225,7 +225,7 @@ \sa QMutableSetIterator, QSet::const_iterator */ -/*! +/*! \class QMutableListIterator \inmodule QtCore @@ -291,7 +291,7 @@ \sa QListIterator, QList::iterator */ -/*! +/*! \class QMutableLinkedListIterator \inmodule QtCore @@ -352,7 +352,7 @@ \sa QLinkedListIterator, QLinkedList::iterator */ -/*! +/*! \class QMutableVectorIterator \inmodule QtCore @@ -418,7 +418,7 @@ \sa QVectorIterator, QVector::iterator */ -/*! +/*! \class QMutableSetIterator \inmodule QtCore \since 4.2 @@ -869,7 +869,7 @@ \sa remove(), setValue() */ -/*! +/*! \class QMapIterator \inmodule QtCore @@ -921,7 +921,7 @@ \sa QMutableMapIterator, QMap::const_iterator */ -/*! +/*! \class QHashIterator \inmodule QtCore @@ -973,7 +973,7 @@ \sa QMutableHashIterator, QHash::const_iterator */ -/*! +/*! \class QMutableMapIterator \inmodule QtCore @@ -1038,7 +1038,7 @@ \sa QMapIterator, QMap::iterator */ -/*! +/*! \class QMutableHashIterator \inmodule QtCore diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp index 5d8368e930..3fb958fae6 100644 --- a/src/corelib/tools/qline.cpp +++ b/src/corelib/tools/qline.cpp @@ -374,7 +374,7 @@ QDataStream &operator>>(QDataStream &stream, QLine &line) \value UnboundedIntersection The two lines intersect, but not within the range defined by their lengths. This will be the case - if the lines are not parallel. + if the lines are not parallel. intersect() will also return this value if the intersect point is within the start and end point of only one of the lines. @@ -499,9 +499,9 @@ QDataStream &operator>>(QDataStream &stream, QLine &line) Sets the length of the line to the given \a length. QLineF will move the end point - p2() - of the line to give the line its new length. - + If the line is a null line, the length will remain zero regardless - of the length specified. + of the length specified. \sa length(), isNull() */ diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp index 6e7b541110..2cdc3f3f03 100644 --- a/src/corelib/tools/qmargins.cpp +++ b/src/corelib/tools/qmargins.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \ingroup painting \since 4.6 - \brief The QMargins class defines the four margins of a rectangle. + \brief The QMargins class defines the four margins of a rectangle. QMargin defines a set of four margins; left, top, right and bottom, that describe the size of the borders surrounding a rectangle. diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc index 55353dc258..b0caf1aaf0 100644 --- a/src/corelib/tools/qpair.qdoc +++ b/src/corelib/tools/qpair.qdoc @@ -31,7 +31,7 @@ \brief The QPair class is a template class that stores a pair of items. \ingroup tools - + QPair\<T1, T2\> can be used in your application if the STL \c pair type is not available. It stores one value of type T1 and one value of type T2. It can be used as a return value for a diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index cbb3580024..83e87ff637 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -298,7 +298,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from, Square brackets mean match any character contained in the square brackets. The character set abbreviations described above can appear in a character set in square brackets. Except for the - character set abbreviations and the following two exceptions, + character set abbreviations and the following two exceptions, characters do not have special meanings in square brackets. \table diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h index 9c952fea21..b17c6d2f40 100644 --- a/src/corelib/tools/qringbuffer_p.h +++ b/src/corelib/tools/qringbuffer_p.h @@ -375,7 +375,7 @@ public: --tailBuffer; } bufferSize -= qba.length(); - return qba; + return qba; } // append a new buffer to the end diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc index cd90b4949b..c1351943e1 100644 --- a/src/corelib/tools/qset.qdoc +++ b/src/corelib/tools/qset.qdoc @@ -130,7 +130,7 @@ \fn QSet<T> &QSet::operator=(const QSet<T> &other) Assigns the \a other set to this set and returns a reference to - this set. + this set. */ /*! @@ -306,7 +306,7 @@ Returns a non-const iterator positioned at the item \a value in the set. If the set contains no item \a value, the function - returns end(). + returns end(). */ /*! \fn QSet::const_iterator QSet::constFind(const T &value) const @@ -351,7 +351,7 @@ \overload Returns a non-const \l{STL-style iterators}{STL-style iterator} positioned at the first - item in the set. + item in the set. */ /*! \fn QSet::const_iterator QSet::cbegin() const @@ -496,7 +496,7 @@ /*! \fn QSet<T> &QSet::subtract(const QSet<T> &other) - Removes all items from this set that are contained in the + Removes all items from this set that are contained in the \a other set. Returns a reference to this set. \sa operator-=(), unite(), intersect() @@ -506,7 +506,7 @@ \fn bool QSet::empty() const Returns true if the set is empty. This function is provided - for STL compatibility. It is equivalent to isEmpty(). + for STL compatibility. It is equivalent to isEmpty(). */ /*! @@ -529,7 +529,7 @@ /*! \fn QSet<T> &QSet::operator-=(const T &value) - Removes the occurrence of item \a value from the set, if + Removes the occurrence of item \a value from the set, if it is found, and returns a reference to the set. If the \a value is not contained the set, nothing is removed. @@ -559,7 +559,7 @@ \overload Same as intersect(\e{other}), if we consider \e{other} to be a set - that contains the singleton \a value. + that contains the singleton \a value. */ @@ -575,7 +575,7 @@ \fn QSet<T> QSet::operator|(const QSet<T> &other) const \fn QSet<T> QSet::operator+(const QSet<T> &other) const - Returns a new QSet that is the union of this set and the + Returns a new QSet that is the union of this set and the \a other set. \sa unite(), operator|=(), operator&(), operator-() @@ -622,7 +622,7 @@ iterators are slightly faster, and can improve code readability. QSet\<T\>::iterator allows you to iterate over a QSet\<T\> and - modify it as you go (using QSet::erase()). However, + modify it as you go (using QSet::erase()). However, The default QSet::iterator constructor creates an uninitialized iterator. You must initialize it using a function like @@ -701,7 +701,7 @@ \sa QSet::begin(), QSet::end() */ -/*! +/*! \fn QSet::iterator::iterator(typename Hash::iterator i) \fn QSet::const_iterator::const_iterator(typename Hash::const_iterator i) diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp index 8205560781..cee0c1d450 100644 --- a/src/corelib/tools/qshareddata.cpp +++ b/src/corelib/tools/qshareddata.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -/*! +/*! \class QSharedData \inmodule QtCore \brief The QSharedData class is a base class for shared data objects. @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE \a other is ignored. */ -/*! +/*! \class QSharedDataPointer \inmodule QtCore \brief The QSharedDataPointer class represents a pointer to an implicitly shared object. @@ -395,7 +395,7 @@ QT_BEGIN_NAMESPACE return the proper polymorphic type. */ -/*! +/*! \class QExplicitlySharedDataPointer \inmodule QtCore \brief The QExplicitlySharedDataPointer class represents a pointer to an explicitly shared object. diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/tools/qtextboundaryfinder.cpp index 5e8aed579d..eb861b7289 100644 --- a/src/corelib/tools/qtextboundaryfinder.cpp +++ b/src/corelib/tools/qtextboundaryfinder.cpp @@ -84,7 +84,7 @@ static void init(QTextBoundaryFinder::BoundaryType type, const QChar *chars, int QUnicodeTools::initCharAttributes(string, length, scriptItems.data(), scriptItems.count(), attributes, options); } -/*! +/*! \class QTextBoundaryFinder \inmodule QtCore diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp index e72c1964a2..725cf894c6 100644 --- a/src/corelib/tools/qvector.cpp +++ b/src/corelib/tools/qvector.cpp @@ -435,7 +435,7 @@ Same as at(\a i). */ -/*! +/*! \fn void QVector::append(const T &value) Inserts \a value at the end of the vector. diff --git a/src/corelib/xml/qxmlutils.cpp b/src/corelib/xml/qxmlutils.cpp index 52921919eb..d175d554cc 100644 --- a/src/corelib/xml/qxmlutils.cpp +++ b/src/corelib/xml/qxmlutils.cpp @@ -70,7 +70,7 @@ bool QXmlUtils::rangeContains(RangeIter begin, RangeIter end, const QChar c) // check the first two ranges "manually" as characters in that // range are checked very often and we avoid the binary search below. - + if (cp <= begin->max) return cp >= begin->min; |