summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-06-241-1/+1
|\ | | | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| * Fix comparison of different-sized QStringRefs.Thiago Macieira2009-06-241-1/+1
| | | | | | | | | | | | | | Two strings are only equal if they have the same size. Task-number: 256763 Reviewed-by: TrustMe
* | More culling of Panther Code.Norwegian Rock Cat2009-06-231-27/+19
| | | | | | | | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-232-35/+29
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| * Regression against 4.4 in QRectF::operator|.Bjørn Erik Nilsen2009-06-232-35/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.4 QRectF handled flat rectangles in the same fashion as QRect does, but that changed with Lars' and Jo's optmizations done in the falcon branch. The difference is that the optimized version only checks whether the width or height is 0, whereas in 4.4 both had to be 0 (isNull()) before we bailed out. This regression also introduced a regression in QGraphicsItem::childrenBoundingRect(). Auto-test included. Task-number: 254995 Reviewed-by: Lars
* | Changed enum Qt::Uninitialized to enum Qt::InitializationMartin Smith2009-06-194-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | enum Qt::Uninitialized contains one value, which is also called Uninitialized. Because the type and the value used the same name, wherever the type Qt::Uninitialized was used in a function signature, you had to include the enum keyword. But qdoc's preprocessor doesn't like that, so you have to take the enum keyword out of the signatures. But then the compiler complains because the type and the value look the same. So I had to change the enum type name to Initialization, so the compiler can distinguish it from the value name. And qdoc likes that too.
* | Small speedup of construction of uninitialized QByteArrayshjk2009-06-191-10/+5
| | | | | | | | | | | | | | Directly construct uninitialized QByteArrays of required size instead of default-constructing one and resizing it afterwards. Reviewed-by: mariusSO
* | New constructor QByteArray::QByteArray(int size, enum Qt::Uninitialized)hjk2009-06-192-1/+17
| | | | | | | | | | | | | | Contrary to the QByteArray::QByteArray(int size, enum Qt::Uninitialized) constructor this does not initialize its data. Reviewed-by: mariusSO
* | Don't initialize data that will be overwritten immediately.hjk2009-06-182-16/+8
| | | | | | | | Reviewed-by: mariusSO
* | Use enum Qt::Uninitialized instead of struct QString::Uninitializedhjk2009-06-183-4/+3
| | | | | | | | | | | | | | There is no BC issue as the changed constructor was introduced recently and there is no released version of Qt using it. Reviewed-by: mariusSO
* | doc: Added explanation of QStringBuilder in QStringMartin Smith2009-06-182-0/+70
| | | | | | | | | | | | | | | | The QStringBuilder class documentation is marked \internal. A section has been added to the documentation for QString that explains how to use the reimplemented '%' operator of QStringBuilder to obtain more efficient string concatenation operations.
* | doc: Fixed several qdoc warnings.Martin Smith2009-06-172-27/+36
| | | | | | | | | | | | | | | | All the qdoc errors are fixed in QStringBuilder, but because the class is a template class and uses strange templates, qdoc gets very confused, and the resulting documentation for QStringBuilder is not complete and accurate. To fix this correctly will require changes to the qdoc program.
* | Update license headers in files that are new in 4.6.Jason McDonald2009-06-176-12/+12
| | | | | | | | Reviewed-by: Trust Me
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-1671-142/+142
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1672-144/+144
| | | | | | | | Reviewed-by: Trust Me
* | doc: Fixed several qdoc warnings.Martin Smith2009-06-112-12/+5
| |
* | Fix license headers for QStringBuilder.Jason McDonald2009-06-102-12/+12
| | | | | | | | | | | | | | Only release branches are allowed to have the Commercial usage header. All other branches must have the No Commercial Usage header. Reviewed-by: Trust Me
* | small refactoring to reduce memory usage of static dataThierry Bastian2009-06-092-6/+6
| |
* | Reduce the members in QLocale to 16bit integer instea of 32 bits.Thierry Bastian2009-06-081-19/+19
| | | | | | | | | | | | That reduces memory usage. Reviewed-by: denis
* | Small fix to exported symbolThierry Bastian2009-06-081-1/+1
| |
* | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-086-7/+13
| | | | | | | | | | | | | | | | Some checks where in the wrong locations, and some endifs where hard to read. Merge-request: 611 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Make QCharRef known to QStringBuilder.hjk2009-06-082-4/+14
| |
* | Make QStringBuilder work out-of-the-box if QT_NO_CAST_FROM_ASCII is definedhjk2009-06-051-0/+24
| | | | | | | | | | | | | | | | So far, only operator% was working for concatenation in those circumnstances. Now, defining QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION is enough, so user code will work without any source changes. Reviewed-by: joao
* | Fixed build error with Sun CC 5.5.jasplin2009-06-041-1/+8
| | | | | | | | Reviewed-by: TrustMe
* | Doc fix: moved the cldr version outside of the double-to-string license headerDenis Dzyubenko2009-06-031-2/+2
| |
* | Merged changes to the string builder class.David Boddie2009-06-021-3/+3
| | | | | | | | Reviewed-by: Trust Me
* | Removed an ifdef in QLocale that breaks the One Definition Rule.Denis Dzyubenko2009-06-022-3/+0
| | | | | | | | | | | | | | | | | | | | | | From a merge request #553 by Gordon Schumacher: During a build internal to Qt, if a header included by qlocale.cpp itself includes qlocale.h, then QLOCALE_CPP will never be set. If you attempt to build qmake from its own .pro file, qmake_pch.h includes qtextstream.h, which (now) includes qlocale.h, thus causing a compile error trying to call the QSystemLocale(bool) function Inspired-by: Gordon Schumacher <gordon@rebit.com>
* | Merge branch 'review/master'Marius Bugge Monsen2009-05-291-1/+1
|\ \
| * | Fix compilation with -pedanticDavid Faure2009-05-291-1/+1
| | |
* | | Doc - some changes to fix a qdoc warningKavindra Devi Palaraja2009-05-291-2/+2
| | |
* | | Fix qstringbuilder documentation.hjk2009-05-291-1/+1
|/ / | | | | | | It was using !fn instead of \fn accidentally.
* | Introduce a new class QStringBuilder to speed up the creation ofhjk2009-05-285-3/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString objects from smaller chunks. The QStringBuilder class: QStringBuilder uses expression templates (using the '%' operator) to postpone any actual concatenation until it is assigned to an actual QString. At that time it knows the exact sizes of all chunks, can compute the required space, allocates once a QString of appriopriate size and then copies over the chunk data one-by-one. In addition, QLatin1Literal is a drop-in replacement for QLatin1String (which we can't change for compatibility reasons) that knows its size, therefore saving a few cycles when computing the size of the resulting string. Some further saved cycles stem from inlining and reduced reference counting logic (the QString created from a QStringBuilder has typically ref count equal to 1, while QString::append() needs an extra test) Minor changes to the existing QString class: - Introduce QString constructor to create an uninitialized QString of a given size. This particular constructor is used by QStringBuilder class. - Introduce a QT_USE_FAST_CONCATENATION macro to disable the existing overloads of operator+() and helps finding the places where they are used in code. - Introduce QT_USE_FAST_OPERATOR_PLUS. This also disables the existing overloads of operator+() and creates a new templated operator+() with identical implementation of operator%(). This allows code that is compilable QT_CAST_{TO,FROM}_ASCII to use QStringBuilder almost transparently. The only case that is not covered is creating objects like QUrl that are implicitly constructible from a QString from a QStringBuilder result. This needs to be converted explicitly to a QString first, e.g. by using QUrl url(QString(QLatin1String("http://") + hostName)); Reviewed-by: MariusSO
* | improved string operations all over the placeThierry Bastian2009-05-282-3/+3
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-274-7/+9
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * qdoc: Indicate what iterator_categor means for container classes.Martin Smith2009-05-262-4/+8
| | | | | | | | Task-number: 245501
| * Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-2/+0
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Fixed terminology.David Boddie2009-05-251-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Protect dump function by ifdef.Ian Walters2009-05-252-1/+11
| | | | | | | | | | Use the same pattern for protecting the dump function as qmap.h and qhash.h employ.
* | Some refactoring of windows specific code + a private class of animationsThierry Bastian2009-05-252-3/+3
| |
* | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-254-8/+8
| | | | | | | | | | | | | | Wherever I found that we were using a string instead of a single char I fixed the code. Reviewed-by: olivier
* | Reintroduce the unaligned-unaligned 32-bit code that I had removed out of ↵Thiago Macieira2009-05-221-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ignorance. If both pointers are out of 4-byte alignment, doing the first load will align them so we can do 32-bit comparisons. Lars's code had this before, but I misunderstood it and removed, thinking it was doing misaligned accesses. I experimented with moving the tail comparison above the 32-bit comparison to save a register, but it made things worse. Reviewed-By: Bradley T. Hughes
* | Optimise QString comparison based on the results from the benchmarkThiago Macieira2009-05-221-125/+38
| | | | | | | | Reviewed-By: Bradley T. Hughes
* | Don't use memcmp it's terribly slow.Lars Knoll2009-05-221-6/+146
| | | | | | | | | | | | | | Added qMemEquals method that returns true if the two memory regions contain the same content. Reviewed-By: Thiago Macieira
* | Say hello to animation API & state machine APIKent Hansen2009-05-225-53/+1028
| |
* | Merge commit 'origin/4.5'Samuel Rødal2009-05-201-4/+1
|\ \ | |/
| * Fix a compile error on MSVC 64bits due to qhash casting a pointer.Thierry Bastian2009-05-201-4/+1
| | | | | | | | | | | | | | I tested it with 32 bits compilation and there is no warning any more. Task-number: 247325 Reviewed-by: ogoffart
* | Remove QDumper. It was used in a previous version of creator but is nowThierry Bastian2009-05-202-1158/+0
| | | | | | | | useless.
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-196-15/+18
|\ \ | |/
| * Clarifying what QLocale::C is and is notNils Christian Roscher-Nielsen2009-05-191-2/+2
| | | | | | | | Reviewed-by: David Boddie
| * Fix compiler warning: use C++ cast operator, not the old-style C cast.Ariya Hidayat2009-05-191-1/+1
| | | | | | | | Reviewed-by: Marius Storm-Olsen
generated by cgit v0.12 at 2025-01-13 23:01:09 (GMT)