diff options
author | Darrell Anderson <[email protected]> | 2012-06-18 00:09:52 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2012-06-18 00:09:52 -0500 |
commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
tree | b910be3588cb706defc00c31aefa850bb2312784 /src/kernel/qtextlayout.cpp | |
parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
download | tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qtextlayout.cpp')
-rw-r--r-- | src/kernel/qtextlayout.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/qtextlayout.cpp b/src/kernel/qtextlayout.cpp index ed5641a7b..777e61ad7 100644 --- a/src/kernel/qtextlayout.cpp +++ b/src/kernel/qtextlayout.cpp @@ -369,9 +369,9 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int alignment, int available = d->lineWidth; int numRuns = 0; int numSpaceItems = 0; - Q_UINT8 _levels[128]; + TQ_UINT8 _levels[128]; int _visual[128]; - Q_UINT8 *levels = _levels; + TQ_UINT8 *levels = _levels; int *visual = _visual; int i; TQTextLayout::Result result = LineEmpty; @@ -504,7 +504,7 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int alignment, numRuns = d->currentItem - d->firstItemInLine - numSpaceItems; if ( numRuns > 127 ) { - levels = new Q_UINT8[numRuns]; + levels = new TQ_UINT8[numRuns]; visual = new int[numRuns]; } |