TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 155 insertions, 155 deletions

diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp
index 52383db4..810856ef 100644
--- a/kword/KWCommand.cpp
+++ b/kword/KWCommand.cpp
@@ -47,8 +47,8 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <qxml.h>
-#include <qbuffer.h>
+#include <tqxml.h>
+#include <tqbuffer.h>
 #include <algorithm>
 
 // Helper class for deleting all custom items
@@ -79,7 +79,7 @@ public:
 
 #if 0 // kept for comparison with KWOasisPasteCommand
 KWPasteTextCommand::KWPasteTextCommand( KoTextDocument *d, int parag, int idx,
-                                const QCString & data )
+                                const TQCString & data )
     : KoTextDocCommand( d ), m_parag( parag ), m_idx( idx ), m_data( data ), m_oldParagLayout( 0 )
 {
 }
@@ -97,23 +97,23 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c )
     cursor.setIndex( m_idx );
     c->setParag( firstParag );
     c->setIndex( m_idx );
-    QDomDocument domDoc;
+    TQDomDocument domDoc;
     domDoc.setContent( m_data );
-    QDomElement elem = domDoc.documentElement();
+    TQDomElement elem = domDoc.documentElement();
     KWTextDocument * textdoc = static_cast<KWTextDocument *>(doc);
     KWTextFrameSet * textFs = textdoc->textFrameSet();
     // We iterate twice over the list of paragraphs.
     // First time to gather the text,
     // second time to apply the character & paragraph formatting
-    QString text;
+    TQString text;
 
-    QValueList<QDomElement> listParagraphs;
-    QDomElement paragraph = elem.firstChild().toElement();
+    TQValueList<TQDomElement> listParagraphs;
+    TQDomElement paragraph = elem.firstChild().toElement();
     for ( ; !paragraph.isNull() ; paragraph = paragraph.nextSibling().toElement() )
     {
         if ( paragraph.tagName() == "PARAGRAPH" )
         {
-            QString s = paragraph.namedItem( "TEXT" ).toElement().text();
+            TQString s = paragraph.namedItem( "TEXT" ).toElement().text();
             //kdDebug() << "KWPasteTextCommand::execute Inserting text: '" << s << "'" << endl;
             c->insert( s, false /*newline=linebreak, not new parag*/ );
 
@@ -135,8 +135,8 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c )
     KWTextParag * parag = static_cast<KWTextParag *>(firstParag);
     //kdDebug() << "KWPasteTextCommand::execute starting at parag " << parag << " " << parag->paragId() << endl;
     uint count = listParagraphs.count();
-    QValueList<QDomElement>::Iterator it = listParagraphs.begin();
-    QValueList<QDomElement>::Iterator end = listParagraphs.end();
+    TQValueList<TQDomElement>::Iterator it = listParagraphs.begin();
+    TQValueList<TQDomElement>::Iterator end = listParagraphs.end();
     for ( uint item = 0 ; it != end ; ++it, ++item )
     {
         if (!parag)
@@ -144,18 +144,18 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c )
             kdWarning() << "KWPasteTextCommand: parag==0L ! KWord bug, please report." << endl;
             break;
         }
-        QDomElement paragElem = *it;
-        // First line (if appending to non-empty line) : apply offset to formatting, don't apply parag layout
+        TQDomElement paragElem = *it;
+        // First line (if appending to non-empty line) : apply offset to formatting, don't apply parag tqlayout
         if ( item == 0 && m_idx > 0 )
         {
             // First load the default format, but only apply it to our new chars
-            QDomElement layout = paragElem.namedItem( "LAYOUT" ).toElement();
-            if ( !layout.isNull() )
+            TQDomElement tqlayout = paragElem.namedItem( "LAYOUT" ).toElement();
+            if ( !tqlayout.isNull() )
             {
-                QDomElement formatElem = layout.namedItem( "FORMAT" ).toElement();
+                TQDomElement formatElem = tqlayout.namedItem( "FORMAT" ).toElement();
                 if ( !formatElem.isNull() )
                 {
-                    KoTextFormat f = parag->loadFormat( formatElem, 0L, QFont(), KGlobal::locale()->language(),false );
+                    KoTextFormat f = parag->loadFormat( formatElem, 0L, TQFont(), KGlobal::locale()->language(),false );
                     KoTextFormat * defaultFormat = doc->formatCollection()->format( &f );
                     // Last paragraph (i.e. only one in all) : some of the text might be from before the paste
                     int endIndex = (item == count-1) ? c->index() : parag->string()->length() - 1;
@@ -167,7 +167,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c )
         }
         else
         {
-            if ( item == 0 ) // This paragraph existed, store its parag layout
+            if ( item == 0 ) // This paragraph existed, store its parag tqlayout
             {
                 delete m_oldParagLayout;
                 m_oldParagLayout = new KoParagLayout( parag->paragLayout() );
@@ -179,7 +179,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c )
             parag->setFormat( 0, len, parag->paragFormat(), TRUE );
             parag->loadFormatting( paragElem, 0, (textFs->isMainFrameset()) );
         }
-        parag->invalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo)
+        parag->tqinvalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo)
         parag->setChanged( TRUE );
         parag = static_cast<KWTextParag *>(parag->next());
         //kdDebug() << "KWPasteTextCommand::execute going to next parag: " << parag << endl;
@@ -246,7 +246,7 @@ KoTextCursor * KWPasteTextCommand::unexecute( KoTextCursor *c )
 #endif
 
 KWOasisPasteCommand::KWOasisPasteCommand( KoTextDocument *d, int parag, int idx,
-                                const QByteArray& data )
+                                const TQByteArray& data )
     : KoTextDocCommand( d ), m_parag( parag ), m_idx( idx ), m_data( data ), m_oldParagLayout( 0 )
 {
 }
@@ -267,9 +267,9 @@ KoTextCursor * KWOasisPasteCommand::execute( KoTextCursor *c )
 
     KWTextDocument * textdoc = static_cast<KWTextDocument *>(doc);
 
-    QBuffer buffer( m_data );
+    TQBuffer buffer( m_data );
 
-    KoStore * store = KoStore::createStore( &buffer, KoStore::Read );
+    KoStore * store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read );
     KWDocument* kwdoc = textdoc->textFrameSet()->kWordDocument();
     KWOasisLoader loader( kwdoc );
     loader.insertOasisData( store, c );
@@ -327,9 +327,9 @@ KoTextCursor * KWOasisPasteCommand::unexecute( KoTextCursor *c )
 }
 
 
-KWTextDeleteCommand::KWTextDeleteCommand( KoTextDocument *d, int i, int idx, const QMemArray<KoTextStringChar> &str,
+KWTextDeleteCommand::KWTextDeleteCommand( KoTextDocument *d, int i, int idx, const TQMemArray<KoTextStringChar> &str,
                          const CustomItemsMap & customItemsMap,
-                         const QValueList<KoParagLayout> & oldParagLayouts )
+                         const TQValueList<KoParagLayout> & oldParagLayouts )
     :KoTextDeleteCommand(d, i, idx, str, customItemsMap, oldParagLayouts)
 {
     //createBookmarkList();
@@ -344,9 +344,9 @@ void KWTextDeleteCommand::createBookmarkList()
         return;
     }
 
-    // Now restore the parag layouts (i.e. libkotext specific stuff)
-    QValueList<KoParagLayout>::Iterator lit = m_oldParagLayouts.begin();
-    kdDebug(32500) << "KWTextDeleteCommand::createBookmarkList " << m_oldParagLayouts.count() << " parag layouts. First parag=" << s->paragId() << endl;
+    // Now restore the parag tqlayouts (i.e. libkotext specific stuff)
+    TQValueList<KoParagLayout>::Iterator lit = m_oldParagLayouts.begin();
+    kdDebug(32500) << "KWTextDeleteCommand::createBookmarkList " << m_oldParagLayouts.count() << " parag tqlayouts. First parag=" << s->paragId() << endl;
     Q_ASSERT( id == s->paragId() );
     KoTextParag *p = s;
     while ( p ) {
@@ -381,7 +381,7 @@ FrameIndex::FrameIndex( KWFrame *frame )
     m_iFrameIndex=m_pFrameSet->frameFromPtr(frame);
 }
 
-KWFrameBorderCommand::KWFrameBorderCommand( const QString &name, QPtrList<FrameIndex> &_listFrameIndex, QPtrList<FrameBorderTypeStruct> &_frameTypeBorder,const KoBorder & _newBorder):
+KWFrameBorderCommand::KWFrameBorderCommand( const TQString &name, TQPtrList<FrameIndex> &_listFrameIndex, TQPtrList<FrameBorderTypeStruct> &_frameTypeBorder,const KoBorder & _newBorder):
     KNamedCommand(name),
     m_indexFrame(_listFrameIndex),
     m_oldBorderFrameType(_frameTypeBorder),
@@ -405,7 +405,7 @@ void KWFrameBorderCommand::execute()
         doc = frameSet->kWordDocument();
         KWFrame *frame=frameSet->frame(tmp->m_iFrameIndex);
         KWTableFrameSet::Cell *cell = dynamic_cast<KWTableFrameSet::Cell *>(frame->frameSet());
-        FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.find(tmp));
+        FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.tqfind(tmp));
 
         switch( tmpFrameStruct->m_EFrameType)
         {
@@ -446,7 +446,7 @@ void KWFrameBorderCommand::execute()
 
     if ( doc )
     {
-        doc->repaintAllViews();
+        doc->tqrepaintAllViews();
     }
 }
 
@@ -460,7 +460,7 @@ void KWFrameBorderCommand::unexecute()
         doc = frameSet->kWordDocument();
         KWFrame *frame=frameSet->frame(tmp->m_iFrameIndex);
         KWTableFrameSet::Cell *cell = dynamic_cast<KWTableFrameSet::Cell *>(frame->frameSet());
-        FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.find(tmp));
+        FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.tqfind(tmp));
         switch(tmpFrameStruct->m_EFrameType)
         {
             case KoBorder::LeftBorder:
@@ -501,11 +501,11 @@ void KWFrameBorderCommand::unexecute()
     if ( doc )
     {
         //update frames
-        doc->repaintAllViews();
+        doc->tqrepaintAllViews();
     }
 }
 
-KWFrameBackGroundColorCommand::KWFrameBackGroundColorCommand( const QString &name, QPtrList<FrameIndex> &_listFrameIndex, QPtrList<QBrush> &_oldBrush,const QBrush & _newColor ):
+KWFrameBackGroundColorCommand::KWFrameBackGroundColorCommand( const TQString &name, TQPtrList<FrameIndex> &_listFrameIndex, TQPtrList<TQBrush> &_oldBrush,const TQBrush & _newColor ):
     KNamedCommand(name),
     m_indexFrame(_listFrameIndex),
     m_oldBackGroundColor(_oldBrush),
@@ -536,7 +536,7 @@ void KWFrameBackGroundColorCommand::execute()
     }
     //update frame
     if ( doc )
-        doc->repaintAllViews();
+        doc->tqrepaintAllViews();
 }
 
 void KWFrameBackGroundColorCommand::unexecute()
@@ -550,22 +550,22 @@ void KWFrameBackGroundColorCommand::unexecute()
         {
             doc = frameSet->kWordDocument();
             KWFrame *frame=frameSet->frame(tmp->m_iFrameIndex);
-            QBrush *tmpFrameStruct=m_oldBackGroundColor.at(m_indexFrame.find(tmp));
+            TQBrush *tmpFrameStruct=m_oldBackGroundColor.at(m_indexFrame.tqfind(tmp));
             frame->setBackgroundColor(*tmpFrameStruct);
         }
     }
 
     //update frames
     if ( doc )
-        doc->repaintAllViews();
+        doc->tqrepaintAllViews();
 }
 
-KWFrameStyleCommand::KWFrameStyleCommand( const QString &name, KWFrame *_frame, KWFrameStyle *_fs, bool _repaintViews ) :
+KWFrameStyleCommand::KWFrameStyleCommand( const TQString &name, KWFrame *_frame, KWFrameStyle *_fs, bool _tqrepaintViews ) :
     KNamedCommand( name )
 {
     m_frame = _frame;
     m_fs = _fs;
-    repaintViews = _repaintViews;
+    tqrepaintViews = _tqrepaintViews;
 
     m_oldValues = new KWFrameStyle( "Old", m_frame );
 }
@@ -590,20 +590,20 @@ void KWFrameStyleCommand::applyFrameStyle( KWFrameStyle * _sty )
     m_frame->setBottomBorder( _sty->bottomBorder() );
 
     m_frame->frameBordersChanged();
-    if ( repaintViews )
-        m_frame->frameSet()->kWordDocument()->repaintAllViews();
+    if ( tqrepaintViews )
+        m_frame->frameSet()->kWordDocument()->tqrepaintAllViews();
 }
 
 
-KWTableStyleCommand::KWTableStyleCommand( const QString &name, KWFrame *_frame, KWTableStyle *_ts, bool _repaintViews ) :
+KWTableStyleCommand::KWTableStyleCommand( const TQString &name, KWFrame *_frame, KWTableStyle *_ts, bool _tqrepaintViews ) :
     KNamedCommand( name )
 {
     m_frame = _frame;
     m_ts = _ts;
-    repaintViews = _repaintViews;
+    tqrepaintViews = _tqrepaintViews;
 
     // No need for i18n because it will never be displayed.
-    m_fsc = new KWFrameStyleCommand( "Apply Framestyle to Frame", m_frame, m_ts->frameStyle(), repaintViews );
+    m_fsc = new KWFrameStyleCommand( "Apply Framestyle to Frame", m_frame, m_ts->frameStyle(), tqrepaintViews );
     m_sc = 0L;
 }
 
@@ -627,8 +627,8 @@ void KWTableStyleCommand::execute()
     }
 
     m_frame->frameBordersChanged();
-    if ( repaintViews )
-        m_frame->frameSet()->kWordDocument()->repaintAllViews();
+    if ( tqrepaintViews )
+        m_frame->frameSet()->kWordDocument()->tqrepaintAllViews();
 
 }
 
@@ -640,11 +640,11 @@ void KWTableStyleCommand::unexecute()
         m_sc->unexecute();
 
     m_frame->frameBordersChanged();
-    if ( repaintViews )
-        m_frame->frameSet()->kWordDocument()->repaintAllViews();
+    if ( tqrepaintViews )
+        m_frame->frameSet()->kWordDocument()->tqrepaintAllViews();
 }
 
-KWTableTemplateCommand::KWTableTemplateCommand( const QString &name, KWTableFrameSet *_table, KWTableTemplate *_tt ) :
+KWTableTemplateCommand::KWTableTemplateCommand( const TQString &name, KWTableFrameSet *_table, KWTableTemplate *_tt ) :
     KNamedCommand( name )
 {
     m_table = _table;
@@ -702,21 +702,21 @@ KWTableTemplateCommand::~KWTableTemplateCommand()
 void KWTableTemplateCommand::execute()
 {
     m_tableCommands->execute();
-    m_table->kWordDocument()->repaintAllViews();
+    m_table->kWordDocument()->tqrepaintAllViews();
 }
 
 void KWTableTemplateCommand::unexecute()
 {
     m_tableCommands->unexecute();
-    m_table->kWordDocument()->repaintAllViews();
+    m_table->kWordDocument()->tqrepaintAllViews();
 }
 
 
-KWFrameResizeCommand::KWFrameResizeCommand(const QString &name, const QValueList<FrameIndex> &frameIndex, const QValueList<FrameResizeStruct> &frameResize )
+KWFrameResizeCommand::KWFrameResizeCommand(const TQString &name, const TQValueList<FrameIndex> &frameIndex, const TQValueList<FrameResizeStruct> &frameResize )
     : KNamedCommand(name), m_indexFrame(frameIndex), m_frameResize(frameResize) {
     Q_ASSERT(m_indexFrame.count() == m_frameResize.count());
 }
-KWFrameResizeCommand::KWFrameResizeCommand(const QString &name, FrameIndex frameIndex, const FrameResizeStruct &frameResize )
+KWFrameResizeCommand::KWFrameResizeCommand(const TQString &name, FrameIndex frameIndex, const FrameResizeStruct &frameResize )
     : KNamedCommand(name) {
     m_indexFrame.append(frameIndex);
     m_frameResize.append(frameResize);
@@ -724,8 +724,8 @@ KWFrameResizeCommand::KWFrameResizeCommand(const QString &name, FrameIndex frame
 
 void KWFrameResizeCommand::execute()
 {
-    QValueList<FrameResizeStruct>::Iterator resizeIter = m_frameResize.begin();
-    QValueList<FrameIndex>::Iterator iter = m_indexFrame.begin();
+    TQValueList<FrameResizeStruct>::Iterator resizeIter = m_frameResize.begin();
+    TQValueList<FrameIndex>::Iterator iter = m_indexFrame.begin();
     for(; iter != m_indexFrame.end() && resizeIter != m_frameResize.end(); ++resizeIter, ++iter ) {
         FrameIndex index = *iter;
         FrameResizeStruct frs = *resizeIter;
@@ -760,8 +760,8 @@ void KWFrameResizeCommand::execute()
 
 void KWFrameResizeCommand::unexecute()
 {
-    QValueList<FrameResizeStruct>::Iterator resizeIter = m_frameResize.begin();
-    QValueList<FrameIndex>::Iterator iter = m_indexFrame.begin();
+    TQValueList<FrameResizeStruct>::Iterator resizeIter = m_frameResize.begin();
+    TQValueList<FrameIndex>::Iterator iter = m_indexFrame.begin();
     for(; iter != m_indexFrame.end() && resizeIter != m_frameResize.end(); ++resizeIter, ++iter ) {
         FrameIndex index = *iter;
         FrameResizeStruct frs = *resizeIter;
@@ -794,7 +794,7 @@ void KWFrameResizeCommand::unexecute()
     }
 }
 
-KWFrameChangePictureCommand::KWFrameChangePictureCommand( const QString &name, FrameIndex _frameIndex, const KoPictureKey & _oldKey, const KoPictureKey & _newKey ) :
+KWFrameChangePictureCommand::KWFrameChangePictureCommand( const TQString &name, FrameIndex _frameIndex, const KoPictureKey & _oldKey, const KoPictureKey & _newKey ) :
     KNamedCommand(name),
     m_indexFrame(_frameIndex),
     m_oldKey(_oldKey),
@@ -827,7 +827,7 @@ void KWFrameChangePictureCommand::unexecute()
 }
 
 
-KWFramePartMoveCommand::KWFramePartMoveCommand( const QString &name, FrameIndex _frameIndex,  FrameResizeStruct _frameMove ) :
+KWFramePartMoveCommand::KWFramePartMoveCommand( const TQString &name, FrameIndex _frameIndex,  FrameResizeStruct _frameMove ) :
     KNamedCommand(name),
     m_indexFrame(_frameIndex),
     m_frameMove(_frameMove)
@@ -866,7 +866,7 @@ bool KWFramePartMoveCommand::frameMoved()
     return  (m_frameMove.oldRect!=m_frameMove.newRect);
 }
 
-KWFramePartInternalCommand::KWFramePartInternalCommand( const QString &name, KWPartFrameSet *part ) :
+KWFramePartInternalCommand::KWFramePartInternalCommand( const TQString &name, KWPartFrameSet *part ) :
     KNamedCommand(name),
     m_part(part)
 {
@@ -885,7 +885,7 @@ void KWFramePartInternalCommand::unexecute()
 }
 
 
-KWFramePartExternalCommand::KWFramePartExternalCommand( const QString &name, KWPartFrameSet *part ) :
+KWFramePartExternalCommand::KWFramePartExternalCommand( const TQString &name, KWPartFrameSet *part ) :
     KNamedCommand(name),
     m_part(part)
 {
@@ -902,9 +902,9 @@ void KWFramePartExternalCommand::unexecute()
 }
 
 
-KWFrameMoveCommand::KWFrameMoveCommand( const QString &name,
-                                        const QValueList<FrameIndex> & _frameIndex,
-                                        const QValueList<FrameMoveStruct> & _frameMove  ) :
+KWFrameMoveCommand::KWFrameMoveCommand( const TQString &name,
+                                        const TQValueList<FrameIndex> & _frameIndex,
+                                        const TQValueList<FrameMoveStruct> & _frameMove  ) :
     KNamedCommand(name),
     m_indexFrame(_frameIndex),
     m_frameMove(_frameMove)
@@ -913,10 +913,10 @@ KWFrameMoveCommand::KWFrameMoveCommand( const QString &name,
 
 void KWFrameMoveCommand::execute()
 {
-    bool needRelayout = false;
+    bool needRetqlayout = false;
     KWDocument * doc = 0L;
-    QValueList<FrameMoveStruct>::Iterator moveIt = m_frameMove.begin();
-    QValueList<FrameIndex>::Iterator tmp = m_indexFrame.begin();
+    TQValueList<FrameMoveStruct>::Iterator moveIt = m_frameMove.begin();
+    TQValueList<FrameIndex>::Iterator tmp = m_indexFrame.begin();
     for( ; tmp != m_indexFrame.end() && moveIt != m_frameMove.end(); ++tmp, ++moveIt )
     {
         KWFrameSet *frameSet = (*tmp).m_pFrameSet;
@@ -925,25 +925,25 @@ void KWFrameMoveCommand::execute()
         frame->moveTopLeft( (*moveIt).newPos );
 
         frame->updateRulerHandles();
-        needRelayout = needRelayout || ( frame->runAround() != KWFrame::RA_NO );
+        needRetqlayout = needRetqlayout || ( frame->runAround() != KWFrame::RA_NO );
     }
     if ( doc )
     {
         doc->updateAllFrames();
-        if ( needRelayout )
-            doc->layout();
+        if ( needRetqlayout )
+            doc->tqlayout();
 
         doc->updateRulerFrameStartEnd();
-        doc->repaintAllViews();
+        doc->tqrepaintAllViews();
     }
 }
 
 void KWFrameMoveCommand::unexecute()
 {
-    bool needRelayout = false;
+    bool needRetqlayout = false;
     KWDocument * doc = 0L;
-    QValueList<FrameMoveStruct>::Iterator moveIt = m_frameMove.begin();
-    QValueList<FrameIndex>::Iterator tmp = m_indexFrame.begin();
+    TQValueList<FrameMoveStruct>::Iterator moveIt = m_frameMove.begin();
+    TQValueList<FrameIndex>::Iterator tmp = m_indexFrame.begin();
     for( ; tmp != m_indexFrame.end() && moveIt != m_frameMove.end(); ++tmp, ++moveIt )
     {
         KWFrameSet *frameSet = (*tmp).m_pFrameSet;
@@ -952,20 +952,20 @@ void KWFrameMoveCommand::unexecute()
         frame->moveTopLeft( (*moveIt).oldPos );
 
         frame->updateRulerHandles();
-        needRelayout = needRelayout || ( frame->runAround() != KWFrame::RA_NO );
+        needRetqlayout = needRetqlayout || ( frame->runAround() != KWFrame::RA_NO );
     }
 
     if ( doc )
     {
         doc->updateAllFrames();
-        if ( needRelayout )
-            doc->layout();
+        if ( needRetqlayout )
+            doc->tqlayout();
         doc->updateRulerFrameStartEnd();
-        doc->repaintAllViews();
+        doc->tqrepaintAllViews();
     }
 }
 
-KWFramePropertiesCommand::KWFramePropertiesCommand( const QString &name, KWFrame *_frameBefore,  KWFrame *_frameAfter ) :
+KWFramePropertiesCommand::KWFramePropertiesCommand( const TQString &name, KWFrame *_frameBefore,  KWFrame *_frameAfter ) :
     KNamedCommand(name),
     m_frameIndex( _frameAfter ),
     m_frameBefore(_frameBefore),
@@ -995,8 +995,8 @@ void KWFramePropertiesCommand::execute()
     {
         doc->frameChanged( frame );
         doc->updateAllFrames();
-        doc->layout();
-        doc->repaintAllViews();
+        doc->tqlayout();
+        doc->tqrepaintAllViews();
         doc->updateRulerFrameStartEnd();
     }
 }
@@ -1016,14 +1016,14 @@ void KWFramePropertiesCommand::unexecute()
     {
         doc->frameChanged( frame );
         doc->updateAllFrames();
-        doc->layout();
-        doc->repaintAllViews();
+        doc->tqlayout();
+        doc->tqrepaintAllViews();
         doc->updateRulerFrameStartEnd();
     }
 }
 
 
-KWFrameSetInlineCommand::KWFrameSetInlineCommand( const QString &name, KWFrameSet *frameset, bool value ) :
+KWFrameSetInlineCommand::KWFrameSetInlineCommand( const TQString &name, KWFrameSet *frameset, bool value ) :
     KNamedCommand(name),
     m_pFrameSet( frameset ),
     m_value( value )
@@ -1060,7 +1060,7 @@ void KWFrameSetInlineCommand::unexecute()
     setValue( m_oldValue );
 }
 
-KWPageLayoutCommand::KWPageLayoutCommand( const QString &name,KWDocument *_doc,KWPageLayoutStruct &_oldLayout, KWPageLayoutStruct &_newLayout  ) :
+KWPageLayoutCommand::KWPageLayoutCommand( const TQString &name,KWDocument *_doc,KWPageLayoutStruct &_oldLayout, KWPageLayoutStruct &_newLayout  ) :
     KNamedCommand(name),
     m_pDoc(_doc),
     m_oldLayout(_oldLayout),
@@ -1079,7 +1079,7 @@ void KWPageLayoutCommand::unexecute()
 }
 
 
-KWDeleteFrameCommand::KWDeleteFrameCommand( const QString &name, KWFrame * frame ):
+KWDeleteFrameCommand::KWDeleteFrameCommand( const TQString &name, KWFrame * frame ):
     KNamedCommand(name),
     m_frameIndex( frame ),
     m_copyFrame( frame->getCopy() )
@@ -1145,12 +1145,12 @@ void KWDeleteFrameCommand::unexecute()
     doc->updateRulerFrameStartEnd();
 }
 
-KWCreateFrameCommand::KWCreateFrameCommand( const QString &name, KWFrame * frame ) :
+KWCreateFrameCommand::KWCreateFrameCommand( const TQString &name, KWFrame * frame ) :
     KWDeleteFrameCommand( name, frame )
 {}
 
 
-KWUngroupTableCommand::KWUngroupTableCommand( const QString &name, KWTableFrameSet * _table ):
+KWUngroupTableCommand::KWUngroupTableCommand( const TQString &name, KWTableFrameSet * _table ):
     KNamedCommand(name),
     m_pTable(_table)
 {
@@ -1180,7 +1180,7 @@ void KWUngroupTableCommand::execute()
     doc->refreshDocStructure(refresh);
 
     doc->updateAllFrames();
-    doc->repaintAllViews();
+    doc->tqrepaintAllViews();
 }
 
 void KWUngroupTableCommand::unexecute()
@@ -1206,11 +1206,11 @@ void KWUngroupTableCommand::unexecute()
 
 
     doc->updateAllFrames();
-    doc->repaintAllViews();
+    doc->tqrepaintAllViews();
 }
 
 
-KWDeleteTableCommand::KWDeleteTableCommand( const QString &name, KWTableFrameSet * _table ):
+KWDeleteTableCommand::KWDeleteTableCommand( const TQString &name, KWTableFrameSet * _table ):
     KNamedCommand(name),
     m_pTable(_table)
 {
@@ -1226,8 +1226,8 @@ void KWDeleteTableCommand::execute()
     doc->refreshDocStructure((int)Tables);
     doc->updateAllFrames();
     m_pTable->updateFrames(); // not in the doc list anymore, so the above call didn't do it!
-    doc->layout();
-    doc->repaintAllViews();
+    doc->tqlayout();
+    doc->tqrepaintAllViews();
     doc->updateRulerFrameStartEnd();
 
 }
@@ -1240,13 +1240,13 @@ void KWDeleteTableCommand::unexecute()
     doc->addFrameSet(m_pTable);
     doc->refreshDocStructure((int)Tables);
     doc->updateAllFrames();
-    doc->layout();
-    doc->repaintAllViews();
+    doc->tqlayout();
+    doc->tqrepaintAllViews();
     doc->updateRulerFrameStartEnd();
 }
 
 
-KWInsertColumnCommand::KWInsertColumnCommand( const QString &name, KWTableFrameSet * _table, int _col, double _maxRight ):
+KWInsertColumnCommand::KWInsertColumnCommand( const TQString &name, KWTableFrameSet * _table, int _col, double _maxRight ):
     KNamedCommand(name),
     m_pTable(_table),
     m_rc(new RemovedColumn()),
@@ -1284,8 +1284,8 @@ void KWInsertColumnCommand::execute()
     }
     Q_ASSERT(m_pTable->boundingRect().right() <= m_maxRight);
     doc->updateAllFrames();
-    doc->layout();
-    doc->repaintAllViews();
+    doc->tqlayout();
+    doc->tqrepaintAllViews();
 }
 
 void KWInsertColumnCommand::unexecute()
@@ -1300,13 +1300,13 @@ void KWInsertColumnCommand::unexecute()
         m_pTable->resizeWidth(m_oldWidth);
     }
     doc->updateAllFrames();
-    doc->layout();
-    doc->repaintAllViews();
+    doc->tqlayout();
+    doc->tqrepaintAllViews();
 }
 
 
 
-KWInsertRowCommand::KWInsertRowCommand( const QString &name, KWTableFrameSet * _table, int _row ):
+KWInsertRowCommand::KWInsertRowCommand( const TQString &name, KWTableFrameSet * _table, int _row ):
     KNamedCommand(name),
     m_pTable(_table),
     m_rr(new RemovedRow()),
@@ -1332,8 +1332,8 @@ void KWInsertRowCommand::execute()
         m_pTable->insertNewRow(m_rowPos);  //only happens the first time
     }
     doc->updateAllFrames();
-    doc->layout();
-    doc->repaintAllViews();
+    doc->tqlayout();
+    doc->tqrepaintAllViews();
 }
 
 void KWInsertRowCommand::unexecute()
@@ -1345,11 +1345,11 @@ void KWInsertRowCommand::unexecute()
     m_pTable->deleteRow( m_rowPos, *m_rr);
 
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 
-KWRemoveRowCommand::KWRemoveRowCommand( const QString &name, KWTableFrameSet * _table, int _row ):
+KWRemoveRowCommand::KWRemoveRowCommand( const TQString &name, KWTableFrameSet * _table, int _row ):
     KNamedCommand(name),
     m_pTable(_table),
     m_rr(new RemovedRow()),
@@ -1372,7 +1372,7 @@ void KWRemoveRowCommand::execute()
     m_pTable->deleteRow( m_rowPos, *m_rr);
 
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 void KWRemoveRowCommand::unexecute()
@@ -1381,11 +1381,11 @@ void KWRemoveRowCommand::unexecute()
     KWDocument * doc = m_pTable->kWordDocument();
     m_pTable->reInsertRow(*m_rr);
     doc->updateAllFrames();
-    doc->layout();
-    doc->repaintAllViews();
+    doc->tqlayout();
+    doc->tqrepaintAllViews();
 }
 
-KWRemoveColumnCommand::KWRemoveColumnCommand( const QString &name, KWTableFrameSet * _table, int _col ):
+KWRemoveColumnCommand::KWRemoveColumnCommand( const TQString &name, KWTableFrameSet * _table, int _col ):
     KNamedCommand(name),
     m_pTable(_table),
     m_rc(new RemovedColumn()),
@@ -1407,7 +1407,7 @@ void KWRemoveColumnCommand::execute()
 
     m_pTable->deleteColumn( m_colPos, *m_rc);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 void KWRemoveColumnCommand::unexecute()
@@ -1416,13 +1416,13 @@ void KWRemoveColumnCommand::unexecute()
     KWDocument * doc = m_pTable->kWordDocument();
     m_pTable->reInsertColumn(*m_rc);
     doc->updateAllFrames();
-    doc->layout();
-    doc->repaintAllViews();
+    doc->tqlayout();
+    doc->tqrepaintAllViews();
 }
 
 
 
-KWSplitCellCommand::KWSplitCellCommand( const QString &name, KWTableFrameSet * _table,unsigned int colBegin,unsigned int rowBegin, unsigned int colEnd,unsigned int rowEnd ):
+KWSplitCellCommand::KWSplitCellCommand( const TQString &name, KWTableFrameSet * _table,unsigned int colBegin,unsigned int rowBegin, unsigned int colEnd,unsigned int rowEnd ):
     KNamedCommand(name),
     m_pTable(_table),
     m_colBegin(colBegin),
@@ -1441,7 +1441,7 @@ void KWSplitCellCommand::execute()
     //kdDebug()<<"split Cell m_colBegin :"<<m_colBegin<<" m_colEnd :"<<m_colEnd<<" m_rowBegin :"<<m_rowBegin<<" m_colEnd :"<<m_colEnd<<endl;
     m_pTable->splitCell(m_rowEnd, m_colEnd,m_colBegin,m_rowBegin,m_ListFrameSet);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 void KWSplitCellCommand::unexecute()
@@ -1478,12 +1478,12 @@ void KWSplitCellCommand::unexecute()
         m_rowBegin+m_rowEnd-1+cell->rowSpan()-1);
 
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 
 
-KWJoinCellCommand::KWJoinCellCommand( const QString &name, KWTableFrameSet * _table,unsigned int colBegin,unsigned int rowBegin, unsigned int colEnd,unsigned int rowEnd, QPtrList<KWFrameSet> listFrameSet,QPtrList<KWFrame> listCopyFrame):
+KWJoinCellCommand::KWJoinCellCommand( const TQString &name, KWTableFrameSet * _table,unsigned int colBegin,unsigned int rowBegin, unsigned int colEnd,unsigned int rowEnd, TQPtrList<KWFrameSet> listFrameSet,TQPtrList<KWFrame> listCopyFrame):
     KNamedCommand(name),
     m_pTable(_table),
     m_colBegin(colBegin),
@@ -1507,7 +1507,7 @@ void KWJoinCellCommand::execute()
     doc->terminateEditing(m_pTable);
     m_pTable->joinCells(m_colBegin,m_rowBegin,m_colEnd,m_rowEnd);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 void KWJoinCellCommand::unexecute()
@@ -1517,11 +1517,11 @@ void KWJoinCellCommand::unexecute()
     doc->terminateEditing(m_pTable);
     m_pTable->splitCell(m_rowEnd-m_rowBegin+1, m_colEnd-m_colBegin+1,m_colBegin,m_rowBegin,m_ListFrameSet,m_copyFrame);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 
-KWChangeStartingPageCommand::KWChangeStartingPageCommand( const QString &name, KWDocument *_doc, int _oldStartingPage, int _newStartingPage):
+KWChangeStartingPageCommand::KWChangeStartingPageCommand( const TQString &name, KWDocument *_doc, int _oldStartingPage, int _newStartingPage):
     KNamedCommand(name),
     m_doc(_doc),
     oldStartingPage(_oldStartingPage),
@@ -1541,7 +1541,7 @@ void KWChangeStartingPageCommand::unexecute()
     m_doc->recalcVariables( VT_PGNUM );
 }
 
-KWChangeVariableSettingsCommand::KWChangeVariableSettingsCommand( const QString &name, KWDocument *_doc, bool _oldValue, bool _newValue, VariableProperties _type):
+KWChangeVariableSettingsCommand::KWChangeVariableSettingsCommand( const TQString &name, KWDocument *_doc, bool _oldValue, bool _newValue, VariableProperties _type):
     KNamedCommand(name),
     m_doc(_doc),
     type(_type),
@@ -1586,7 +1586,7 @@ void KWChangeVariableSettingsCommand::unexecute()
     changeValue(m_bOldValue);
 }
 
-KWChangeCustomVariableValue::KWChangeCustomVariableValue( const QString &name, KWDocument *_doc,const QString & _oldValue, const QString & _newValue,KoCustomVariable *var):
+KWChangeCustomVariableValue::KWChangeCustomVariableValue( const TQString &name, KWDocument *_doc,const TQString & _oldValue, const TQString & _newValue,KoCustomVariable *var):
     KNamedCommand(name),
     m_doc(_doc),
     newValue(_newValue),
@@ -1613,8 +1613,8 @@ void KWChangeCustomVariableValue::unexecute()
     m_doc->recalcVariables( VT_CUSTOM );
 }
 
-KWChangeVariableNoteText::KWChangeVariableNoteText( const QString &name, KWDocument *_doc,
-                        const QString &_oldValue,const QString &_newValue,
+KWChangeVariableNoteText::KWChangeVariableNoteText( const TQString &name, KWDocument *_doc,
+                        const TQString &_oldValue,const TQString &_newValue,
                         KoNoteVariable *var):
     KNamedCommand(name),
     m_doc(_doc),
@@ -1641,7 +1641,7 @@ void KWChangeVariableNoteText::unexecute()
 }
 
 // TODO: move to libkotext to remove code duplication with kpresenter
-KWChangeLinkVariable::KWChangeLinkVariable( const QString &name, KWDocument *_doc,const QString & _oldHref, const QString & _newHref, const QString & _oldLink,const QString &_newLink, KoLinkVariable *var):
+KWChangeLinkVariable::KWChangeLinkVariable( const TQString &name, KWDocument *_doc,const TQString & _oldHref, const TQString & _newHref, const TQString & _oldLink,const TQString &_newLink, KoLinkVariable *var):
     KNamedCommand(name),
     m_doc(_doc),
     oldHref(_oldHref),
@@ -1665,7 +1665,7 @@ void KWChangeLinkVariable::unexecute()
     m_doc->recalcVariables(VT_LINK);
 }
 
-KWHideShowHeader::KWHideShowHeader( const QString &name, KWDocument *_doc, bool _newValue):
+KWHideShowHeader::KWHideShowHeader( const TQString &name, KWDocument *_doc, bool _newValue):
     KNamedCommand(name),
     m_doc(_doc),
     newValue(_newValue)
@@ -1686,7 +1686,7 @@ void KWHideShowHeader::unexecute()
     m_doc->updateHeaderButton();
 }
 
-KWHideShowFooter::KWHideShowFooter( const QString &name, KWDocument *_doc, bool _newValue):
+KWHideShowFooter::KWHideShowFooter( const TQString &name, KWDocument *_doc, bool _newValue):
     KNamedCommand(name),
     m_doc(_doc),
     newValue(_newValue)
@@ -1707,7 +1707,7 @@ void KWHideShowFooter::unexecute()
 }
 
 
-KWProtectContentCommand::KWProtectContentCommand( const QString &name, KWTextFrameSet*frameset, bool _protect):
+KWProtectContentCommand::KWProtectContentCommand( const TQString &name, KWTextFrameSet*frameset, bool _protect):
     KNamedCommand(name),
     m_pFrameSet(frameset),
     m_bProtect(_protect)
@@ -1738,15 +1738,15 @@ KWInsertRemovePageCommand::KWInsertRemovePageCommand( KWDocument *_doc, Command
 {}
 
 KWInsertRemovePageCommand::~KWInsertRemovePageCommand() {
-    QValueListIterator<KCommand*> cmdIter = childCommands.begin();
+    TQValueListIterator<KCommand*> cmdIter = childCommands.begin();
     for(;cmdIter != childCommands.end(); ++ cmdIter)
          delete (*cmdIter);
 }
 
-QString KWInsertRemovePageCommand::name() const
+TQString KWInsertRemovePageCommand::name() const
 {
     return m_cmd == Insert ? i18n("Insert Page") // problem with after/before page
-                  : i18n("Delete Page %1").arg(m_pgNum);
+                  : i18n("Delete Page %1").tqarg(m_pgNum);
 }
 
 void KWInsertRemovePageCommand::execute() {
@@ -1768,9 +1768,9 @@ void KWInsertRemovePageCommand::unexecute() {
 void KWInsertRemovePageCommand::doRemove(int pageNumber) {
     bool firstRun = childCommands.count() == 0;
     if(firstRun) {
-        QValueVector<FrameIndex> indexes;
-        QPtrList<KWFrame> frames = m_doc->framesInPage(pageNumber, false);
-        QPtrListIterator<KWFrame> framesIter(frames);
+        TQValueVector<FrameIndex> indexes;
+        TQPtrList<KWFrame> frames = m_doc->framesInPage(pageNumber, false);
+        TQPtrListIterator<KWFrame> framesIter(frames);
         for(; framesIter.current(); ++framesIter)
             indexes.append(FrameIndex(*framesIter));
 
@@ -1778,11 +1778,11 @@ void KWInsertRemovePageCommand::doRemove(int pageNumber) {
         // to get mixed up when there is more then one frame of a frameset on the page
         std::sort(indexes.begin(), indexes.end(), compareIndex);
 
-        QValueVector<FrameIndex>::iterator iter = indexes.begin();
+        TQValueVector<FrameIndex>::iterator iter = indexes.begin();
         for(; iter != indexes.end(); ++iter)
             childCommands.append(new KWDeleteFrameCommand(*iter));
     }
-    QValueListIterator<KCommand*> cmdIter = childCommands.begin();
+    TQValueListIterator<KCommand*> cmdIter = childCommands.begin();
     for(;cmdIter != childCommands.end(); ++ cmdIter)
          (*cmdIter)->execute();
 
@@ -1796,17 +1796,17 @@ void KWInsertRemovePageCommand::doRemove(int pageNumber) {
 
     if(firstRun && m_doc->lastPage() >= pageNumber) { // only walk frames when there was a page
                                                       // after the deleted one
-        QValueList<FrameIndex> indexes;
-        QValueList<FrameMoveStruct> moveStructs;
-        QPtrListIterator<KWFrameSet> fss = m_doc->framesetsIterator();
+        TQValueList<FrameIndex> indexes;
+        TQValueList<FrameMoveStruct> moveStructs;
+        TQPtrListIterator<KWFrameSet> fss = m_doc->framesetsIterator();
         for(;fss.current(); ++fss) {
             KWFrameSet *fs = *fss;
             if(fs->isMainFrameset()) continue;
             if(fs->isHeaderOrFooter()) continue;
             if(fs->isFootEndNote()) continue;
             if(! fs->isVisible()) continue;
-            QPtrList<KWFrame> frames = fs->frameIterator();
-            QPtrListIterator<KWFrame> framesIter(frames);
+            TQPtrList<KWFrame> frames = fs->frameIterator();
+            TQPtrListIterator<KWFrame> framesIter(frames);
             for(; framesIter.current(); ++framesIter) {
                 KWFrame *frame = *framesIter;
                 if(frame->top() > topOfPage) {
@@ -1854,7 +1854,7 @@ FramePaddingStruct::FramePaddingStruct( double _left, double _top, double _right
 }
 
 
-KWFrameChangeFramePaddingCommand::KWFrameChangeFramePaddingCommand( const QString &name, FrameIndex _frameIndex, FramePaddingStruct _framePaddingBegin, FramePaddingStruct _framePaddingEnd ) :
+KWFrameChangeFramePaddingCommand::KWFrameChangeFramePaddingCommand( const TQString &name, FrameIndex _frameIndex, FramePaddingStruct _framePaddingBegin, FramePaddingStruct _framePaddingEnd ) :
     KNamedCommand(name),
     m_indexFrame(_frameIndex),
     m_framePaddingBegin(_framePaddingBegin),
@@ -1882,7 +1882,7 @@ void KWFrameChangeFramePaddingCommand::unexecute()
     frameSet->kWordDocument()->frameChanged( frame );
 }
 
-KWChangeFootEndNoteSettingsCommand::KWChangeFootEndNoteSettingsCommand( const QString &name, KoParagCounter _oldCounter, KoParagCounter _newCounter ,bool _footNote ,KWDocument *_doc):
+KWChangeFootEndNoteSettingsCommand::KWChangeFootEndNoteSettingsCommand( const TQString &name, KoParagCounter _oldCounter, KoParagCounter _newCounter ,bool _footNote ,KWDocument *_doc):
     KNamedCommand(name),
     m_oldCounter(_oldCounter),
     m_newCounter(_newCounter),
@@ -1915,7 +1915,7 @@ void KWChangeFootEndNoteSettingsCommand::changeCounter( KoParagCounter counter)
 }
 
 
-KWChangeTabStopValueCommand::KWChangeTabStopValueCommand( const QString &name, double _oldValue, double _newValue, KWDocument *_doc):
+KWChangeTabStopValueCommand::KWChangeTabStopValueCommand( const TQString &name, double _oldValue, double _newValue, KWDocument *_doc):
     KNamedCommand(name),
     m_doc( _doc ),
     m_oldValue(_oldValue),
@@ -1942,14 +1942,14 @@ FootNoteParameter::FootNoteParameter( KWFootNoteVariable *_var )
     manualString = _var->manualString();
 }
 
-FootNoteParameter::FootNoteParameter( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType, const QString &_manualString)
+FootNoteParameter::FootNoteParameter( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType, const TQString &_manualString)
 {
     noteType= _noteType;
     numberingType = _numberingType;
     manualString = _manualString;
 }
 
-KWChangeFootNoteParametersCommand::KWChangeFootNoteParametersCommand( const QString &name, KWFootNoteVariable * _var, FootNoteParameter _oldParameter, FootNoteParameter _newParameter, KWDocument *_doc):
+KWChangeFootNoteParametersCommand::KWChangeFootNoteParametersCommand( const TQString &name, KWFootNoteVariable * _var, FootNoteParameter _oldParameter, FootNoteParameter _newParameter, KWDocument *_doc):
     KNamedCommand(name),
     m_doc( _doc ),
     m_var( _var ),
@@ -1977,7 +1977,7 @@ void KWChangeFootNoteParametersCommand::changeVariableParameter( FootNoteParamet
     if (  m_var->numberingType()== KWFootNoteVariable::Manual)
     {
         m_var->resize();
-        m_var->paragraph()->invalidate(0);
+        m_var->paragraph()->tqinvalidate(0);
         m_var->paragraph()->setChanged( true );
     }
 
@@ -1986,7 +1986,7 @@ void KWChangeFootNoteParametersCommand::changeVariableParameter( FootNoteParamet
     if ( frameset)
         frameset->renumberFootNotes();
 
-    // Re-layout the footnote/endnote frame
+    // Re-tqlayout the footnote/endnote frame
     KWFrame* footNoteFrame = m_var->frameSet()->frame( 0 );
     int framePage = footNoteFrame->pageNumber();
     m_doc->recalcFrames( framePage, -1 );
@@ -1996,7 +1996,7 @@ void KWChangeFootNoteParametersCommand::changeVariableParameter( FootNoteParamet
 }
 
 
-KWChangeFootNoteLineSeparatorParametersCommand::KWChangeFootNoteLineSeparatorParametersCommand( const QString &name, SeparatorLinePos _oldValuePos, SeparatorLinePos _newValuePos, int _oldLength, int _newLength, double _oldWidth, double _newWidth, SeparatorLineLineType _oldLineType, SeparatorLineLineType _newLineType, KWDocument *_doc):
+KWChangeFootNoteLineSeparatorParametersCommand::KWChangeFootNoteLineSeparatorParametersCommand( const TQString &name, SeparatorLinePos _oldValuePos, SeparatorLinePos _newValuePos, int _oldLength, int _newLength, double _oldWidth, double _newWidth, SeparatorLineLineType _oldLineType, SeparatorLineLineType _newLineType, KWDocument *_doc):
     KNamedCommand(name),
     m_doc( _doc ),
     m_oldValuePos(_oldValuePos),
@@ -2027,11 +2027,11 @@ void KWChangeFootNoteLineSeparatorParametersCommand::changeLineSeparatorParamete
     m_doc->setFootNoteSeparatorLineLength( _length);
     m_doc->setFootNoteSeparatorLineWidth(_width );
     m_doc->setFootNoteSeparatorLineType( _type );
-    m_doc->repaintAllViews();
+    m_doc->tqrepaintAllViews();
 }
 
 
-KWRenameBookmarkCommand::KWRenameBookmarkCommand( const QString &name, const QString & _oldname, const QString & _newName, KWDocument *_doc):
+KWRenameBookmarkCommand::KWRenameBookmarkCommand( const TQString &name, const TQString & _oldname, const TQString & _newName, KWDocument *_doc):
     KNamedCommand(name),
     m_doc( _doc ),
     m_oldName( _oldname),
@@ -2061,15 +2061,15 @@ KWResizeColumnCommand::KWResizeColumnCommand( KWTableFrameSet *table, int col, d
 void KWResizeColumnCommand::execute()
 {
   m_table->resizeColumn(m_col, m_newSize);
-  m_table->kWordDocument()->layout();
-  m_table->kWordDocument()->repaintAllViews();
+  m_table->kWordDocument()->tqlayout();
+  m_table->kWordDocument()->tqrepaintAllViews();
 }
 
 void KWResizeColumnCommand::unexecute()
 {
   m_table->resizeColumn(m_col, m_oldSize);
-  m_table->kWordDocument()->layout();
-  m_table->kWordDocument()->repaintAllViews();
+  m_table->kWordDocument()->tqlayout();
+  m_table->kWordDocument()->tqrepaintAllViews();
 }
 
 KWResizeRowCommand::KWResizeRowCommand( KWTableFrameSet *table, int row, double oldSize, double newSize ):
@@ -2084,11 +2084,11 @@ KWResizeRowCommand::KWResizeRowCommand( KWTableFrameSet *table, int row, double
 void KWResizeRowCommand::execute()
 {
   m_table->resizeRow( m_row, m_newSize );
-  m_table->kWordDocument()->repaintAllViews();
+  m_table->kWordDocument()->tqrepaintAllViews();
 }
 
 void KWResizeRowCommand::unexecute()
 {
   m_table->resizeRow( m_row, m_oldSize );
-  m_table->kWordDocument()->repaintAllViews();
+  m_table->kWordDocument()->tqrepaintAllViews();
 }