diff options
Diffstat (limited to 'kword')
| -rw-r--r-- | kword/KWDocument.cpp | 10 | ||||
| -rw-r--r-- | kword/KWFrame.h | 2 | ||||
| -rw-r--r-- | kword/KWFrameViewManager.h | 2 | ||||
| -rw-r--r-- | kword/KWTextFrameSet.cpp | 1 | ||||
| -rw-r--r-- | kword/KWView.cpp | 2 |
5 files changed, 6 insertions, 11 deletions
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 2c446210..0453407a 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -2877,7 +2877,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S } } - // Add trailing '0' (TQt4: remove) + // Add trailing '0' headerFooterContent.resize( headerFooterContent.size() + 1 ); headerFooterContent[headerFooterContent.size()-1] = '\0'; @@ -4435,10 +4435,10 @@ void KWDocument::recalcVariables( int type ) if ( m_bGeneratingPreview ) return; - TQMap<KoTextDocument *, bool> modifiedTextDocuments; // TQt4: TQSet + TQMap<KoTextDocument *, bool> modifiedTextDocuments; for ( TQValueList<KoVariable *>::const_iterator it = modifiedVariables.begin(), end = modifiedVariables.end() ; it != end ; ++it ) { KoTextDocument* textdoc = (*it)->textDocument(); - if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !contains + if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() ) { modifiedTextDocuments.insert( textdoc, true ); KWTextFrameSet * textfs = static_cast<KWTextDocument *>(textdoc)->textFrameSet(); @@ -5042,7 +5042,7 @@ void KWDocument::displayFootNoteFieldCode() void KWDocument::changeFootNoteConfig() { - TQMap<KoTextDocument *, bool> modifiedTextDocuments; // TQt4: TQSet + TQMap<KoTextDocument *, bool> modifiedTextDocuments; TQPtrListIterator<KoVariable> it( m_varColl->getVariables() ); for ( ; it.current() ; ++it ) { @@ -5062,7 +5062,7 @@ void KWDocument::changeFootNoteConfig() parag->setChanged( true ); } KoTextDocument* textdoc = parag->textDocument(); - if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !contains + if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() ) modifiedTextDocuments.insert( textdoc, true ); } } diff --git a/kword/KWFrame.h b/kword/KWFrame.h index 76e17da2..a85bf8dd 100644 --- a/kword/KWFrame.h +++ b/kword/KWFrame.h @@ -49,8 +49,6 @@ class TQDomElement; * * Deprecated, use TQValueVector<KWFrame*> from now on, and sort it with * std::sort(frames.begin(),frames.end(),KWFrame::compareFrameZOrder); - * - * With TQt4 we'll be able to use qSort for lists. */ class ZOrderedFrameList : public TQPtrList<KWFrame> { diff --git a/kword/KWFrameViewManager.h b/kword/KWFrameViewManager.h index ad948301..028e3739 100644 --- a/kword/KWFrameViewManager.h +++ b/kword/KWFrameViewManager.h @@ -97,7 +97,7 @@ public: */ KWFrameView* selectedFrame() const; - // this should be changed to a real iterator when TQt4 is used. + // this should be changed to a real iterator const TQValueList<KWFrameView*> frameViewsIterator() const { return m_frames; } /** diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 756cf576..c2e668be 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -1795,7 +1795,6 @@ void KWTextFrameSet::saveOasisContent( KoXmlWriter& writer, KoSavingContext& con } - // I want TQt4's TQMap/TQHash::value()! KoSavingContext::BookmarkPositions bookmarkStarts, bookmarkEnds; TQMap<const KoTextParag*, KoTextBookmarkList>::const_iterator bkit = bookmarksPerParagraph.find( parag ); if ( bkit != bookmarksPerParagraph.end() ) { diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 7d5bbf7f..fb96aa8d 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -2002,11 +2002,9 @@ void KWView::showRulerIndent( double leftMargin, double firstLine, double rightM void KWView::showAlign( int align ) { switch ( align ) { -#ifndef USE_QT4 case TQt::AlignAuto: // In left-to-right mode it's align left. TODO: alignright if text->isRightToLeft() kdWarning() << k_funcinfo << "shouldn't be called with AlignAuto" << endl; // fallthrough -#endif // USE_QT4 case TQt::AlignLeft: m_actionFormatAlignLeft->setChecked( TRUE ); break; |