summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
Commit message (Collapse)AuthorAgeFilesLines
* fix warning in qstringbuilder.h by using QLatin1Charhjk2009-07-131-1/+1
| | | | Reviewed-by: Volker Hilsheimer
* fix the test _and_ the class :)Harald Fernengel2009-07-031-1/+1
|
* Add a specialization for QByteArrayHarald Fernengel2009-07-031-0/+12
| | | | It tries to keep the semantics of QString::append(QByteArray) as much as possible.
* Use 'struct QConcatenable' instead of 'class QConcatenable' tohjk2009-07-091-1/+1
| | | | make compiler distinguishing both happy.
* QRingBuffer micro optimizationMarkus Goetz2009-07-091-1/+4
|
* Add QT_END_HEADER to fix compile on PowerPC Mac and make autotest pass.Volker Hilsheimer2009-07-091-0/+2
|
* doc: Corrected several qdoc warnings.Martin Smith2009-07-031-3/+3
|
* Revert "Add support for creating the object alongside the Data structure in ↵Thiago Macieira2009-07-021-47/+0
| | | | | | | | | | | | | | | | QSharedPointer" This reverts commit fb51a10ee0451274a430227566ae26efb2ac4474. Sorry, it didn't work. I can fix the MSVC error, but the problem is that older GCC versions (4.2) fail with the following code: template<typename T> struct Buffer { char buffer[128] __attribute__((aligned(__alignof__(T)))); }; The same works fine in GCC 4.4.
* Experimental: allow QSharedPointer to be used with forward declarations that ↵Thiago Macieira2009-07-021-1/+1
| | | | | | | | | | | | | are declared in this file. The one-definition rule allows the forward declaration appearing below to apply to code that was earlier. Therefore, if the compiler finds out how to delete the object, we can allow a QSharedPointer of a forward- declared-type. This means the actual problem is just a warning with g++. To catch the error, we need a separate .cpp file and I'd rather run this as an external test.
* Add support for creating the object alongside the Data structure inThiago Macieira2009-07-021-0/+47
| | | | | | | | | one go. This avoids one memory allocation. Currently, we only support calling the default constructors. I will *NOT* implement argument passing for C++03. I will implement it with rvalue references for C++0x-capable compilers.
* Add qobject_cast for QSharedPointer.Thiago Macieira2009-07-023-0/+110
| | | | | | | | | This obviously only works for classes that derive from QObject. And you must remember that QSharedPointer controls the QObject's lifetime, not the QObject parent-child relationship. Reviewed-by: dt Reviewed-by: Bradley T. Hughes
* Merge branch '4.5'Thiago Macieira2009-07-022-6693/+6694
|\
| * Fixed the build on Windows after regenerating the unicode tables.Denis Dzyubenko2009-07-011-2/+2
| | | | | | | | Reviewed-by: trustme
| * Regenerated unicode tables after the fix in the generator.Denis Dzyubenko2009-07-012-6693/+6694
| | | | | | | | | | | | | | This is related to the following fix: 70137e0601549af1056082cdfbb4f141c70befab Reviewed-by: trustme
* | QNAM: Direct transfer of HTTP buffer to the QNetworkReply bufferMarkus Goetz2009-07-011-1/+46
| | | | | | | | | | | | | | Directly put a QRingBuffer from one QRingBuffer to another QRingBuffer. Reviewed-by: Thiago Macieira
* | src/corelib: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-013-127/+45
| | | | | | | | | | | | | | | | | | | | | | | | support Also: QString::fromUtf16() -> QString::fromWCharArray() WCHAR & TCHAR -> wchar_t LPTSTR/LPCTSTR -> LPWSTR/LPCWSTR Documentation update Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Initialize the time structure in QTime::currentTime()Benjamin Poulain2009-06-291-2/+1
| | | | | | | | | | | | | | | | In QTime::currentTime(), the pointer to the tm structure was used without being initialized. Task-number: 256889 Reviewed-by: Markus Goetz
* | Fixed a gcc 4.4 warning on switching a value outside the enum.Thiago Macieira2009-06-262-8/+13
| | | | | | | | | | These four enum values are used in variables of type Section, but aren't in it. With gcc 4.4, it displays a warning that the value is lower than the lowest value
* | Clean up QSharedPointer cast implementations.Thiago Macieira2009-06-261-57/+19
| | | | | | | | | | | | | | There's no need to have separate cast-checker functions, plus the cast- and centralise the function to create the object. Reviewed-by: TrustMe
* | Merge branch '4.5'Thiago Macieira2009-06-252-2/+6
|\ \ | |/ | | | | | | | | Conflicts: src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
| * Change QSharedPointer to track (or not) pointers when the #define isThiago Macieira2009-06-252-2/+6
| | | | | | | | | | | | | | | | | | enabled. This allows mixing of debug and non-debug code (possible on Unix systems) without causing assertion failures. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* | 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
| | |