diff options
Diffstat (limited to 'lib/kotext')
| -rw-r--r-- | lib/kotext/KoTextFormatter.cpp | 4 | ||||
| -rw-r--r-- | lib/kotext/KoTextIterator.cpp | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp index 60e6528f..5fb9cdc2 100644 --- a/lib/kotext/KoTextFormatter.cpp +++ b/lib/kotext/KoTextFormatter.cpp @@ -118,7 +118,7 @@ TQPair<int, int> KoTextFormatterCore::determineCharWidth() } Q_ASSERT( ww >= 0 ); c->width = ww; - return tqMakePair(ww, pixelww); + return qMakePair(ww, pixelww); } @@ -257,7 +257,7 @@ bool KoTextFormatterCore::format() int col = 0; - maxAvailableWidth = tqMakePair( 0, 0 ); + maxAvailableWidth = qMakePair( 0, 0 ); KoTextZoomHandler *zh = doc->formattingZoomHandler(); int pixelx = zh->layoutUnitToPixelX( x ); diff --git a/lib/kotext/KoTextIterator.cpp b/lib/kotext/KoTextIterator.cpp index 73468f7e..8ac76173 100644 --- a/lib/kotext/KoTextIterator.cpp +++ b/lib/kotext/KoTextIterator.cpp @@ -306,19 +306,19 @@ TQPair<int, TQString> KoTextIterator::currentTextAndIndex() const if ( m_currentParag == m_firstParag ) { if ( m_firstParag == m_lastParag ) // special case, needs truncating at both ends - return forw ? tqMakePair( m_firstIndex, str.mid( m_firstIndex, m_lastIndex - m_firstIndex ) ) - : tqMakePair( m_lastIndex, str.mid( m_lastIndex, m_firstIndex - m_lastIndex ) ); + return forw ? qMakePair( m_firstIndex, str.mid( m_firstIndex, m_lastIndex - m_firstIndex ) ) + : qMakePair( m_lastIndex, str.mid( m_lastIndex, m_firstIndex - m_lastIndex ) ); else - return forw ? tqMakePair( m_firstIndex, str.mid( m_firstIndex ) ) - : tqMakePair( 0, str.left( m_firstIndex ) ); + return forw ? qMakePair( m_firstIndex, str.mid( m_firstIndex ) ) + : qMakePair( 0, str.left( m_firstIndex ) ); } if ( m_currentParag == m_lastParag ) { - return forw ? tqMakePair( 0, str.left( m_lastIndex ) ) - : tqMakePair( m_lastIndex, str.mid( m_lastIndex ) ); + return forw ? qMakePair( 0, str.left( m_lastIndex ) ) + : qMakePair( m_lastIndex, str.mid( m_lastIndex ) ); } // Not the first parag, nor the last, so we return it all - return tqMakePair( 0, str ); + return qMakePair( 0, str ); } bool KoTextIterator::hasText() const |