Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

52 files changed, 289 insertions, 289 deletions

diff --git a/kword/KWAnchor.cpp b/kword/KWAnchor.cpp
index f9641cf4..11136e3d 100644
--- a/kword/KWAnchor.cpp
+++ b/kword/KWAnchor.cpp
@@ -154,8 +154,8 @@ void KWAnchor::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch,
     if ( containingFrame ) // 0 in the textviewmode
         topLeftParagPt = containingFrame->innerRect().topLeft();
 
-    topLeftParagPt.rx() += zh->tqlayoutUnitPtToPt( zh->pixelYToPt( paragx ) );
-    topLeftParagPt.ry() += zh->tqlayoutUnitPtToPt( zh->pixelYToPt( paragy ) );
+    topLeftParagPt.rx() += zh->layoutUnitPtToPt( zh->pixelYToPt( paragx ) );
+    topLeftParagPt.ry() += zh->layoutUnitPtToPt( zh->pixelYToPt( paragy ) );
     if ( containingFrame ) // 0 in the textviewmode
         topLeftParagPt.ry() -= containingFrame->internalY();
 
@@ -205,8 +205,8 @@ TQSize KWAnchor::size() const
     KoTextZoomHandler * zh = textDocument()->formattingZoomHandler();
     TQSize sz( zh->ptToLayoutUnitPixX( kosz.width() ), zh->ptToLayoutUnitPixY( kosz.height() ) );
     //kdDebug() << "KWAnchor::size in LU: " << sz.width() << "x" << sz.height() << endl;
-    //kdDebug() << "          size in pixels: " << zh->tqlayoutUnitToPixelX( sz.width() ) << "x"
-    //          << zh->tqlayoutUnitToPixelY( sz.height() ) << endl;
+    //kdDebug() << "          size in pixels: " << zh->layoutUnitToPixelX( sz.width() ) << "x"
+    //          << zh->layoutUnitToPixelY( sz.height() ) << endl;
     if ( sz.isNull() ) // for some reason, we don't know the size yet
         sz = TQSize( width, height ); // LU
     return sz;
@@ -263,10 +263,10 @@ void KWAnchor::setDeleted( bool b )
         m_frameset->setAnchored( static_cast<KWTextDocument *>(textDocument())->textFrameSet() );
 }
 
-void KWAnchor::save( TQDomElement &tqparentElem )
+void KWAnchor::save( TQDomElement &parentElem )
 {
-    TQDomElement anchorElem = tqparentElem.ownerDocument().createElement( "ANCHOR" );
-    tqparentElem.appendChild( anchorElem );
+    TQDomElement anchorElem = parentElem.ownerDocument().createElement( "ANCHOR" );
+    parentElem.appendChild( anchorElem );
     anchorElem.setAttribute( "type", "frameset" ); // the only possible value currently
     //KWDocument * doc = textDocument()->textFrameSet()->kWordDocument();
     // ## TODO save the frame number as well ? Only the first frame ? to be determined
diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp
index e1f0f52b..e68e1c99 100644
--- a/kword/KWCommand.cpp
+++ b/kword/KWCommand.cpp
@@ -344,9 +344,9 @@ void KWTextDeleteCommand::createBookmarkList()
         return;
     }
 
-    // Now restore the parag tqlayouts (i.e. libkotext specific stuff)
+    // Now restore the parag layouts (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;
+    kdDebug(32500) << "KWTextDeleteCommand::createBookmarkList " << m_oldParagLayouts.count() << " parag layouts. First parag=" << s->paragId() << endl;
     Q_ASSERT( id == s->paragId() );
     KoTextParag *p = s;
     while ( p ) {
diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp
index 6743e36f..fac2ced0 100644
--- a/kword/KWConfigFootNoteDia.cpp
+++ b/kword/KWConfigFootNoteDia.cpp
@@ -78,7 +78,7 @@ void KWConfigFootNoteDia::setupTab3()
 
     TQButtonGroup *positionGroupBox = new TQButtonGroup( i18n( "Position"), page );
     comment= i18n ("The separator can be positioned horizontally by picking one "
-        "of the three tqalignments.");
+        "of the three alignments.");
     TQWhatsThis::add(positionGroupBox, comment);
     positionGroupBox->setColumnLayout(0, Qt::Vertical );
     TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->tqlayout() );
diff --git a/kword/KWCreateBookmarkDiaBase.ui b/kword/KWCreateBookmarkDiaBase.ui
index 872c0d8b..0d164ed4 100644
--- a/kword/KWCreateBookmarkDiaBase.ui
+++ b/kword/KWCreateBookmarkDiaBase.ui
@@ -53,5 +53,5 @@ Please provide the name of your bookmark.</string>
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="6"/>
+<layoutdefaults spacing="6" margin="6"/>
 </UI>
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index 138cf92a..72fd0555 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -151,8 +151,8 @@ public:
 
 const int KWDocument::CURRENT_SYNTAX_VERSION = 3;
 
-KWDocument::KWDocument(TQWidget *tqparentWidget, const char *widname, TQObject* tqparent, const char* name, bool singleViewMode )
-    : KoDocument( tqparentWidget, widname, tqparent, name, singleViewMode ),
+KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* tqparent, const char* name, bool singleViewMode )
+    : KoDocument( parentWidget, widname, tqparent, name, singleViewMode ),
       m_urlIntern()
 {
     KWStatisticVariable::setExtendedType(  true );
@@ -492,7 +492,7 @@ void KWDocument::newZoomAndResolution( bool updateViews, bool forPrint )
     }
 }
 
-bool KWDocument::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+bool KWDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 {
     m_pageColumns.columns = 1;
     m_pageColumns.ptColumnSpacing = m_defaultColumnSpacing;
@@ -539,7 +539,7 @@ bool KWDocument::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
     TQString file;
     KoTemplateChooseDia::ReturnType ret = KoTemplateChooseDia::choose(
         KWFactory::instance(), file,
-        dlgtype, "kword_template", tqparentWidget );
+        dlgtype, "kword_template", parentWidget );
     if ( ret == KoTemplateChooseDia::Template ) {
         resetURL();
         ok = loadNativeFormat( file );
@@ -2572,7 +2572,7 @@ void KWDocument::pasteFrames( TQDomElement topElem, KMacroCommand * macroCmd, bo
         KWFrameSet * fs = 0L;
         if ( elem.tagName() == "FRAME" )
         {
-            TQString frameSetName = frameElem.attribute( "tqparentFrameset" );
+            TQString frameSetName = frameElem.attribute( "parentFrameset" );
             fs = frameSetByName( frameSetName );
             if ( !fs )
             {
@@ -3073,13 +3073,13 @@ void KWDocument::saveSelectedFrames( KoXmlWriter& bodyWriter, KoSavingContext& s
         else if ( !isTable ) {
 #if 0
             // Save the frame information
-            TQDomElement frameElem = tqparentElem.ownerDocument().createElement( "FRAME" );
-            tqparentElem.appendChild( frameElem );
+            TQDomElement frameElem = parentElem.ownerDocument().createElement( "FRAME" );
+            parentElem.appendChild( frameElem );
             frame->save( frameElem );
             if ( frame != firstFrame )
             {
                 // Frame saved alone -> remember which frameset it's part of
-                frameElem.setAttribute( "tqparentFrameset", fs->name() );
+                frameElem.setAttribute( "parentFrameset", fs->name() );
             }
 #endif
         }
@@ -3606,17 +3606,17 @@ TQDomDocument KWDocument::saveXML()
 }
 
 // KWord-1.3 format
-void KWDocument::saveEmbeddedObjects( TQDomElement& tqparentElem, const TQPtrList<KoDocumentChild>& childList )
+void KWDocument::saveEmbeddedObjects( TQDomElement& parentElem, const TQPtrList<KoDocumentChild>& childList )
 {
     // Write "OBJECT" tag for every child, appending "EMBEDDING" tags to the main XML
     TQPtrListIterator<KoDocumentChild> chl( childList );
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     for( ; chl.current(); ++chl ) {
         KWDocumentChild* curr = static_cast<KWDocumentChild*>(chl.current());
         if ( !curr->isDeleted() )
         {
             TQDomElement embeddedElem = doc.createElement( "EMBEDDED" );
-            tqparentElem.appendChild( embeddedElem );
+            parentElem.appendChild( embeddedElem );
 
             TQDomElement objectElem = curr->save( doc, true );
             embeddedElem.appendChild( objectElem );
@@ -3630,11 +3630,11 @@ void KWDocument::saveEmbeddedObjects( TQDomElement& tqparentElem, const TQPtrLis
 }
 
 // KWord-1.3 format
-void KWDocument::saveStyle( KoParagStyle *sty, TQDomElement tqparentElem )
+void KWDocument::saveStyle( KoParagStyle *sty, TQDomElement parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement styleElem = doc.createElement( "STYLE" );
-    tqparentElem.appendChild( styleElem );
+    parentElem.appendChild( styleElem );
 
     sty->saveStyle( styleElem );
 
@@ -3643,21 +3643,21 @@ void KWDocument::saveStyle( KoParagStyle *sty, TQDomElement tqparentElem )
 }
 
 // KWord-1.3 format
-void KWDocument::saveFrameStyle( KWFrameStyle *sty, TQDomElement tqparentElem )
+void KWDocument::saveFrameStyle( KWFrameStyle *sty, TQDomElement parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement frameStyleElem = doc.createElement( "FRAMESTYLE" );
-    tqparentElem.appendChild( frameStyleElem );
+    parentElem.appendChild( frameStyleElem );
 
     sty->saveFrameStyle( frameStyleElem );
 }
 
 // KWord-1.3 format
-void KWDocument::saveTableStyle( KWTableStyle *sty, TQDomElement tqparentElem )
+void KWDocument::saveTableStyle( KWTableStyle *sty, TQDomElement parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement tableStyleElem = doc.createElement( "TABLESTYLE" );
-    tqparentElem.appendChild( tableStyleElem );
+    parentElem.appendChild( tableStyleElem );
 
     sty->saveTableStyle( tableStyleElem );
 }
@@ -3867,12 +3867,12 @@ KWDocumentChild* KWDocument::createChildDoc( const KoRect& rect, KoDocument* chi
     return ch;
 }
 
-KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e, TQWidget* tqparentWidget )
+KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e, TQWidget* parentWidget )
 {
     KoDocument* doc = e.createDoc( this );
     if ( !doc )
         return 0;
-    if ( !doc->showEmbedInitDialog( tqparentWidget )  )
+    if ( !doc->showEmbedInitDialog( parentWidget )  )
         return 0;
 
     KWDocumentChild* ch = createChildDoc( rect, doc );
diff --git a/kword/KWDocument.h b/kword/KWDocument.h
index 029930d8..cab789f8 100644
--- a/kword/KWDocument.h
+++ b/kword/KWDocument.h
@@ -131,7 +131,7 @@ public:
     friend class KWOasisLoader;
     friend class KWStartupWidget;
 
-    KWDocument( TQWidget *tqparentWidget = 0, const char *widname = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    KWDocument( TQWidget *parentWidget = 0, const char *widname = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
     ~KWDocument();
 
     enum ProcessingType {WP = 0, DTP = 1};
@@ -139,7 +139,7 @@ public:
     static const int CURRENT_SYNTAX_VERSION;
 
 public:
-    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+    virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
 
     virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* store );
 
@@ -208,7 +208,7 @@ public:
 
     virtual void addShell( KoMainWindow *shell );
 
-    KWPartFrameSet* insertObject( const KoRect& rect, KoDocumentEntry& e, TQWidget* tqparentWidget );
+    KWPartFrameSet* insertObject( const KoRect& rect, KoDocumentEntry& e, TQWidget* parentWidget );
 
     /// Create an embedded document; used by KWPartFrameSet but is defined here
     /// because KoDocument:insertChild is protected.
@@ -491,7 +491,7 @@ public:
     /// This is used by loadFrameSets() and by KWCanvas to paste framesets
     KWFrameSet *loadFrameSet( TQDomElement framesetElem, bool loadFrames = true , bool loadFootnote = true);
     void loadEmbeddedObjects( TQDomElement& word );
-    void saveEmbeddedObjects( TQDomElement& tqparentElem, const TQPtrList<KoDocumentChild>& childList );
+    void saveEmbeddedObjects( TQDomElement& parentElem, const TQPtrList<KoDocumentChild>& childList );
     void loadEmbedded( const TQDomElement &embedded );
 
     void recalcVariables( int type );
@@ -526,9 +526,9 @@ public:
     TQString viewModeType() const { return m_viewModeType; }
 
     /**
-     * The view mode used for text tqlayouting.
+     * The view mode used for text layouting.
      */
-    KWViewMode* tqlayoutViewMode() const { return m_layoutViewMode; }
+    KWViewMode* layoutViewMode() const { return m_layoutViewMode; }
 
     /**
      * Changes m_viewMode, and updates all views to this viewmode
@@ -829,9 +829,9 @@ protected:
 
     void loadFrameSets( const TQDomElement &framesets );
     void loadStyleTemplates( const TQDomElement &styles );
-    void saveStyle( KoParagStyle *sty, TQDomElement tqparentElem );
-    void saveFrameStyle( KWFrameStyle *sty, TQDomElement tqparentElem );
-    void saveTableStyle( KWTableStyle *sty, TQDomElement tqparentElem );
+    void saveStyle( KoParagStyle *sty, TQDomElement parentElem );
+    void saveFrameStyle( KWFrameStyle *sty, TQDomElement parentElem );
+    void saveTableStyle( KWTableStyle *sty, TQDomElement parentElem );
 
     void loadFrameStyleTemplates( const TQDomElement &styles );
     void loadDefaultFrameStyleTemplates();
@@ -971,7 +971,7 @@ private:
 
     /// The name of the viewmode used by all views.
     TQString m_viewModeType;
-    /// The viewmode used for text tqlayouting
+    /// The viewmode used for text layouting
     KWViewMode* m_layoutViewMode;
     KWVariableCollection *m_varColl;
     KWBgSpellCheck *m_bgSpellCheck;
diff --git a/kword/KWFactory.cpp b/kword/KWFactory.cpp
index 142fb1fb..31c3b5aa 100644
--- a/kword/KWFactory.cpp
+++ b/kword/KWFactory.cpp
@@ -44,11 +44,11 @@ KWFactory::~KWFactory()
     s_instance=0L;
 }
 
-KParts::Part* KWFactory::createPartObject( TQWidget *tqparentWidget, const char *widname, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* KWFactory::createPartObject( TQWidget *parentWidget, const char *widname, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
 {
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    KWDocument *doc = new KWDocument( tqparentWidget, widname, tqparent, name, !bWantKoDocument );
+    KWDocument *doc = new KWDocument( parentWidget, widname, tqparent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
       doc->setReadWrite( false );
diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp
index 5c21daa3..f8d597e8 100644
--- a/kword/KWFormulaFrameSet.cpp
+++ b/kword/KWFormulaFrameSet.cpp
@@ -244,16 +244,16 @@ MouseMeaning KWFormulaFrameSet::getMouseMeaningInsideFrame( const KoPoint& )
     return MEANING_MOUSE_INSIDE_TEXT;
 }
 
-TQDomElement KWFormulaFrameSet::save(TQDomElement& tqparentElem, bool saveFrames)
+TQDomElement KWFormulaFrameSet::save(TQDomElement& parentElem, bool saveFrames)
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return TQDomElement();
-    TQDomElement framesetElem = tqparentElem.ownerDocument().createElement("FRAMESET");
-    tqparentElem.appendChild(framesetElem);
+    TQDomElement framesetElem = parentElem.ownerDocument().createElement("FRAMESET");
+    parentElem.appendChild(framesetElem);
 
     KWFrameSet::saveCommon(framesetElem, saveFrames);
 
-    TQDomElement formulaElem = tqparentElem.ownerDocument().createElement("FORMULA");
+    TQDomElement formulaElem = parentElem.ownerDocument().createElement("FORMULA");
     framesetElem.appendChild(formulaElem);
     formula->save(formulaElem);
     return framesetElem;
diff --git a/kword/KWFormulaFrameSet.h b/kword/KWFormulaFrameSet.h
index b9b06a4d..a72fe200 100644
--- a/kword/KWFormulaFrameSet.h
+++ b/kword/KWFormulaFrameSet.h
@@ -80,7 +80,7 @@ public:
                                    const TQColorGroup&, bool onlyChanged, bool resetChanged,
                                    KWFrameSetEdit *edit, KWViewMode *viewMode);
 
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true );
     virtual void load( TQDomElement &attributes, bool loadFrames = true );
     virtual void saveOasis(KoXmlWriter&, KoSavingContext&, bool saveFrames ) const;
     void paste( TQDomNode& formulaElem );
diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp
index d33d9118..2130e235 100644
--- a/kword/KWFrameDia.cpp
+++ b/kword/KWFrameDia.cpp
@@ -448,7 +448,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options
         "When a new page is created, a new frame will be created for this "
         "frameset, so that the text can flow from one page to the next if necessary. "
         "This is what happens for the \"main text frameset\", but this option makes it possible "
-        "to choose the same behavior for other framesets, for instance in magazine tqlayouts."));
+        "to choose the same behavior for other framesets, for instance in magazine layouts."));
     if ( m_rResizeFrame )
         connect( m_reconnect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setFrameBehaviorInputOn() ) );
     m_onpGrid->addRowSpacing( 0, KDialog::marginHint() + 5 );
@@ -2142,12 +2142,12 @@ bool KWFrameDia::applyChanges()
         while(f) {
             // The floating attribute applies to the whole frameset...
             KWFrameSet * fs = f->frameSet();
-            KWFrameSet * tqparentFs = fs->groupmanager() ? fs->groupmanager() : fs;
+            KWFrameSet * parentFs = fs->groupmanager() ? fs->groupmanager() : fs;
 
             // Floating
             if ( m_floating->isChecked() &&
                  m_floating->state() != TQButton::NoChange &&
-                 !tqparentFs->isFloating() )
+                 !parentFs->isFloating() )
             {
                 if(!macroCmd)
                     macroCmd = new KMacroCommand( i18n("Make Frameset Inline") );
@@ -2158,7 +2158,7 @@ bool KWFrameDia::applyChanges()
                 KoPoint oldPos = f->topLeft();
 
                 // turn non-floating frame into floating frame
-                KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), tqparentFs, true );
+                KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), parentFs, true );
                 cmd->execute();
 
                 frameindexList.append( FrameIndex( f ) );
@@ -2171,12 +2171,12 @@ bool KWFrameDia::applyChanges()
             }
             else if ( !m_floating->isChecked() &&
                       m_floating->state() != TQButton::NoChange &&
-                      tqparentFs->isFloating() )
+                      parentFs->isFloating() )
             {
                 if(!macroCmd)
                     macroCmd = new KMacroCommand( i18n("Make Frameset Non-Inline") );
                 // turn floating-frame into non-floating frame
-                KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), tqparentFs, false );
+                KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), parentFs, false );
                 macroCmd->addCommand(cmd);
                 cmd->execute();
             }
diff --git a/kword/KWFrameLayout.cpp b/kword/KWFrameLayout.cpp
index 5c0fee78..5a484198 100644
--- a/kword/KWFrameLayout.cpp
+++ b/kword/KWFrameLayout.cpp
@@ -263,7 +263,7 @@ void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns,
                 KoRect rect;
 
                 // When two footnotes are in the same page there should be 0 spacing between them
-                // Yeah, write a generic frame tqlayouter and then realize it's not flexible enough :(
+                // Yeah, write a generic frame layouter and then realize it's not flexible enough :(
                 if ( fs->isFootEndNote() && !firstFootNote )
                 {
                     // Undo "bottom -= spacing" (done below). This assumes equal spacing for all footnotes
diff --git a/kword/KWFrameLayout.h b/kword/KWFrameLayout.h
index 140d1284..18089ee5 100644
--- a/kword/KWFrameLayout.h
+++ b/kword/KWFrameLayout.h
@@ -77,7 +77,7 @@ public:
 
     /**
      * Constructor
-     * @param doc the KWDocument we're tqlayouting
+     * @param doc the KWDocument we're layouting
      * @param headersFooters list of header and footer HFFs (see definition of HeaderFooterFrameset)
      * @param footnotes list of footnotes framesets HFFs
      * @param endnotes list of endnotes framesets HFFs
diff --git a/kword/KWFrameList.cpp b/kword/KWFrameList.cpp
index 10e6c467..3628df05 100644
--- a/kword/KWFrameList.cpp
+++ b/kword/KWFrameList.cpp
@@ -67,13 +67,13 @@ TQValueList<KWFrame *> KWFrameList::framesOnTop() const {
 void KWFrameList::setFrames(const TQPtrList<KWFrame> &frames) {
     // kdDebug(31001) << "KWFrameList::setFrames for " << m_frame->frameSet()->name() << endl;
     m_frames.clear();
-    if ( m_doc->tqlayoutViewMode() && !m_doc->tqlayoutViewMode()->hasFrames() )
+    if ( m_doc->layoutViewMode() && !m_doc->layoutViewMode()->hasFrames() )
         return;
 
-    TQPtrList<KWFrameSet> tqparentFramesets;
+    TQPtrList<KWFrameSet> parentFramesets;
     KWFrameSet *fs = m_frame->frameSet();
     while(fs) {
-        tqparentFramesets.append(fs);
+        parentFramesets.append(fs);
         fs = (KWFrameSet*) fs->anchorFrameset();
     }
 
@@ -96,7 +96,7 @@ void KWFrameList::setFrames(const TQPtrList<KWFrame> &frames) {
         // ## might need a for loop for the case of inline-inside-inline,
         // or maybe calling isPaintedBy instead [depending on what should happen for tables]
         if ( daFrame->frameSet()->isFloating() &&
-                (tqparentFramesets.tqcontains(daFrame->frameSet()->anchorFrameset()) ||
+                (parentFramesets.tqcontains(daFrame->frameSet()->anchorFrameset()) ||
                  daFrame->frameSet()->isPaintedBy(m_frame->frameSet())) )
             continue;
         // Floating frames are not "on top", they are "inside".
diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp
index d07a55e2..b8b9f8d0 100644
--- a/kword/KWFrameSet.cpp
+++ b/kword/KWFrameSet.cpp
@@ -475,7 +475,7 @@ KoRect KWFrameSet::floatingFrameRect( int frameNum )
     int x = anchor->x() + paragRect.x(); // in LU
     int y = anchor->y() + paragRect.y(); // in LU
 
-    KoPoint topLeft( m_doc->tqlayoutUnitToPixelX( x ), m_doc->tqlayoutUnitToPixelY( y ) );
+    KoPoint topLeft( m_doc->layoutUnitToPixelX( x ), m_doc->layoutUnitToPixelY( y ) );
     return KoRect( topLeft, frame->outerKoRect().size() );
 }
 
@@ -603,8 +603,8 @@ bool KWFrameSet::isPaintedBy( KWFrameSet* fs ) const
         return true;
     if ( isFloating() )
     {
-        KWFrameSet* tqparentFs = anchorFrameset();
-        if ( tqparentFs && tqparentFs->isPaintedBy( fs ) )
+        KWFrameSet* parentFs = anchorFrameset();
+        if ( parentFs && parentFs->isPaintedBy( fs ) )
             return true;
     }
     if ( groupmanager() )
@@ -865,25 +865,25 @@ void KWFrameSet::drawFrameContents( KWFrame *, TQPainter *, const TQRect &,
     kdWarning() << "Default implementation of drawFrameContents called for " << className() << " " << this << " " << name() << kdBacktrace();
 }
 
-void KWFrameSet::saveCommon( TQDomElement &tqparentElem, bool saveFrames )
+void KWFrameSet::saveCommon( TQDomElement &parentElem, bool saveFrames )
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return;
 
     // Save all the common attributes for framesets.
-    tqparentElem.setAttribute( "frameType", static_cast<int>( type() ) );
-    tqparentElem.setAttribute( "frameInfo", static_cast<int>( m_info ) );
-    tqparentElem.setAttribute( "name", m_name );
-    tqparentElem.setAttribute( "visible", static_cast<int>( m_visible ) );
-    tqparentElem.setAttribute( "protectSize", static_cast<int>( m_protectSize ) );
+    parentElem.setAttribute( "frameType", static_cast<int>( type() ) );
+    parentElem.setAttribute( "frameInfo", static_cast<int>( m_info ) );
+    parentElem.setAttribute( "name", m_name );
+    parentElem.setAttribute( "visible", static_cast<int>( m_visible ) );
+    parentElem.setAttribute( "protectSize", static_cast<int>( m_protectSize ) );
     if ( saveFrames )
     {
         TQPtrListIterator<KWFrame> frameIt = frameIterator();
         for ( ; frameIt.current(); ++frameIt )
         {
             KWFrame *frame = frameIt.current();
-            TQDomElement frameElem = tqparentElem.ownerDocument().createElement( "FRAME" );
-            tqparentElem.appendChild( frameElem );
+            TQDomElement frameElem = parentElem.ownerDocument().createElement( "FRAME" );
+            parentElem.appendChild( frameElem );
 
             frame->save( frameElem );
 
@@ -1157,7 +1157,7 @@ void KWFrameSet::setNewFrameBehavior( KWFrame::NewFrameBehavior nfb ) {
 
 // ## this should pass the viewmode as argument, probably.
 bool KWFrameSet::isFrameAtPos( const KWFrame* frame, const TQPoint& point, bool borderOfFrameOnly) const {
-    TQRect outerRect( frame->outerRect( m_doc->tqlayoutViewMode() ) );
+    TQRect outerRect( frame->outerRect( m_doc->layoutViewMode() ) );
     // Give the user a bit of margin for clicking on it :)
     const int margin = 2;
     outerRect.rLeft() -= margin;
diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h
index be9337c0..b714d96d 100644
--- a/kword/KWFrameSet.h
+++ b/kword/KWFrameSet.h
@@ -315,10 +315,10 @@ public:
     virtual void tqinvalidate() {}
 
     /// save to XML - when saving
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true ) = 0;
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true ) = 0;
     /// save to XML - when copying to clipboard
-    virtual TQDomElement toXML( TQDomElement &tqparentElem, bool saveFrames = true )
-    { return save( tqparentElem, saveFrames ); }
+    virtual TQDomElement toXML( TQDomElement &parentElem, bool saveFrames = true )
+    { return save( parentElem, saveFrames ); }
     /// Save to OASIS format
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context, bool saveFrames ) const = 0;
     /// If the frameset is inline, is it ok to save it inside an oasis <text:p>?
@@ -467,7 +467,7 @@ signals:
 protected:
 
     /// save the common attributes for the frameset
-    void saveCommon( TQDomElement &tqparentElem, bool saveFrames );
+    void saveCommon( TQDomElement &parentElem, bool saveFrames );
 
     /**Determine the clipping rectangle for drawing the contents of @p frame with @p painter
      * in the rectangle delimited by @p crect.
diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp
index 44b83c56..fd6fd26a 100644
--- a/kword/KWFrameStyle.cpp
+++ b/kword/KWFrameStyle.cpp
@@ -99,46 +99,46 @@ KWFrameStyle::KWFrameStyle( const TQString & name, KWFrame * frame )
     m_borderBottom = frame->bottomBorder();
 }
 
-KWFrameStyle::KWFrameStyle( TQDomElement & tqparentElem, int /*docVersion=2*/ )
+KWFrameStyle::KWFrameStyle( TQDomElement & parentElem, int /*docVersion=2*/ )
     : KoUserStyle( TQString() )
 {
-    TQDomElement element = tqparentElem.namedItem( "NAME" ).toElement();
+    TQDomElement element = parentElem.namedItem( "NAME" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("value") ) ) {
         m_name = element.attribute( "value" );
         m_displayName = i18n( "Style name", m_name.utf8() );
     } else
         kdWarning() << "No NAME tag in frame style!" << endl;
 
-    element = tqparentElem.namedItem( "LEFTBORDER" ).toElement();
+    element = parentElem.namedItem( "LEFTBORDER" ).toElement();
     if ( !element.isNull() )
         m_borderLeft = KoBorder::loadBorder( element );
     else
         m_borderLeft.setPenWidth( 0 );
 
-    element = tqparentElem.namedItem( "RIGHTBORDER" ).toElement();
+    element = parentElem.namedItem( "RIGHTBORDER" ).toElement();
     if ( !element.isNull() )
         m_borderRight = KoBorder::loadBorder( element );
     else
         m_borderRight.setPenWidth( 0 );
 
-    element = tqparentElem.namedItem( "TOPBORDER" ).toElement();
+    element = parentElem.namedItem( "TOPBORDER" ).toElement();
     if ( !element.isNull() )
         m_borderTop = KoBorder::loadBorder( element );
     else
         m_borderTop.setPenWidth( 0 );
 
-    element = tqparentElem.namedItem( "BOTTOMBORDER" ).toElement();
+    element = parentElem.namedItem( "BOTTOMBORDER" ).toElement();
     if ( !element.isNull() )
         m_borderBottom = KoBorder::loadBorder( element );
     else
         m_borderBottom.setPenWidth( 0 );
 
     TQColor c("white");
-    if ( tqparentElem.hasAttribute("red") )
+    if ( parentElem.hasAttribute("red") )
         c.setRgb(
-            KWDocument::getAttribute( tqparentElem, "red", 0 ),
-            KWDocument::getAttribute( tqparentElem, "green", 0 ),
-            KWDocument::getAttribute( tqparentElem, "blue", 0 ) );
+            KWDocument::getAttribute( parentElem, "red", 0 ),
+            KWDocument::getAttribute( parentElem, "green", 0 ),
+            KWDocument::getAttribute( parentElem, "blue", 0 ) );
 
     m_backgroundColor = TQBrush( c );
 }
@@ -174,49 +174,49 @@ int KWFrameStyle::compare( const KWFrameStyle & frameStyle ) const
 }
 
 
-void KWFrameStyle::saveFrameStyle( TQDomElement & tqparentElem )
+void KWFrameStyle::saveFrameStyle( TQDomElement & parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
     element.setAttribute( "value", displayName() );
 
     if ( m_borderLeft.width() > 0 )
     {
         element = doc.createElement( "LEFTBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         m_borderLeft.save( element );
     }
     if ( m_borderRight.width() > 0 )
     {
         element = doc.createElement( "RIGHTBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         m_borderRight.save( element );
     }
     if ( m_borderTop.width() > 0 )
     {
         element = doc.createElement( "TOPBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         m_borderTop.save( element );
     }
     if ( m_borderBottom.width() > 0 )
     {
         element = doc.createElement( "BOTTOMBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         m_borderBottom.save( element );
     }
 
     if(m_backgroundColor.color().isValid())
     {
-        tqparentElem.setAttribute( "red", m_backgroundColor.color().red() );
-        tqparentElem.setAttribute( "green", m_backgroundColor.color().green() );
-        tqparentElem.setAttribute( "blue", m_backgroundColor.color().blue() );
+        parentElem.setAttribute( "red", m_backgroundColor.color().red() );
+        parentElem.setAttribute( "green", m_backgroundColor.color().green() );
+        parentElem.setAttribute( "blue", m_backgroundColor.color().blue() );
     }
 }
 
-KWFrameStyle *KWFrameStyle::loadStyle( TQDomElement & tqparentElem, int docVersion )
+KWFrameStyle *KWFrameStyle::loadStyle( TQDomElement & parentElem, int docVersion )
 {
-    return new KWFrameStyle( tqparentElem, docVersion );
+    return new KWFrameStyle( parentElem, docVersion );
 }
 
 void KWFrameStyle::saveOasis( KoGenStyles& mainStyles, KoSavingContext& savingContext ) const
@@ -270,7 +270,7 @@ void KWFrameStyle::loadOasis( TQDomElement & styleElem, KoOasisContext& context
     styleStack.setTypeProperties( "graphic" );
 
     styleStack.save();
-    context.addStyles( &styleElem, "graphic" ); // Load all tqparents - only because we don't support inheritance.
+    context.addStyles( &styleElem, "graphic" ); // Load all parents - only because we don't support inheritance.
 
     if ( styleStack.hasAttributeNS( KoXmlNS::fo, "background-color" ) ) {
         TQString color = styleStack.attributeNS( KoXmlNS::fo, "background-color" );
diff --git a/kword/KWFrameStyle.h b/kword/KWFrameStyle.h
index 7b398c29..3336daa2 100644
--- a/kword/KWFrameStyle.h
+++ b/kword/KWFrameStyle.h
@@ -45,7 +45,7 @@ public:
     KWFrameStyle( const TQString & name );
 
     KWFrameStyle( const TQString & name, KWFrame * frame );
-    KWFrameStyle( TQDomElement & tqparentElem, int docVersion=2 );
+    KWFrameStyle( TQDomElement & parentElem, int docVersion=2 );
 
     /** Copy another framestyle */
     KWFrameStyle( const KWFrameStyle & rhs );
@@ -76,12 +76,12 @@ public:
     void setBottomBorder( KoBorder _bottom )  { m_borderBottom = _bottom; }
 
     /// save (old xml format)
-    void saveFrameStyle( TQDomElement & tqparentElem );
+    void saveFrameStyle( TQDomElement & parentElem );
     /// save (new oasis xml format)
     void saveOasis( KoGenStyles& mainStyles, KoSavingContext& savingContext ) const;
 
     /// load (old xml format)
-    static KWFrameStyle *loadStyle( TQDomElement & tqparentElem, int docVersion=2 );
+    static KWFrameStyle *loadStyle( TQDomElement & parentElem, int docVersion=2 );
     /// load (new oasis xml format)
     void loadOasis( TQDomElement & styleElem, KoOasisContext& context );
 
diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp
index 38e7658a..7506e02a 100644
--- a/kword/KWFrameView.cpp
+++ b/kword/KWFrameView.cpp
@@ -185,9 +185,9 @@ void FramePolicy::addFloatingAction(KWView *view, TQPtrList<KAction> &actionList
     KToggleAction *action = dynamic_cast<KToggleAction*> (view->actionCollection()->
             action("inline_frame"));
     Q_ASSERT(action);
-    KWFrameSet *tqparentFs = m_view->frame()->frameSet()->groupmanager() ?
+    KWFrameSet *parentFs = m_view->frame()->frameSet()->groupmanager() ?
         m_view->frame()->frameSet()->groupmanager() : m_view->frame()->frameSet();
-    action->setChecked(tqparentFs->isFloating());
+    action->setChecked(parentFs->isFloating());
     actionList.append(action);
 }
 MouseMeaning FramePolicy::mouseMeaningOnBorder( const KoPoint &point, int keyState ) {
diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp
index 03c6a501..6c9851fe 100644
--- a/kword/KWInsertTOCCommand.cpp
+++ b/kword/KWInsertTOCCommand.cpp
@@ -83,7 +83,7 @@ KoTextCursor * KWInsertTOCCommand::execute( KoTextCursor *c )
     fs->tqlayout();
     fs->updateFrames();
 
-    //kdDebug() << "KWInsertTOCCommand::execute tqlayouting done, setting page numbers" << endl;
+    //kdDebug() << "KWInsertTOCCommand::execute layouting done, setting page numbers" << endl;
 
     // Now add the page numbers, and apply the style
     TQMap<KWTextParag *, KWTextParag *>::Iterator mapIt = paragMap.begin();
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index 1a637e16..244c2006 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -276,7 +276,7 @@ bool KWMailMergeDataBase::askUserForConfirmationAndConfig(KWMailMergeDataSource
 TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const
 {
     kdDebug()<<"KWMailMergeDataBase::save()"<<endl;
-    TQDomElement tqparentElem=doc.createElement("MAILMERGE");
+    TQDomElement parentElem=doc.createElement("MAILMERGE");
     if (plugin)
     {
         kdDebug()<<"KWMailMergeDataBase::save() There is really something to save"<<endl;
@@ -286,26 +286,26 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const
         TQString libname;
         ds>>libname;
         el.setAttribute("library",libname);
-        tqparentElem.appendChild(el);
+        parentElem.appendChild(el);
         kdDebug()<<"KWMailMergeDataBase::save() Calling datasource save()"<<endl;
         TQDomElement el2=doc.createElement(TQString::tqfromLatin1("DATASOURCE"));
         plugin->save(doc,el2);
-        tqparentElem.appendChild(el2);
+        parentElem.appendChild(el2);
 
     }
     kdDebug()<<"KWMailMergeDataBase::save() leaving now"<<endl;
-    return tqparentElem;
-    // if (plugin) plugin->save(tqparentElem); // Not completely sure, perhaps the database itself has to save something too (JoWenn)
+    return parentElem;
+    // if (plugin) plugin->save(parentElem); // Not completely sure, perhaps the database itself has to save something too (JoWenn)
 }
 
-void KWMailMergeDataBase::load( const TQDomElement& tqparentElem )
+void KWMailMergeDataBase::load( const TQDomElement& parentElem )
 {
-    TQDomNode dn=tqparentElem.namedItem("PLUGIN");
+    TQDomNode dn=parentElem.namedItem("PLUGIN");
     if (dn.isNull()) return;
     TQDomElement el=dn.toElement();
     plugin=loadPlugin(el.attribute("library"));
 
-    dn=tqparentElem.namedItem("DATASOURCE");
+    dn=parentElem.namedItem("DATASOURCE");
     if (dn.isNull()) return;
     el=dn.toElement();
     if (plugin) plugin->load(el);
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index afb07d2a..fc257709 100644
--- a/kword/KWPartFrameSet.cpp
+++ b/kword/KWPartFrameSet.cpp
@@ -150,11 +150,11 @@ void KWPartFrameSet::slotChildChanged()
         kdDebug(32001) << "Frame not found!" << endl;
 }
 
-TQDomElement KWPartFrameSet::save( TQDomElement &tqparentElem, bool saveFrames )
+TQDomElement KWPartFrameSet::save( TQDomElement &parentElem, bool saveFrames )
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return TQDomElement();
-    KWFrameSet::saveCommon( tqparentElem, saveFrames );
+    KWFrameSet::saveCommon( parentElem, saveFrames );
     // Ok, this one is a bit hackish. KWDocument calls us for saving our stuff into
     // the SETTINGS element, which it creates for us. So our save() doesn't really have
     // the same behaviour as a normal KWFrameSet::save()....
@@ -360,7 +360,7 @@ KoDocument* KWDocumentChild::hitTest( const TQPoint& p, const TQWMatrix& _matrix
 
     // Only activate when it's already selected, and when not clicking on the border.
     // KWFrameView and the part frame policy have that logic already.
-    KWView* kwView = ::tqqt_cast<KWView *>( tqparentDocument()->hitTestView() );
+    KWView* kwView = ::tqqt_cast<KWView *>( parentDocument()->hitTestView() );
     Q_ASSERT( kwView );
     if ( kwView ) {
         KWFrame* frame = m_partFrameSet->frame(0);
diff --git a/kword/KWPartFrameSet.h b/kword/KWPartFrameSet.h
index e6f052db..5a85853d 100644
--- a/kword/KWPartFrameSet.h
+++ b/kword/KWPartFrameSet.h
@@ -63,7 +63,7 @@ public:
 
     virtual void createEmptyRegion( const TQRect &crect, TQRegion &emptyRegion, KWViewMode *viewMode );
 
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true );
     virtual void load( TQDomElement &attributes, bool loadFrames = true );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context, bool saveFrames ) const;
 
diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp
index 3237bc37..7ea4e955 100644
--- a/kword/KWPictureFrameSet.cpp
+++ b/kword/KWPictureFrameSet.cpp
@@ -82,20 +82,20 @@ void KWPictureFrameSet::reloadPicture( const KoPictureKey& key )
     m_picture = collection->insertPicture( key, KoPicture() );
 }
 
-TQDomElement KWPictureFrameSet::save( TQDomElement & tqparentElem, bool saveFrames )
+TQDomElement KWPictureFrameSet::save( TQDomElement & parentElem, bool saveFrames )
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return TQDomElement();
-    TQDomElement framesetElem = tqparentElem.ownerDocument().createElement( "FRAMESET" );
-    tqparentElem.appendChild( framesetElem );
+    TQDomElement framesetElem = parentElem.ownerDocument().createElement( "FRAMESET" );
+    parentElem.appendChild( framesetElem );
 
     KWFrameSet::saveCommon( framesetElem, saveFrames );
 
-    TQDomElement imageElem = tqparentElem.ownerDocument().createElement( "PICTURE" );
+    TQDomElement imageElem = parentElem.ownerDocument().createElement( "PICTURE" );
     framesetElem.appendChild( imageElem );
     imageElem.setAttribute( "keepAspectRatio", m_keepAspectRatio ? "true" : "false" );
 
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "KEY" );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "KEY" );
     imageElem.appendChild( elem );
     m_picture.getKey().saveAttributes( elem );
     return framesetElem;
diff --git a/kword/KWPictureFrameSet.h b/kword/KWPictureFrameSet.h
index ef59aee9..82595344 100644
--- a/kword/KWPictureFrameSet.h
+++ b/kword/KWPictureFrameSet.h
@@ -54,7 +54,7 @@ public:
      */
     void reloadPicture( const KoPictureKey& key );
 
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true );
     virtual void load( TQDomElement &attributes, bool loadFrames = true );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context, bool saveFrames ) const;
 
diff --git a/kword/KWSelectBookmarkDiaBase.ui b/kword/KWSelectBookmarkDiaBase.ui
index d77f36b8..474498f4 100644
--- a/kword/KWSelectBookmarkDiaBase.ui
+++ b/kword/KWSelectBookmarkDiaBase.ui
@@ -72,5 +72,5 @@
         </widget>
     </hbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kword/KWStartupWidgetBase.ui b/kword/KWStartupWidgetBase.ui
index 131ffc28..57d7ce2f 100644
--- a/kword/KWStartupWidgetBase.ui
+++ b/kword/KWStartupWidgetBase.ui
@@ -99,5 +99,5 @@ For letters and notes with one main text, possibly on several pages, you should
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp
index 1fc51fd8..9d6aa58e 100644
--- a/kword/KWTableFrameSet.cpp
+++ b/kword/KWTableFrameSet.cpp
@@ -2009,19 +2009,19 @@ void KWTableFrameSet::loadOasisCell( const TQDomElement& element, KoOasisContext
 }
 
 // Old XML
-TQDomElement KWTableFrameSet::save( TQDomElement &tqparentElem, bool saveFrames ) {
+TQDomElement KWTableFrameSet::save( TQDomElement &parentElem, bool saveFrames ) {
     // When saving to a file, we don't have anything specific to the frameset to save.
     // Save the cells only.
     for (TableIter cells(this) ; cells ; ++cells)
-        cells->save(tqparentElem, saveFrames);
+        cells->save(parentElem, saveFrames);
     return TQDomElement(); // No englobing element for tables...
 }
 
 // Old XML
-TQDomElement KWTableFrameSet::toXML( TQDomElement &tqparentElem, bool saveFrames )
+TQDomElement KWTableFrameSet::toXML( TQDomElement &parentElem, bool saveFrames )
 {
-    TQDomElement framesetElem = tqparentElem.ownerDocument().createElement( "FRAMESET" );
-    tqparentElem.appendChild( framesetElem );
+    TQDomElement framesetElem = parentElem.ownerDocument().createElement( "FRAMESET" );
+    parentElem.appendChild( framesetElem );
     KWFrameSet::saveCommon( framesetElem, false ); // Save the frameset attributes
     // Save the cells
     save( framesetElem, saveFrames );
diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h
index 3a3b5d64..f572a1ba 100644
--- a/kword/KWTableFrameSet.h
+++ b/kword/KWTableFrameSet.h
@@ -452,7 +452,7 @@ public:
     void validate();
 
     /** override save so we save in table style.. */
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true );
 
     virtual void saveOasis( KoXmlWriter&, KoSavingContext&, bool saveFrames ) const;
     void loadOasis( const TQDomElement& tag, KoOasisContext& context );
@@ -462,7 +462,7 @@ public:
     Cell* loadCell( TQDomElement &frameElem, bool loadFrames = true, bool useNames = true );
 
     /** from and to XML - used when copying and pasting a table */
-    virtual TQDomElement toXML( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual TQDomElement toXML( TQDomElement &parentElem, bool saveFrames = true );
     virtual void fromXML( TQDomElement &framesetElem, bool loadFrames = true, bool useNames = true );
 
     /** Contribute to the document statistics */
diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp
index dd446669..99ecfacb 100644
--- a/kword/KWTableStyle.cpp
+++ b/kword/KWTableStyle.cpp
@@ -89,17 +89,17 @@ KWTableStyle::KWTableStyle( const TQString & name, KoParagStyle * _paragStyle, K
     m_frameStyle = _frameStyle;
 }
 
-KWTableStyle::KWTableStyle( TQDomElement & tqparentElem, KWDocument *_doc, int /*docVersion*/ )
+KWTableStyle::KWTableStyle( TQDomElement & parentElem, KWDocument *_doc, int /*docVersion*/ )
     : KoUserStyle( TQString() )
 {
-    TQDomElement element = tqparentElem.namedItem( "NAME" ).toElement();
+    TQDomElement element = parentElem.namedItem( "NAME" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("value") ) ) {
         m_name = element.attribute( "value" );
         m_displayName = i18n( "Style name", m_name.utf8() );
     } else
         kdWarning() << "No NAME tag in table style!" << endl;
 
-    element = tqparentElem.namedItem( "PFRAMESTYLE" ).toElement();
+    element = parentElem.namedItem( "PFRAMESTYLE" ).toElement();
     m_frameStyle = 0;
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") ) )
         m_frameStyle = _doc->frameStyleCollection()->findStyleByDisplayName( element.attribute( "name" ) );
@@ -119,7 +119,7 @@ KWTableStyle::KWTableStyle( TQDomElement & tqparentElem, KWDocument *_doc, int /
         }
     }
 
-    element = tqparentElem.namedItem( "PSTYLE" ).toElement();
+    element = parentElem.namedItem( "PSTYLE" ).toElement();
     m_paragStyle = 0;
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") ) )
         m_paragStyle = _doc->styleCollection()->findStyleByDisplayName( element.attribute( "name" ) );
@@ -143,31 +143,31 @@ void KWTableStyle::operator=( const KWTableStyle &rhs )
     m_frameStyle = rhs.frameStyle();
 }
 
-void KWTableStyle::saveTableStyle( TQDomElement & tqparentElem )
+void KWTableStyle::saveTableStyle( TQDomElement & parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
     element.setAttribute( "value", displayName() );
 
     if (m_frameStyle)
     {
         element = doc.createElement( "PFRAMESTYLE" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_frameStyle->displayName() );
     }
     if (m_paragStyle)
     {
         element = doc.createElement( "PSTYLE" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_paragStyle->displayName() );
     }
 
 }
 
-KWTableStyle *KWTableStyle::loadStyle( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion )
+KWTableStyle *KWTableStyle::loadStyle( TQDomElement & parentElem, KWDocument *_doc, int docVersion )
 {
-    return new KWTableStyle( tqparentElem, _doc, docVersion );
+    return new KWTableStyle( parentElem, _doc, docVersion );
 }
 
 void KWTableStyle::saveOasis( KoGenStyles& mainStyles, KoSavingContext& /*savingContext*/ ) const
@@ -203,7 +203,7 @@ void KWTableStyle::loadOasis( TQDomElement & styleElem, KoOasisContext& context,
     styleStack.setTypeProperties( "table-cell" );
 
     styleStack.save();
-    context.addStyles( &styleElem, "table-cell" ); // Load all tqparents - only because we don't support inheritance.
+    context.addStyles( &styleElem, "table-cell" ); // Load all parents - only because we don't support inheritance.
 
     const TQString frameStyleName = styleStack.attributeNS( KoXmlNS::koffice, "frame-style-name" );
     m_frameStyle = frameStyles.findStyle( frameStyleName );
diff --git a/kword/KWTableStyle.h b/kword/KWTableStyle.h
index 2fe1f26d..0452312e 100644
--- a/kword/KWTableStyle.h
+++ b/kword/KWTableStyle.h
@@ -50,7 +50,7 @@ public:
     /** Create a blank framestyle (with default attributes) */
     KWTableStyle( const TQString & name, KoParagStyle * _style, KWFrameStyle * _frameStyle );
 
-    KWTableStyle( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion=2 );
+    KWTableStyle( TQDomElement & parentElem, KWDocument *_doc, int docVersion=2 );
 
     /** Copy another framestyle */
     KWTableStyle( const KWTableStyle & rhs ) : KoUserStyle( TQString() ) { *this = rhs; }
@@ -67,12 +67,12 @@ public:
     void setFrameStyle( KWFrameStyle *frameStyle ) { m_frameStyle = frameStyle; }
 
     /// save (old xml format)
-    void saveTableStyle( TQDomElement & tqparentElem );
+    void saveTableStyle( TQDomElement & parentElem );
     /// save (new oasis xml format)
     void saveOasis( KoGenStyles& mainStyles, KoSavingContext& savingContext ) const;
 
     /// load (old xml format)
-    static KWTableStyle *loadStyle( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion=2 );
+    static KWTableStyle *loadStyle( TQDomElement & parentElem, KWDocument *_doc, int docVersion=2 );
     /// load (new oasis xml format)
     void loadOasis( TQDomElement & styleElem, KoOasisContext& context, const KoStyleCollection& paragraphStyles, const KWFrameStyleCollection& frameStyles );
 
diff --git a/kword/KWTableTemplate.cpp b/kword/KWTableTemplate.cpp
index 76eb224e..7f4b4682 100644
--- a/kword/KWTableTemplate.cpp
+++ b/kword/KWTableTemplate.cpp
@@ -124,18 +124,18 @@ KWTableTemplate::KWTableTemplate( const TQString & name, KWTableStyle * _firstRo
     m_bottomLeftCorner = _bottomLeftCorner;
 }
 
-KWTableTemplate::KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc, int /*docVersion*/ )
+KWTableTemplate::KWTableTemplate( TQDomElement & parentElem, KWDocument *_doc, int /*docVersion*/ )
 {
     m_topRightCorner = 0L;
     m_topLeftCorner = 0L;
     m_bottomRightCorner = 0L;
     m_bottomLeftCorner = 0L;
 
-    TQDomElement element = tqparentElem.namedItem( "NAME" ).toElement();
+    TQDomElement element = parentElem.namedItem( "NAME" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("value") ) )
         m_name = element.attribute( "value" );
 
-    element = tqparentElem.namedItem( "BODYCELL" ).toElement();
+    element = parentElem.namedItem( "BODYCELL" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") )
          && ( _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) ) ) )
         m_bodyCell = _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) );
@@ -172,7 +172,7 @@ KWTableTemplate::KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc,
             setBodyCell ( ts );
         }
     }
-    element = tqparentElem.namedItem( "FIRSTROW" ).toElement();
+    element = parentElem.namedItem( "FIRSTROW" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") )
          && ( _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) ) ) )
     {
@@ -186,7 +186,7 @@ KWTableTemplate::KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc,
     else
         m_firstRow = m_bodyCell;
 
-    element = tqparentElem.namedItem( "FIRSTCOL" ).toElement();
+    element = parentElem.namedItem( "FIRSTCOL" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") )
          && ( _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) ) ) )
     {
@@ -200,7 +200,7 @@ KWTableTemplate::KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc,
     else
         m_firstCol = m_bodyCell;
 
-    element = tqparentElem.namedItem( "LASTROW" ).toElement();
+    element = parentElem.namedItem( "LASTROW" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") )
          && ( _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) ) ) )
     {
@@ -214,7 +214,7 @@ KWTableTemplate::KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc,
     else
         m_lastRow = m_bodyCell;
 
-    element = tqparentElem.namedItem( "LASTCOL" ).toElement();
+    element = parentElem.namedItem( "LASTCOL" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") )
          && ( _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) ) ) )
     {
@@ -254,46 +254,46 @@ TQString KWTableTemplate::displayName() const
 }
 
 // TODO
-void KWTableTemplate::saveTableTemplate( TQDomElement & tqparentElem )
+void KWTableTemplate::saveTableTemplate( TQDomElement & parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
     element.setAttribute( "value", name() );
 
     if (m_bodyCell)
     {
         element = doc.createElement( "BODYCELL" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_bodyCell->name() );
     }
     if (m_firstRow)
     {
         element = doc.createElement( "FIRSTROW" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_firstRow->name() );
     }
     if (m_firstCol)
     {
         element = doc.createElement( "FIRSTCOL" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_firstCol->name() );
     }
     if (m_lastRow)
     {
         element = doc.createElement( "LASTROW" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_lastRow->name() );
     }
     if (m_lastCol)
     {
         element = doc.createElement( "LASTCOL" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_lastCol->name() );
     }
 }
 
-KWTableTemplate *KWTableTemplate::loadTemplate( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion )
+KWTableTemplate *KWTableTemplate::loadTemplate( TQDomElement & parentElem, KWDocument *_doc, int docVersion )
 {
-    return new KWTableTemplate(tqparentElem, _doc, docVersion);
+    return new KWTableTemplate(parentElem, _doc, docVersion);
 }
diff --git a/kword/KWTableTemplate.h b/kword/KWTableTemplate.h
index 84820d2f..b0e608d7 100644
--- a/kword/KWTableTemplate.h
+++ b/kword/KWTableTemplate.h
@@ -71,7 +71,7 @@ public:
 
     KWTableTemplate( const KWTableTemplate & rhs ) { *this = rhs; }
 
-    KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion=2 );
+    KWTableTemplate( TQDomElement & parentElem, KWDocument *_doc, int docVersion=2 );
 
     ~KWTableTemplate() {}
 
@@ -121,11 +121,11 @@ public:
     void setBottomLeftCorner( KWTableStyle *_tableStyle ) { m_bottomLeftCorner = _tableStyle; }
 
     // SAVING METHODS
-    void save( TQDomElement tqparentElem, KoTextZoomHandler* zh );
-    void saveTableTemplate( TQDomElement & tqparentElem );
+    void save( TQDomElement parentElem, KoTextZoomHandler* zh );
+    void saveTableTemplate( TQDomElement & parentElem );
 
     // STATIC METHODS
-    static KWTableTemplate *loadTemplate( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion=2 );
+    static KWTableTemplate *loadTemplate( TQDomElement & parentElem, KWDocument *_doc, int docVersion=2 );
 
 private:
     TQString m_name;
diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index f976dd78..58d5af9a 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -227,7 +227,7 @@ KWFrame * KWTextFrameSet::documentToInternal( const KoPoint &dPoint, TQPoint &iP
 #ifdef DEBUG_DTI
     kdDebug() << "KWTextFrameSet::documentToInternal dPoint:" << dPoint.x() << "," << dPoint.y() << endl;
 #endif
-    if ( !m_doc->tqlayoutViewMode()->hasFrames() ) { // text viewmode
+    if ( !m_doc->layoutViewMode()->hasFrames() ) { // text viewmode
         iPoint = TQPoint( m_doc->ptToLayoutUnitPixX( dPoint.x() ),
                          m_doc->ptToLayoutUnitPixY( dPoint.y() ) );
         return m_frames.getFirst();
@@ -382,8 +382,8 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP
 #ifdef DEBUG_ITD
     kdDebug() << "KWTextFrameSet::internalToDocumentWithHint hintDPoint: " << hintDPoint.x() << "," << hintDPoint.y() << endl;
 #endif
-    if ( !m_doc->tqlayoutViewMode()->hasFrames() ) { // text viewmode
-        dPoint = m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
+    if ( !m_doc->layoutViewMode()->hasFrames() ) { // text viewmode
+        dPoint = m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
         return m_frames.getFirst();
     }
     KWFrame *lastFrame = 0L;
@@ -421,7 +421,7 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP
     kdDebug(32002) << "KWTextFrameSet::internalToDocumentWithHint " << iPoint.x() << "," << iPoint.y()
                    << " not in any frame of " << (void*)this << endl;
 #endif
-    dPoint = m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ); // bah
+    dPoint = m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ); // bah
     return 0L;
 }
 
@@ -429,7 +429,7 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP
 KoPoint KWTextFrameSet::internalToDocumentKnowingFrame( const KoPoint &relPoint, KWFrame* theFrame ) const
 {
     // It's ok to have theFrame == 0 in the text viewmode, but not in other modes
-    if ( m_doc->tqlayoutViewMode()->hasFrames() )
+    if ( m_doc->layoutViewMode()->hasFrames() )
         Q_ASSERT( theFrame );
     if ( theFrame )
         return KoPoint( relPoint.x() + theFrame->innerRect().x(),
@@ -441,7 +441,7 @@ KoPoint KWTextFrameSet::internalToDocumentKnowingFrame( const KoPoint &relPoint,
 KoPoint KWTextFrameSet::internalToDocumentKnowingFrame( const TQPoint &iPoint, KWFrame* theFrame ) const
 {
     // Convert LU to relative coordinates (pt), then call the real internalToDocumentKnowingFrame().
-    return internalToDocumentKnowingFrame( m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ), theFrame );
+    return internalToDocumentKnowingFrame( m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ), theFrame );
 }
 
 TQPoint KWTextFrameSet::moveToPage( int currentPgNum, short int direction ) const
@@ -646,11 +646,11 @@ void KWTextFrameSet::drawFrameContents( KWFrame *theFrame, TQPainter *painter, c
         // Finding the "last parag of the frame" is a bit tricky.
         // It's usually the one before lastFormatted, except if it's actually lastParag :}  [see KoTextDocument::draw]
         KoTextParag * lastDrawn = lastFormatted->prev();
-        if ( lastFormatted == textDocument()->lastParag() && ( !lastDrawn || m_doc->tqlayoutUnitToPixelY( lastDrawn->rect().bottom() ) < r.bottom() ) )
+        if ( lastFormatted == textDocument()->lastParag() && ( !lastDrawn || m_doc->layoutUnitToPixelY( lastDrawn->rect().bottom() ) < r.bottom() ) )
             lastDrawn = lastFormatted;
 
         //kdDebug(32002) << "KWTextFrameSet::drawFrame drawn. onlyChanged=" << onlyChanged << " resetChanged=" << resetChanged << " lastDrawn=" << lastDrawn->paragId() << " lastDrawn's bottom:" << lastDrawn->rect().bottom() << " r.bottom=" << r.bottom() << endl;
-        if ( lastDrawn && m_doc->tqlayoutUnitToPixelY( lastDrawn->rect().bottom() ) > r.bottom() )
+        if ( lastDrawn && m_doc->layoutUnitToPixelY( lastDrawn->rect().bottom() ) > r.bottom() )
         {
             //kdDebug(32002) << "KWTextFrameSet::drawFrame setting lastDrawn " << lastDrawn->paragId() << " to changed" << endl;
             lastDrawn->setChanged( true );
@@ -697,7 +697,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
     TQPoint topLeft = parag->rect().topLeft();         // in TQRT coords
     int lineY;
     // Cursor height, in pixels
-    int cursorHeight = m_doc->tqlayoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) );
+    int cursorHeight = m_doc->layoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) );
     TQPoint iPoint( topLeft.x() + cursor->x(),
                    topLeft.y() + lineY );
 
@@ -721,7 +721,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
         kdDebug() << " vPoint(view, pixels)=" << vPoint.x() << "," << vPoint.y() << endl;
 #endif
         // from now on, iPoint will be in pixels
-        iPoint = m_doc->tqlayoutUnitToPixel( iPoint );
+        iPoint = m_doc->layoutUnitToPixel( iPoint );
         //int xadj = parag->at( cursor->index() )->pixelxadj;
 #ifdef DEBUG_CURSOR
         //kdDebug() << "     iPoint in pixels : " << iPoint.x() << "," << iPoint.y() << "     will add xadj=" << xadj << endl;
@@ -974,7 +974,7 @@ void KWTextFrameSet::getMargins( int yp, int h, int reqMinWidth,
 #ifdef DEBUG_MARGINS
     kdDebugBody(32002) << "  getMargins: looking for frames between " << yp << " and " << yp+h << " (internal coords)" << endl;
 #endif
-    if ( m_doc->tqlayoutViewMode()->shouldAdjustMargins() )
+    if ( m_doc->layoutViewMode()->shouldAdjustMargins() )
     {
         // Principle: for every frame on top at this height, we'll move from and to
         // towards each other. The text flows between 'from' and 'to'
@@ -1193,7 +1193,7 @@ int KWTextFrameSet::formatVertically( KoTextParag * _parag, const TQRect& paragR
 {
     // WARNING: in this whole method parag can be 0. See adjustFlow()
     KWTextParag *parag = static_cast<KWTextParag *>( _parag );
-    if ( !m_doc->tqlayoutViewMode()->shouldFormatVertically() )
+    if ( !m_doc->layoutViewMode()->shouldFormatVertically() )
     {
         return 0;
     }
@@ -1528,7 +1528,7 @@ KWFrame * KWTextFrameSet::internalToDocument( const KoPoint &relPoint, KoPoint &
 #ifdef DEBUG_ITD
     kdDebug() << name() << " ITD called for relPoint=" << relPoint.x() << "," << relPoint.y() << endl;
 #endif
-    if ( !m_doc->tqlayoutViewMode()->hasFrames() ) { // text viewmode
+    if ( !m_doc->layoutViewMode()->hasFrames() ) { // text viewmode
         dPoint = relPoint;
         return m_frames.getFirst();
     }
@@ -1653,7 +1653,7 @@ KWFrame * KWTextFrameSet::internalToDocument( const KoPoint &relPoint, KoPoint &
 // same but with iPoint in LU
 KWFrame * KWTextFrameSet::internalToDocument( const TQPoint &iPoint, KoPoint &dPoint ) const
 {
-    KoPoint relPoint = m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
+    KoPoint relPoint = m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
     return internalToDocument( relPoint, dPoint );
 }
 
@@ -1676,13 +1676,13 @@ void KWTextFrameSet::printDebug()
 }
 #endif
 
-TQDomElement KWTextFrameSet::saveInternal( TQDomElement &tqparentElem, bool saveFrames, bool saveAnchorsFramesets )
+TQDomElement KWTextFrameSet::saveInternal( TQDomElement &parentElem, bool saveFrames, bool saveAnchorsFramesets )
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return TQDomElement();
 
-    TQDomElement framesetElem = tqparentElem.ownerDocument().createElement( "FRAMESET" );
-    tqparentElem.appendChild( framesetElem );
+    TQDomElement framesetElem = parentElem.ownerDocument().createElement( "FRAMESET" );
+    parentElem.appendChild( framesetElem );
 
     if ( m_groupmanager ) {
         framesetElem.setAttribute( "grpMgr", m_groupmanager->name() );
@@ -2010,7 +2010,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag *
                 // The Y position doesn't matter much, recalcFrames will reposition the frame
                 // But the point of this code is set the correct height for the frame.
                 double maxFooterSize = footerHeaderSizeMax( theFrame );
-                double diffPt = m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+                double diffPt = m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
                 wantedPosition = theFrame->top() - diffPt;
 #ifdef DEBUG_FORMAT_MORE
                 kdDebug() << "  diffPt=" << diffPt << " -> wantedPosition=" << wantedPosition << endl;
@@ -2038,7 +2038,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag *
             }
             // Other frames are resized by the bottom
 
-            wantedPosition = m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) ) + theFrame->bottom();
+            wantedPosition = m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) ) + theFrame->bottom();
             KWPage *page = m_doc->pageManager()->page( theFrame );
             double pageBottom;
             if(page)
@@ -2086,7 +2086,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag *
                       // The Y position doesn't matter much, recalcFrames will reposition the frame
                       // But the point of this code is set the correct height for the frame.
                       double maxFooterSize = footerHeaderSizeMax( theFrame );
-                      double diffPt = m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+                      double diffPt = m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
                       wantedPosition = theFrame->top() - diffPt;
                       if ( wantedPosition < 0 )
                       {
@@ -2183,7 +2183,7 @@ void KWTextFrameSet::slotAfterFormattingTooMuchSpace( int bottom )
 #endif
     if ( theFrame->frameSet()->isAFooter() || theFrame->frameSet()->isFootEndNote() )
     {
-        double wantedPosition = theFrame->top() + m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+        double wantedPosition = theFrame->top() + m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
         Q_ASSERT( wantedPosition < theFrame->bottom() );
         if ( wantedPosition != theFrame->top() )
         {
@@ -2199,7 +2199,7 @@ void KWTextFrameSet::slotAfterFormattingTooMuchSpace( int bottom )
     }
     else // header or other frame: resize bottom
     {
-        double wantedPosition = theFrame->bottom() - m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+        double wantedPosition = theFrame->bottom() - m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
 #ifdef DEBUG_FORMAT_MORE
         kdDebug() << "slotAfterFormatting wantedPosition=" << wantedPosition << " top+minheight=" << theFrame->top() + s_minFrameHeight << endl;
 #endif
@@ -2231,7 +2231,7 @@ void KWTextFrameSet::slotAfterFormattingTooMuchSpace( int bottom )
                     else if ( table->anchorFrameset()->isAFooter() ||  table->anchorFrameset()->isFootEndNote() )
                     {
                       theFrame = table->anchorFrameset()->frameIterator().getLast();
-                      double wantedPosition = theFrame->top() + m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+                      double wantedPosition = theFrame->top() + m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
                       Q_ASSERT( wantedPosition < theFrame->bottom() );
                       if ( wantedPosition != theFrame->top() )
                       {
@@ -2459,9 +2459,9 @@ double KWTextFrameSet::footerHeaderSizeMax( KWFrame *theFrame )
     return tmp;
 }
 
-void KWTextFrameSet::frameResized( KWFrame *theFrame, bool tqinvalidateLayout )
+void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout )
 {
-    kdDebug(32002) << "KWTextFrameSet::frameResized " << theFrame << " " << *theFrame << " tqinvalidateLayout=" << tqinvalidateLayout << endl;
+    kdDebug(32002) << "KWTextFrameSet::frameResized " << theFrame << " " << *theFrame << " invalidateLayout=" << invalidateLayout << endl;
     if ( theFrame->height() < 0 )
         return; // safety!
 
@@ -2486,7 +2486,7 @@ void KWTextFrameSet::frameResized( KWFrame *theFrame, bool tqinvalidateLayout )
     // m_doc->frameChanged( theFrame );
     // Warning, can't call tqlayout() (frameChanged calls it)
     // from here, since it calls formatMore() !
-    if ( tqinvalidateLayout )
+    if ( invalidateLayout )
         m_doc->tqinvalidate(this);
 
     // Can't tqrepaint directly, we might be in a paint event already
@@ -3361,9 +3361,9 @@ void KWTextFrameSetEdit::ensureCursorVisible()
     }
     TQPoint cursorPos = textFrameSet()->kWordDocument()->zoomPoint( pt );
     cursorPos = m_canvas->viewMode()->normalToView( cursorPos );
-    areaLeft = textFrameSet()->kWordDocument()->tqlayoutUnitToPixelX( areaLeft ) + 1;
-    areaRight = textFrameSet()->kWordDocument()->tqlayoutUnitToPixelX( areaRight ) + 1;
-    cursorHeight = textFrameSet()->kWordDocument()->tqlayoutUnitToPixelY( cursorHeight );
+    areaLeft = textFrameSet()->kWordDocument()->layoutUnitToPixelX( areaLeft ) + 1;
+    areaRight = textFrameSet()->kWordDocument()->layoutUnitToPixelX( areaRight ) + 1;
+    cursorHeight = textFrameSet()->kWordDocument()->layoutUnitToPixelY( cursorHeight );
     //kdDebug() << "KWTextFrameSetEdit::ensureCursorVisible pt=" << pt << " cursorPos=" << cursorPos
     //          << " areaLeft=" << areaLeft << " areaRight=" << areaRight << " y=" << y << endl;
     m_canvas->ensureVisible( cursorPos.x() - areaLeft, cursorPos.y() + cursorHeight / 2, areaLeft + areaRight, cursorHeight / 2 + 2 );
@@ -3653,7 +3653,7 @@ void KWTextFrameSetEdit::dropEvent( TQDropEvent * e, const TQPoint & nPoint, con
                 if ( cmd )
                     macroCmd->addCommand(cmd);
                 //retqlayout textframeset after a dnd otherwise autoextend
-                //frameset is not re-tqlayouted
+                //frameset is not re-layouted
                 textFrameSet()->tqlayout();
                 frameSet()->kWordDocument()->addCommand( macroCmd );
             }
diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h
index 3477bc3f..b8cdd3f9 100644
--- a/kword/KWTextFrameSet.h
+++ b/kword/KWTextFrameSet.h
@@ -155,11 +155,11 @@ public:
      */
     void updateViewArea( TQWidget * w, KWViewMode* viewMode, const TQPoint & nPointBottom );
 
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true )
-    { return saveInternal( tqparentElem, saveFrames, false ); }
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true )
+    { return saveInternal( parentElem, saveFrames, false ); }
     /** save to XML - when copying to clipboard (includes floating framesets) */
-    virtual TQDomElement toXML( TQDomElement &tqparentElem, bool saveFrames = true )
-    { return saveInternal( tqparentElem, saveFrames, true ); }
+    virtual TQDomElement toXML( TQDomElement &parentElem, bool saveFrames = true )
+    { return saveInternal( parentElem, saveFrames, true ); }
 
     virtual void load( TQDomElement &attributes, bool loadFrames = true );
     /// Load the contents of a frame (i.e. the text)
@@ -353,7 +353,7 @@ private:
     void getMargins( int yp, int h, int reqMinWidth, int* marginLeft, int* marginRight, int* pageWidth, int* validHeight,
                      int* breakBegin, int* breakEnd, KoTextParag* parag );
     bool checkVerticalBreak( int & yp, int & h, KoTextParag * parag, bool linesTogether, int breakBegin, int breakEnd );
-    void frameResized( KWFrame *theFrame, bool tqinvalidateLayout );
+    void frameResized( KWFrame *theFrame, bool invalidateLayout );
     /**
      * Return the list of frames containing the text that goes from @p y1 to @p y2
      * (in internal coordinates).
@@ -361,7 +361,7 @@ private:
     TQValueList<KWFrame*> framesFromTo( int y1, int y2 ) const;
     double footerHeaderSizeMax( KWFrame *theFrame );
     double footNoteSize( KWFrame *theFrame );
-    TQDomElement saveInternal( TQDomElement &tqparentElem, bool saveFrames, bool saveAnchorsFramesets );
+    TQDomElement saveInternal( TQDomElement &parentElem, bool saveFrames, bool saveAnchorsFramesets );
     bool createNewPageAndNewFrame( KoTextParag* lastFormatted, int difference );
 
 private:
diff --git a/kword/KWTextImage.cpp b/kword/KWTextImage.cpp
index 0a036d87..981ce1cb 100644
--- a/kword/KWTextImage.cpp
+++ b/kword/KWTextImage.cpp
@@ -95,35 +95,35 @@ void KWTextImage::drawCustomItem( TQPainter* p, int x, int y, int wpix, int hpix
     }
 }
 
-void KWTextImage::save( TQDomElement & tqparentElem )
+void KWTextImage::save( TQDomElement & parentElem )
 {
     // This code is similar to KWPictureFrameSet::save
     KWDocument * doc = static_cast<KWTextDocument *>(tqparent)->textFrameSet()->kWordDocument();
 
-    TQDomElement imageElem = tqparentElem.ownerDocument().createElement( "PICTURE" );
-    tqparentElem.appendChild( imageElem );
+    TQDomElement imageElem = parentElem.ownerDocument().createElement( "PICTURE" );
+    parentElem.appendChild( imageElem );
     //imageElem.setAttribute( "keepAspectRatio", "true" );
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "KEY" );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "KEY" );
     imageElem.appendChild( elem );
     image().getKey().saveAttributes( elem );
     // Now we must take care that a <KEY> element will be written as a child of <PICTURES>
     doc->addTextImageRequest( this );
 }
 
-void KWTextImage::load( TQDomElement & tqparentElem )
+void KWTextImage::load( TQDomElement & parentElem )
 {
     // This code is similar to KWPictureFrameSet::load
     KWDocument * doc = static_cast<KWTextDocument *>(tqparent)->textFrameSet()->kWordDocument();
 
     // <IMAGE> (KOffice 1.0) or <PICTURE> (KWord 1.2)
-    TQDomNode node=tqparentElem.namedItem( "PICTURE" );
+    TQDomNode node=parentElem.namedItem( "PICTURE" );
     if ( node.isNull() )
     {
-        node=tqparentElem.namedItem( "IMAGE" );
+        node=parentElem.namedItem( "IMAGE" );
     }
     TQDomElement image = node.toElement();
     if ( image.isNull() )
-        image = tqparentElem; // The data is directly child of <FORMAT>
+        image = parentElem; // The data is directly child of <FORMAT>
     // <KEY>
     TQDomElement keyElement = image.namedItem( "KEY" ).toElement();
     if ( !keyElement.isNull() )
diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp
index f715298d..d50e98a0 100644
--- a/kword/KWTextParag.cpp
+++ b/kword/KWTextParag.cpp
@@ -82,15 +82,15 @@ void KWTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
             //cg2.setColor( TQColorGroup::Base, TQt::green ); // for debug
             int last = length() - 1;
             KoTextStringChar &ch = string()->at( last );
-            int x = zh->tqlayoutUnitToPixelX( ch.x );// + ch.pixelxadj;
+            int x = zh->layoutUnitToPixelX( ch.x );// + ch.pixelxadj;
 
             KoTextFormat format( *lastFormat );
             format.setColor( pen.color() ); // ### A bit slow, maybe pass the color to drawParagStringInternal ?
             KoTextParag::drawParagStringInternal(
                 painter, str, 0, str.length(),
                 x, lastY_pix, // startX and lastY
-                zh->tqlayoutUnitToPixelY( ch.ascent() ), // baseline
-                width, zh->tqlayoutUnitToPixelY( ch.height() ), // bw and h
+                zh->layoutUnitToPixelY( ch.ascent() ), // baseline
+                width, zh->layoutUnitToPixelY( ch.height() ), // bw and h
                 drawSelections, &format, selectionStarts,
                 selectionEnds, cg2, rightToLeft, line, zh, false );
         // Clear 'paint end of line' flag, we don't want it overwriting the above
@@ -280,20 +280,20 @@ TQDomElement KWTextParag::saveFormat( TQDomDocument & doc, KoTextFormat * curFor
     return formatElem;
 }
 
-void KWTextParag::save( TQDomElement &tqparentElem, bool saveAnchorsFramesets )
+void KWTextParag::save( TQDomElement &parentElem, bool saveAnchorsFramesets )
 {
     // The TQMAX below ensures that although we don't save the trailing space
     // in the normal case, we do save it for empty paragraphs (#30336)
-    save( tqparentElem, 0, TQMAX( 0, length()-2 ), saveAnchorsFramesets );
+    save( parentElem, 0, TQMAX( 0, length()-2 ), saveAnchorsFramesets );
 }
 
-void KWTextParag::save( TQDomElement &tqparentElem, int from /* default 0 */,
+void KWTextParag::save( TQDomElement &parentElem, int from /* default 0 */,
                         int to /* default length()-2 */,
                         bool saveAnchorsFramesets /* default false */ )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement paragElem = doc.createElement( "PARAGRAPH" );
-    tqparentElem.appendChild( paragElem );
+    parentElem.appendChild( paragElem );
     TQDomElement textElem = doc.createElement( "TEXT" );
     textElem.setAttribute("xml:space", "preserve");
     paragElem.appendChild( textElem );
@@ -382,18 +382,18 @@ void KWTextParag::save( TQDomElement &tqparentElem, int from /* default 0 */,
         paragElem.appendChild( formatsElem );
 
 
-    TQDomElement tqlayoutElem = doc.createElement( "LAYOUT" );
-    paragElem.appendChild( tqlayoutElem );
+    TQDomElement layoutElem = doc.createElement( "LAYOUT" );
+    paragElem.appendChild( layoutElem );
 
     // save with the real tqalignment (left or right, not auto)
-    m_layout.saveParagLayout( tqlayoutElem, resolveAlignment() );
+    m_layout.saveParagLayout( layoutElem, resolveAlignment() );
 
     // Paragraph's format
     // ## Maybe we should have a "default format" somewhere and
     // pass it instead of 0L, to only save the non-default attributes
     // But this would break all export filters again.
     TQDomElement paragFormatElement = saveFormat( doc, paragraphFormat(), 0L, 0, to - from + 1 );
-    tqlayoutElem.appendChild( paragFormatElement );
+    layoutElem.appendChild( paragFormatElement );
 }
 
 //static
@@ -751,7 +751,7 @@ void KWTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int
 //////////
 
 // Create a KoParagLayout from XML.
-KoParagLayout KWTextParag::loadParagLayout( TQDomElement & tqparentElem, KWDocument *doc, bool findStyle )
+KoParagLayout KWTextParag::loadParagLayout( TQDomElement & parentElem, KWDocument *doc, bool findStyle )
 {
     KoParagLayout tqlayout;
 
@@ -761,7 +761,7 @@ KoParagLayout KWTextParag::loadParagLayout( TQDomElement & tqparentElem, KWDocum
         KoParagStyle *style;
         // Name of the style. If there is no style, then we do not supply
         // any default!
-        TQDomElement element = tqparentElem.namedItem( "NAME" ).toElement();
+        TQDomElement element = parentElem.namedItem( "NAME" ).toElement();
         if ( !element.isNull() )
         {
             TQString styleName = element.attribute( "value" );
@@ -782,7 +782,7 @@ KoParagLayout KWTextParag::loadParagLayout( TQDomElement & tqparentElem, KWDocum
         tqlayout.style = style;
     }
 
-    KoParagLayout::loadParagLayout( tqlayout, tqparentElem, doc->syntaxVersion() );
+    KoParagLayout::loadParagLayout( tqlayout, parentElem, doc->syntaxVersion() );
 
     return tqlayout;
 }
diff --git a/kword/KWTextParag.h b/kword/KWTextParag.h
index db873c24..b0a9d044 100644
--- a/kword/KWTextParag.h
+++ b/kword/KWTextParag.h
@@ -62,10 +62,10 @@ public:
 
 
     /** Save (to KWord-1.3 XML) the whole paragraph */
-    void save( TQDomElement &tqparentElem, bool saveAnchorsFramesets = false );
+    void save( TQDomElement &parentElem, bool saveAnchorsFramesets = false );
 
     /** Save (to KWord-1.3 XML) a portion of the paragraph */
-    void save( TQDomElement &tqparentElem, int from, int to, bool saveAnchorsFramesets = false );
+    void save( TQDomElement &parentElem, int from, int to, bool saveAnchorsFramesets = false );
 
     /** Load (from KWord-1.3 XML) the paragraph */
     void load( TQDomElement &attributes );
@@ -77,7 +77,7 @@ public:
     void loadLayout( TQDomElement & attributes );
 
     /** Load (from KWord-1.3 XML), optionally using styles from document. */
-    static KoParagLayout loadParagLayout( TQDomElement & tqparentElem, KWDocument *doc, bool useRefStyle );
+    static KoParagLayout loadParagLayout( TQDomElement & parentElem, KWDocument *doc, bool useRefStyle );
 
     virtual void loadOasis( const TQDomElement& e, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context,
diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp
index 1b463878..45fa37cd 100644
--- a/kword/KWVariable.cpp
+++ b/kword/KWVariable.cpp
@@ -92,15 +92,15 @@ void KWVariableSettings::loadNoteConfiguration( const TQDomElement& tqparent )
     }
 }
 
-void KWVariableSettings::save( TQDomElement &tqparentElem )
+void KWVariableSettings::save( TQDomElement &parentElem )
 {
-    KoVariableSettings::save( tqparentElem );
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    KoVariableSettings::save( parentElem );
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement footNoteSettingElem = doc.createElement( "FOOTNOTESETTING" );
-    tqparentElem.appendChild( footNoteSettingElem );
+    parentElem.appendChild( footNoteSettingElem );
     m_footNoteCounter.save( footNoteSettingElem );
     TQDomElement endNoteSettingElem = doc.createElement( "ENDNOTESETTING" );
-    tqparentElem.appendChild( endNoteSettingElem );
+    parentElem.appendChild( endNoteSettingElem );
     m_endNoteCounter.save( endNoteSettingElem );
 }
 
@@ -197,7 +197,7 @@ KWPgNumVariable::KWPgNumVariable( KoTextDocument *textdoc, int subtype, KoVariab
 
 void KWPgNumVariable::recalc()
 {
-    if ( !m_doc->tqlayoutViewMode()->hasPages() ) // ModeText
+    if ( !m_doc->layoutViewMode()->hasPages() ) // ModeText
     {
         //necessary to resize it in this mode because in this mode
         //we don't call KWTextFrameSet::drawFrame()
@@ -221,7 +221,7 @@ TQString KWPgNumVariable::text(bool realValue)
     if (m_varColl->variableSetting()->displayFieldCode()&& !realValue)
         return fieldCode();
     // #### ??? What?
-    else if ( m_subtype !=  VST_CURRENT_SECTION && !m_doc->tqlayoutViewMode()->hasPages() && !realValue)
+    else if ( m_subtype !=  VST_CURRENT_SECTION && !m_doc->layoutViewMode()->hasPages() && !realValue)
         return fieldCode();
     else
         return m_varFormat->convert( m_varValue );
@@ -367,10 +367,10 @@ void KWFootNoteVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& contex
     writer.endElement();
 }
 
-void KWFootNoteVariable::saveVariable( TQDomElement &tqparentElem )
+void KWFootNoteVariable::saveVariable( TQDomElement &parentElem )
 {
-    TQDomElement footnoteElem = tqparentElem.ownerDocument().createElement( "FOOTNOTE" );
-    tqparentElem.appendChild( footnoteElem );
+    TQDomElement footnoteElem = parentElem.ownerDocument().createElement( "FOOTNOTE" );
+    parentElem.appendChild( footnoteElem );
     //footnoteElem.setAttribute( "subtype", 0 );
     if ( m_numberingType == Auto )
         footnoteElem.setAttribute( "value", m_numDisplay );
@@ -500,7 +500,7 @@ void KWFootNoteVariable::drawCustomItem( TQPainter* p, int x, int y, int wpix, i
     int offset = _offset;
     if ( offset == 0 )
     {
-        int h = zh->tqlayoutUnitToPixelY( /*_y HACK,*/ height );
+        int h = zh->layoutUnitToPixelY( /*_y HACK,*/ height );
         offset = -( h - TQFontMetrics(font).height() );
     }
 
@@ -619,7 +619,7 @@ double KWFootNoteVariable::varY() const
         kdDebug(32001) << "KWFootNoteVariable::varY too early, no updateFrames yet" << endl;
         return 0; // this happens on loading - frame tqlayout is done before text tqlayout
     }
-    // What we need is "has never been formatted". Not "has just been tqinvalidated"...
+    // What we need is "has never been formatted". Not "has just been invalidated"...
     //if ( !paragraph()->isValid() )
     //{
     //    kdDebug(32001) << "KWFootNoteVariable::varY called but paragraph " << paragraph()->paragId() << " not valid" << endl;
diff --git a/kword/KWVariable.h b/kword/KWVariable.h
index 005ca434..e0445957 100644
--- a/kword/KWVariable.h
+++ b/kword/KWVariable.h
@@ -44,7 +44,7 @@ class KWVariableSettings : public KoVariableSettings
  public:
     KWVariableSettings();
     virtual ~KWVariableSettings() {}
-    virtual void save( TQDomElement &tqparentElem );
+    virtual void save( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     void saveNoteConfiguration( KoXmlWriter& writer ) const;
     void loadNoteConfiguration( const TQDomElement& tqparent );
@@ -126,7 +126,7 @@ public:
     KWFootNoteFrameSet * frameSet() const { return m_frameset; }
     void setFrameSet( KWFootNoteFrameSet* fs ) { Q_ASSERT( !m_frameset ); m_frameset = fs; }
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
 
     virtual void loadOasis( const TQDomElement &footNoteTag, KoOasisContext& context );
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 2651e6ad..92181228 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -1420,7 +1420,7 @@ void KWView::updateGridButton()
     m_actionViewSnapToGrid->setChecked ( m_doc->snapToGrid() );
 }
 
-void KWView::loadexpressionActions( KActionMenu * tqparentMenu)
+void KWView::loadexpressionActions( KActionMenu * parentMenu)
 {
     KActionPtrList lst = actionCollection()->actions("expression-action");
     TQValueList<KAction *> actions = lst;
@@ -1434,7 +1434,7 @@ void KWView::loadexpressionActions( KActionMenu * tqparentMenu)
         delete *it;
     }
 
-    tqparentMenu->popupMenu()->clear();
+    parentMenu->popupMenu()->clear();
     TQStringList path = m_doc->personalExpressionPath();
     TQStringList files;
     for ( TQStringList::Iterator it = path.begin(); it != path.end(); ++it )
@@ -1452,10 +1452,10 @@ void KWView::loadexpressionActions( KActionMenu * tqparentMenu)
     int i = 0;
     int nbFile = 0;
     for( TQStringList::Iterator it = files.begin(); it != files.end(); ++it,nbFile++ )
-        createExpressionActions( tqparentMenu,*it, i,(nbFile<(int)files.count()-1), personalShortCuts );
+        createExpressionActions( parentMenu,*it, i,(nbFile<(int)files.count()-1), personalShortCuts );
 }
 
-void KWView::createExpressionActions( KActionMenu * tqparentMenu,const TQString& filename,int &i, bool insertSepar, const TQMap<TQString, KShortcut>& personalShortCut )
+void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& filename,int &i, bool insertSepar, const TQMap<TQString, KShortcut>& personalShortCut )
 {
     TQFile file( filename );
     if ( !file.exists() || !file.open( IO_ReadOnly ) )
@@ -1477,7 +1477,7 @@ void KWView::createExpressionActions( KActionMenu * tqparentMenu,const TQString&
                 expressionExist =true;
                 TQString group = i18n( e.namedItem( "TypeName" ).toElement().text().utf8() );
                 KActionMenu * subMenu = new KActionMenu( group, actionCollection() );
-                tqparentMenu->insert( subMenu );
+                parentMenu->insert( subMenu );
 
                 TQDomNode n2 = e.firstChild();
                 for( ; !n2.isNull(); n2 = n2.nextSibling() )
@@ -1504,7 +1504,7 @@ void KWView::createExpressionActions( KActionMenu * tqparentMenu,const TQString&
         }
     }
     if(expressionExist && insertSepar)
-        tqparentMenu->popupMenu()->insertSeparator();
+        parentMenu->popupMenu()->insertSeparator();
 }
 
 void KWView::insertExpression()
@@ -1519,15 +1519,15 @@ void KWView::insertExpression()
 
 
 void KWView::addVariableActions( int type, const TQStringList & texts,
-                                 KActionMenu * tqparentMenu, const TQString & menuText )
+                                 KActionMenu * parentMenu, const TQString & menuText )
 {
-    // Single items go directly into tqparentMenu.
+    // Single items go directly into parentMenu.
     // For multiple items we create a submenu.
     if ( texts.count() > 1 && !menuText.isEmpty() )
     {
         KActionMenu * subMenu = new KActionMenu( menuText, actionCollection() );
-        tqparentMenu->insert( subMenu );
-        tqparentMenu = subMenu;
+        parentMenu->insert( subMenu );
+        parentMenu = subMenu;
     }
     TQStringList::ConstIterator it = texts.begin();
     for ( int i = 0; it != texts.end() ; ++it, ++i )
@@ -1544,7 +1544,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts,
             // Mainly for KEditToolbar
             act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).tqarg( *it ) );
             m_variableDefMap.insert( act, v );
-            tqparentMenu->insert( act );
+            parentMenu->insert( act );
         }
     }
 }
@@ -6203,7 +6203,7 @@ void KWView::inlineFrame()
     if( !frame)
         return;
     KWFrameSet * fs = frame->frameSet();
-    KWFrameSet * tqparentFs = fs->groupmanager() ? fs->groupmanager() : fs;
+    KWFrameSet * parentFs = fs->groupmanager() ? fs->groupmanager() : fs;
 
     if(m_actionInlineFrame->isChecked())
     {
@@ -6214,7 +6214,7 @@ void KWView::inlineFrame()
 
         KoPoint initialPos = frame->topLeft();
         // turn non-floating frame into floating frame
-        KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Inline"), tqparentFs, true );
+        KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Inline"), parentFs, true );
         cmd->execute();
 
         frameindexList.append( FrameIndex( frame ) );
@@ -6228,7 +6228,7 @@ void KWView::inlineFrame()
     }
     else
     {
-        KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Non-Inline"), tqparentFs, false );
+        KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Non-Inline"), parentFs, false );
         m_doc->addCommand(cmd);
         cmd->execute();
     }
diff --git a/kword/KWView.h b/kword/KWView.h
index 7f84334f..58134978 100644
--- a/kword/KWView.h
+++ b/kword/KWView.h
@@ -497,11 +497,11 @@ protected slots:
 
 protected:
     void addVariableActions( int type, const TQStringList & texts,
-                             KActionMenu * tqparentMenu, const TQString & menuText );
+                             KActionMenu * parentMenu, const TQString & menuText );
 
-    void loadexpressionActions( KActionMenu * tqparentMenu);
+    void loadexpressionActions( KActionMenu * parentMenu);
 
-    void createExpressionActions( KActionMenu * tqparentMenu,const TQString& filename,int &i , bool insertSepar, const TQMap<TQString, KShortcut>& personalShortCut );
+    void createExpressionActions( KActionMenu * parentMenu,const TQString& filename,int &i , bool insertSepar, const TQMap<TQString, KShortcut>& personalShortCut );
 
     void showParagraphDialog( int initialPage = -1, double initialTabPos = 0.0 );
 
diff --git a/kword/KWViewMode.cpp b/kword/KWViewMode.cpp
index 02130dc0..c1c6f16e 100644
--- a/kword/KWViewMode.cpp
+++ b/kword/KWViewMode.cpp
@@ -508,10 +508,10 @@ TQSize KWViewModeText::contentsSize()
     // The width is the one from the text, so that the placement of tabs makes a bit of sense, etc.
     // The minimum height is the one of a normal page though.
 
-    int width = m_doc->tqlayoutUnitToPixelX( m_textFrameSet->textDocument()->width() );
+    int width = m_doc->layoutUnitToPixelX( m_textFrameSet->textDocument()->width() );
 
     int height = TQMAX((int)m_doc->paperHeight(m_doc->startPage()),
-                      m_doc->tqlayoutUnitToPixelY( m_textFrameSet->textDocument()->height() ) );
+                      m_doc->layoutUnitToPixelY( m_textFrameSet->textDocument()->height() ) );
     //kdDebug() << "KWViewModeText::contentsSize " << width << "x" << height << endl;
     return TQSize( width, height );
 }
@@ -526,10 +526,10 @@ bool KWViewModeText::isFrameSetVisible( const KWFrameSet *fs )
     if(fs==NULL) return false; // assertion
     if(fs==textFrameSet()) return true;
 
-    const KWFrameSet* tqparentFrameset = fs->groupmanager() ? fs->groupmanager() : fs;
-    while ( tqparentFrameset->isFloating() ) {
-        tqparentFrameset = tqparentFrameset->anchorFrameset();
-        if ( tqparentFrameset == m_textFrameSet )
+    const KWFrameSet* parentFrameset = fs->groupmanager() ? fs->groupmanager() : fs;
+    while ( parentFrameset->isFloating() ) {
+        parentFrameset = parentFrameset->anchorFrameset();
+        if ( parentFrameset == m_textFrameSet )
             return true;
     }
     return false;
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index d539f692..af23925e 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -139,18 +139,18 @@ void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent
 	}
 }
 
-void KWClassicSerialDataSource::load( TQDomElement& tqparentElem )
+void KWClassicSerialDataSource::load( TQDomElement& parentElem )
 {
 	db.clear();
 	sampleRecord.clear();
-	TQDomNode defNd=tqparentElem.namedItem("DEFINITION");
+	TQDomNode defNd=parentElem.namedItem("DEFINITION");
 	if (defNd.isNull()) return;
 	TQDomElement def=defNd.toElement();
 	for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	{
 		sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=i18n( "No Value" );
 	}
-	TQDomNode contNd=tqparentElem.namedItem("CONTENT");
+	TQDomNode contNd=parentElem.namedItem("CONTENT");
 	if (contNd.isNull()) return;
 	for (TQDomNode rec=contNd.firstChild();!rec.isNull();rec=rec.nextSibling())
 	{
@@ -255,7 +255,7 @@ KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *tqparent,
     currentRecord = -1;
 }
 
-void KWClassicMailMergeEditorList::tqinvalidateCurrentRecord()
+void KWClassicMailMergeEditorList::invalidateCurrentRecord()
 {
 	currentRecord=-1;
 }
@@ -537,7 +537,7 @@ void KWClassicMailMergeEditor::removeRecord()
         return;
 
     db->removeRecord( records->value() - 1 );
-    dbList->tqinvalidateCurrentRecord();
+    dbList->invalidateCurrentRecord();
     if ( db->getNumRecords() > 0 ) {
         records->setRange( records->minValue(), records->maxValue() - 1 );
         records->setValue( 1 );
diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h
index 713f41d8..43416b07 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.h
+++ b/kword/mailmerge/KWClassicSerialDataSource.h
@@ -110,7 +110,7 @@ public:
     KWClassicMailMergeEditorList( TQWidget *tqparent, KWClassicSerialDataSource *db_ );
     virtual ~KWClassicMailMergeEditorList();
 
-    void tqinvalidateCurrentRecord();
+    void invalidateCurrentRecord();
     void updateItems();
     void displayRecord( int i );
 
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index aeadae4c..855611f5 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -396,10 +396,10 @@ TQStringList KWMailMergeKABC::lists() const
 }
 
 
-void KWMailMergeKABC::load( TQDomElement& tqparentElem )
+void KWMailMergeKABC::load( TQDomElement& parentElem )
 {
     clear();
-    TQDomNode contentNode=tqparentElem.namedItem("CONTENT");
+    TQDomNode contentNode=parentElem.namedItem("CONTENT");
     if( contentNode.isNull() )
         return;
     for( TQDomNode rec=contentNode.firstChild(); !rec.isNull(); rec=rec.nextSibling() )
diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui
index 40521704..c7276c9b 100644
--- a/kword/mailmerge/kabc/addresspicker.ui
+++ b/kword/mailmerge/kabc/addresspicker.ui
@@ -287,7 +287,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 518699a8..e48fbf34 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -56,9 +56,9 @@ TQString KWMailMergeKSpread::getValue( const TQString &name, int record ) const
     return i18n( "Unkown mail merge variable: %1" ).tqarg( name );
 }
 
-void KWMailMergeKSpread::load( TQDomElement& tqparentElem )
+void KWMailMergeKSpread::load( TQDomElement& parentElem )
 {
-  TQDomNode contentNode = tqparentElem.namedItem( "CONTENT" );
+  TQDomNode contentNode = parentElem.namedItem( "CONTENT" );
   if ( contentNode.isNull() )
     return;
 
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index 8020b0aa..f3129420 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -111,10 +111,10 @@ void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqpar
         }
 }
 
-void KWQtSqlPowerSerialDataSource::load( TQDomElement& tqparentElem )
+void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem )
 {
         clearSampleRecord();
-        TQDomNode defNd=tqparentElem.namedItem("DEFINITION");
+        TQDomNode defNd=parentElem.namedItem("DEFINITION");
         if (!defNd.isNull())
 	{
 	        TQDomElement def=defNd.toElement();
@@ -138,7 +138,7 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& tqparentElem )
 		}
         }
 
-        defNd=tqparentElem.namedItem("SAMPLERECORD");
+        defNd=parentElem.namedItem("SAMPLERECORD");
         if (!defNd.isNull())
 	{
 		TQDomElement def1=defNd.toElement();
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 4083c1e1..47ce94cf 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -91,19 +91,19 @@ void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*tq
 */
 }
 
-void KWQtSqlSerialDataSource::load( TQDomElement& /*tqparentElem*/ )
+void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ )
 {
 /*
 	db.clear();
 	sampleRecord.clear();
-	TQDomNode defNd=tqparentElem.namedItem("DEFINITION");
+	TQDomNode defNd=parentElem.namedItem("DEFINITION");
 	if (defNd.isNull()) return;
 	TQDomElement def=defNd.toElement();
 	for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	{
 		sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=defEnt.attribute(TQString::tqfromLatin1("name"));//i18n( "No Value" );
 	}
-	TQDomNode contNd=tqparentElem.namedItem("CONTENT");
+	TQDomNode contNd=parentElem.namedItem("CONTENT");
 	if (contNd.isNull()) return;
 	for (TQDomNode rec=contNd.firstChild();!rec.isNull();rec=rec.nextSibling())
 	{
diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui
index bd579f81..a68b62db 100644
--- a/kword/mailmerge/sql/kwqtsqlpower.ui
+++ b/kword/mailmerge/sql/kwqtsqlpower.ui
@@ -229,5 +229,5 @@
     <include location="global" impldecl="in declaration">klistbox.h</include>
     <include location="global" impldecl="in declaration">kpushbutton.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kword/mailmerge/sql/qtsqldatasourceeditor.ui b/kword/mailmerge/sql/qtsqldatasourceeditor.ui
index a22ae687..24d32b79 100644
--- a/kword/mailmerge/sql/qtsqldatasourceeditor.ui
+++ b/kword/mailmerge/sql/qtsqldatasourceeditor.ui
@@ -154,5 +154,5 @@
 <Q_SLOTS>
     <slot>filterCheckBox_toggled( bool fcb_state )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kword/mailmerge/sql/qtsqlopenwidget.ui b/kword/mailmerge/sql/qtsqlopenwidget.ui
index 80c190b3..fc32bded 100644
--- a/kword/mailmerge/sql/qtsqlopenwidget.ui
+++ b/kword/mailmerge/sql/qtsqlopenwidget.ui
@@ -297,5 +297,5 @@
     <include location="global" impldecl="in declaration">kcombobox.h</include>
     <include location="global" impldecl="in declaration">kpushbutton.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>