diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 17:53:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 17:53:10 (GMT) |
| commit | ef51033ad135450dd2a0f5efc641b330f8ef63b9 (patch) | |
| tree | e016d899987c30c9cc48d32e451cbfcddbd413de /tools/porting/src/textreplacement.h | |
| parent | d194ebdc199fdd85245bfecb766d836dfa79c3f3 (diff) | |
| parent | d190802d33b763e7a21b85fb3dc2ed7c039ddbb6 (diff) | |
| download | Qt-ef51033ad135450dd2a0f5efc641b330f8ef63b9.zip Qt-ef51033ad135450dd2a0f5efc641b330f8ef63b9.tar.gz Qt-ef51033ad135450dd2a0f5efc641b330f8ef63b9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
Diffstat (limited to 'tools/porting/src/textreplacement.h')
| -rw-r--r-- | tools/porting/src/textreplacement.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/porting/src/textreplacement.h b/tools/porting/src/textreplacement.h index f90fb82..f351552 100644 --- a/tools/porting/src/textreplacement.h +++ b/tools/porting/src/textreplacement.h @@ -53,7 +53,7 @@ class TextReplacement public: QByteArray newText; int insertPosition; - int currentLenght; //lenght of the text that is going to be replaced. + int currentLenght; //length of the text that is going to be replaced. bool operator<(const TextReplacement &other) const { return (insertPosition < other.insertPosition); @@ -70,7 +70,7 @@ public: insert maintains the TextReplacement list in sorted order. - Returns true if the insert was successfull, false otherwise; + Returns true if the insert was successful, false otherwise; */ bool insert(QByteArray newText, int insertPosition, int currentLenght); void clear(); |