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/kdewebdev@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

138 files changed, 595 insertions, 595 deletions

diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui
index cc7f94f3..d1fe0993 100644
--- a/quanta/components/csseditor/csseditors.ui
+++ b/quanta/components/csseditor/csseditors.ui
@@ -404,7 +404,7 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui
index 09356a70..dd899b1b 100644
--- a/quanta/components/csseditor/cssselectors.ui
+++ b/quanta/components/csseditor/cssselectors.ui
@@ -975,7 +975,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/quanta/components/csseditor/encodingselectors.ui b/quanta/components/csseditor/encodingselectors.ui
index 532cc137..6ac64343 100644
--- a/quanta/components/csseditor/encodingselectors.ui
+++ b/quanta/components/csseditor/encodingselectors.ui
@@ -111,5 +111,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui
index 11d3bfe8..86a109d9 100644
--- a/quanta/components/csseditor/fontfamilychoosers.ui
+++ b/quanta/components/csseditor/fontfamilychoosers.ui
@@ -429,7 +429,7 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp
index 7374ce9a..06e7600a 100644
--- a/quanta/components/csseditor/stylesheetparser.cpp
+++ b/quanta/components/csseditor/stylesheetparser.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 
 static const TQString msg1(i18n("has not been closed")),
-                     msg2(i18n("needs an opening tqparenthesis "));
+                     msg2(i18n("needs an opening parenthesis "));
 
 stylesheetParser::stylesheetParser(const TQString& s){ 
   m_styleSheet = s;
@@ -87,7 +87,7 @@ void stylesheetParser::parseComment(){
     }
 }
 
-unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b){
+unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b){
   TQChar searchFor = '{';
   if (p == closed)
     searchFor = '}';
diff --git a/quanta/components/csseditor/stylesheetparser.h b/quanta/components/csseditor/stylesheetparser.h
index 9fc0716d..9da028fb 100644
--- a/quanta/components/csseditor/stylesheetparser.h
+++ b/quanta/components/csseditor/stylesheetparser.h
@@ -31,7 +31,7 @@ class stylesheetParser : public TQObject{
   TQ_OBJECT
   private:
     
-    enum tqparenthesisKind { opened, closed };
+    enum parenthesisKind { opened, closed };
     TQString m_styleSheet;
     bool m_stopProcessing;
     unsigned int m_orderNumber;
@@ -41,7 +41,7 @@ class stylesheetParser : public TQObject{
     void parseAtRules1();
     void parseAtRules2();
     int whiteSpaces(int);
-    unsigned int numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b);
+    unsigned int numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b);
     
   public:
     stylesheetParser(const TQString& s);
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index a2ce167e..3eb19d7a 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -143,7 +143,7 @@
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistbox.h</includehint>
 </includehints>
diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui
index d5e116a4..4b85c5d2 100644
--- a/quanta/components/cvsservice/cvsupdatetodlgs.ui
+++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui
@@ -194,5 +194,5 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui
index 9c397431..dd94f4ae 100644
--- a/quanta/components/debugger/conditionalbreakpointdialogs.ui
+++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui
@@ -320,7 +320,7 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui
index 98da70f1..b8ab40bd 100644
--- a/quanta/components/debugger/dbgp/dbgpsettingss.ui
+++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui
@@ -721,7 +721,7 @@
     <slot>checkLocalProject_toggled(bool)</slot>
     <slot>slotLocalProjectToggle(bool)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextbrowser.h</includehint>
 </includehints>
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index ba1c7c44..ac3793bd 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -705,7 +705,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("localproject").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("localproject");
     node.appendChild( el );
     if(set.checkLocalProject->isChecked())
@@ -725,7 +725,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("localbasedir").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("localbasedir");
     node.appendChild( el );
     el.appendChild( node.ownerDocument().createTextNode(m_localBasedir) );
@@ -734,7 +734,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("serverbasedir").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("serverbasedir");
     node.appendChild( el );
     if(debuggerInterface())
@@ -743,7 +743,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("listenport").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("listenport");
     node.appendChild( el );
     m_listenPort = set.lineServerListenPort->text();
@@ -751,7 +751,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("startsession").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("startsession");
     node.appendChild( el );
     m_startsession = set.lineStartSession->text();
@@ -759,7 +759,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("defaultexecutionstate").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("defaultexecutionstate");
     node.appendChild( el );
     if(set.comboDefaultExecutionState->currentItem() == 0)
@@ -776,7 +776,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("errortqmask").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("errortqmask");
     node.appendChild( el );
     m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0)
@@ -790,7 +790,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
     // Profiler
     el = node.namedItem("profilerfilename").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("profilerfilename");
     node.appendChild( el );
     m_profilerFilename = set.lineProfilerFilename->text();
@@ -798,7 +798,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("profilerfilename_map").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("profilerfilename_map");
     node.appendChild( el );
     m_profilerMapFilename = (set.checkProfilerMapFilename->isChecked() ? true : false);
@@ -806,7 +806,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("profiler_autoopen").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("profiler_autoopen");
     node.appendChild( el );
     m_profilerAutoOpen = (set.checkProfilerAutoOpen->isChecked() ? true : false);
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index 0810cd91..1380c26a 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -781,7 +781,7 @@ void DebuggerManager::saveProperties( )
       // (Re)create breakpoints section
       TQDomNode nodeBreakpoints = nodeDbg.namedItem("breakpoints");
       if(!nodeBreakpoints.isNull())
-        nodeBreakpoints.tqparentNode().removeChild(nodeBreakpoints);
+        nodeBreakpoints.parentNode().removeChild(nodeBreakpoints);
       
       if(m_breakpointList->count() > 0)
       {
@@ -818,7 +818,7 @@ void DebuggerManager::saveProperties( )
       // (Re)create watches section
       TQDomNode nodeWatches = nodeDbg.namedItem("watches");
       if(!nodeWatches.isNull())
-        nodeWatches.tqparentNode().removeChild(nodeWatches);
+        nodeWatches.parentNode().removeChild(nodeWatches);
       
       if(m_debuggerui->watches()->first())
       {
diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui
index 76689e57..09a3873c 100644
--- a/quanta/components/debugger/debuggervariablesets.ui
+++ b/quanta/components/debugger/debuggervariablesets.ui
@@ -181,5 +181,5 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui
index 7697a337..ccca567c 100644
--- a/quanta/components/debugger/gubed/gubedsettingss.ui
+++ b/quanta/components/debugger/gubed/gubedsettingss.ui
@@ -755,7 +755,7 @@
 <Q_SLOTS>
     <slot specifier="pure virtual">slotUseProxyToggle( bool )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextbrowser.h</includehint>
 </includehints>
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index 58f949a1..e14ca894 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -878,7 +878,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("serverhost").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("serverhost");
     node.appendChild( el );
     m_serverHost = set.lineServerHost->text();
@@ -886,7 +886,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("serverport").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("serverport");
     node.appendChild( el );
     m_serverPort = set.lineServerPort->text();
@@ -894,7 +894,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("localbasedir").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("localbasedir");
     node.appendChild( el );
     m_localBasedir = set.lineLocalBasedir->text();
@@ -904,7 +904,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("serverbasedir").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("serverbasedir");
     node.appendChild( el );
     m_serverBasedir = set.lineServerBasedir->text();
@@ -914,7 +914,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("useproxy").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("useproxy");
     node.appendChild( el );
     m_useproxy = set.checkUseProxy->isChecked();
@@ -922,7 +922,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("listenport").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("listenport");
     node.appendChild( el );
     m_listenPort = set.lineServerListenPort->text();
@@ -930,7 +930,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("startsession").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("startsession");
     node.appendChild( el );
     m_startsession = set.lineStartSession->text();
@@ -938,7 +938,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("defaultexecutionstate").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("defaultexecutionstate");
     node.appendChild( el );
     m_defaultExecutionState = (State)set.comboDefaultExecutionState->currentItem();
@@ -947,7 +947,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("displaydelay").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("displaydelay");
     node.appendChild( el );
     m_displaydelay = set.sliderDisplayDelay->value();
@@ -955,7 +955,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("errortqmask").toElement();
     if (!el.isNull())
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     el = node.ownerDocument().createElement("errortqmask");
     node.appendChild( el );
     m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0)
diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui
index 933d003a..c0f27c04 100644
--- a/quanta/components/debugger/pathmapperdialogs.ui
+++ b/quanta/components/debugger/pathmapperdialogs.ui
@@ -338,7 +338,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
 <Q_SLOTS>
     <slot>slotHistoryclicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kled.h</includehint>
 </includehints>
diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui
index bcfb43c1..46a5354a 100644
--- a/quanta/components/framewizard/fmfpeditors.ui
+++ b/quanta/components/framewizard/fmfpeditors.ui
@@ -537,5 +537,5 @@
     </connection>
 </connections>
 <pixmapinproject/>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/framewizard/fmrceditors.ui b/quanta/components/framewizard/fmrceditors.ui
index d85bb0da..e0a8926c 100644
--- a/quanta/components/framewizard/fmrceditors.ui
+++ b/quanta/components/framewizard/fmrceditors.ui
@@ -145,5 +145,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui
index 6f3d030e..cde1611f 100644
--- a/quanta/components/framewizard/framewizards.ui
+++ b/quanta/components/framewizard/framewizards.ui
@@ -362,7 +362,7 @@
     </connection>
 </connections>
 <pixmapinproject/>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>visualframeeditor.h</includehint>
 </includehints>
diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp
index 0ff7cf74..ecf42bf8 100644
--- a/quanta/components/framewizard/treenode.cpp
+++ b/quanta/components/framewizard/treenode.cpp
@@ -114,7 +114,7 @@ TQString tree::addChildNode(const TQString &l){
 }
 
 bool tree::insertChildNode(const TQString &l){
-  TQString tqparent = findNode(l)->tqparentLabel();
+  TQString tqparent = findNode(l)->parentLabel();
   int pos=findNode( tqparent )->childPosition( findNode(l) );
   ++nodeId;
   treeNode *newNode = new treeNode(TQString::number(nodeId,10),tqparent);
diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h
index 6680e443..a1d568a6 100644
--- a/quanta/components/framewizard/treenode.h
+++ b/quanta/components/framewizard/treenode.h
@@ -49,7 +49,7 @@ class treeNode {
       int  childPosition(treeNode* n){ return m_tqchildrenList.tqfind(n); }
       bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); }
       TQString label() const { return m_label; }
-      TQString tqparentLabel() const { return m_parentLabel; }
+      TQString parentLabel() const { return m_parentLabel; }
       SplitType splitType() const { return m_splitType; }
       TQPtrList<treeNode> tqchildrenList() { return m_tqchildrenList; }
 
diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp
index ff32277b..3795a3ce 100644
--- a/quanta/components/framewizard/visualframeeditor.cpp
+++ b/quanta/components/framewizard/visualframeeditor.cpp
@@ -76,17 +76,17 @@ void VisualFrameEditor::split(const TQString &l, int n, SplitType type) {
     setGeometries(l);
   }
   else {
-    TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel();
-    SplitType tqparentSplit=m_internalTree->findNode(tqparentLabel)->splitType();
-    if( tqparentSplit != type ) {
+    TQString parentLabel=m_internalTree->findNode(l)->parentLabel();
+    SplitType parentSplit=m_internalTree->findNode(parentLabel)->splitType();
+    if( parentSplit != type ) {
       m_internalTree->findNode(l)->setSplitType(type);
       for(int i = 1; i<=n; i++) m_internalTree->addChildNode(l);
       setGeometries(l);
     }
     else {
       for(int i = 1; i<=n; i++) m_internalTree->insertChildNode(l);
-      m_internalTree->findNode(tqparentLabel)->removeChildNode(l,true);
-      setGeometries(m_internalTree->findNode(tqparentLabel)->label());
+      m_internalTree->findNode(parentLabel)->removeChildNode(l,true);
+      setGeometries(m_internalTree->findNode(parentLabel)->label());
     }
   }
 }
@@ -246,23 +246,23 @@ void VisualFrameEditor::paintEvent ( TQPaintEvent * ){
 void VisualFrameEditor::removeNode(const TQString &l){
   if( l == m_internalTree->root()->label() ) m_internalTree->reset();//trying to remove root node is equivalent to reinitialize
   else {
-    TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel();
-    if(m_internalTree->findNode(tqparentLabel)->countChildren()>=3)
-      m_internalTree->removeChildNode(tqparentLabel,l,true);
+    TQString parentLabel=m_internalTree->findNode(l)->parentLabel();
+    if(m_internalTree->findNode(parentLabel)->countChildren()>=3)
+      m_internalTree->removeChildNode(parentLabel,l,true);
     else {
-      m_internalTree->removeChildNode(tqparentLabel,l,true);
-      if( !m_internalTree->findNode(tqparentLabel)->firstChild()->hasChildren() ){ //final nodes
-        TQMap<TQString,TQString> map = m_internalTree->findNode(tqparentLabel)->firstChild()->atts()->attributeMap();
-        m_internalTree->findNode(tqparentLabel)->removeChildren();
-        m_internalTree->findNode(tqparentLabel)->atts()->setAllAttributes( map ) ;
-        m_internalTree->findNode(tqparentLabel)->setSplitType(NONE);
+      m_internalTree->removeChildNode(parentLabel,l,true);
+      if( !m_internalTree->findNode(parentLabel)->firstChild()->hasChildren() ){ //final nodes
+        TQMap<TQString,TQString> map = m_internalTree->findNode(parentLabel)->firstChild()->atts()->attributeMap();
+        m_internalTree->findNode(parentLabel)->removeChildren();
+        m_internalTree->findNode(parentLabel)->atts()->setAllAttributes( map ) ;
+        m_internalTree->findNode(parentLabel)->setSplitType(NONE);
       }
       else {
-        TQPtrList<treeNode> list = m_internalTree->findNode(tqparentLabel)->firstChild()->tqchildrenList();
-        if( tqparentLabel != m_internalTree->root()->label() ) {
-          TQString grandParentLabel = m_internalTree->findNode(tqparentLabel)->tqparentLabel();
-          m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false );
-          m_internalTree->removeChildNode( grandParentLabel ,tqparentLabel, true );
+        TQPtrList<treeNode> list = m_internalTree->findNode(parentLabel)->firstChild()->tqchildrenList();
+        if( parentLabel != m_internalTree->root()->label() ) {
+          TQString grandParentLabel = m_internalTree->findNode(parentLabel)->parentLabel();
+          m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false );
+          m_internalTree->removeChildNode( grandParentLabel ,parentLabel, true );
           treeNode *node;
           for ( node = list.first(); node; node = list.next() ) {
             node->setParentLabel(grandParentLabel);
@@ -270,12 +270,12 @@ void VisualFrameEditor::removeNode(const TQString &l){
           }
         }
         else {
-          m_internalTree->findNode(tqparentLabel)->setSplitType( m_internalTree->findNode(tqparentLabel)->firstChild()->splitType() );
-          m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false );
+          m_internalTree->findNode(parentLabel)->setSplitType( m_internalTree->findNode(parentLabel)->firstChild()->splitType() );
+          m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false );
           treeNode *node;
           for ( node = list.first(); node; node = list.next() ) {
-            node->setParentLabel(tqparentLabel);
-            m_internalTree->findNode(tqparentLabel)->addChildNode(node);
+            node->setParentLabel(parentLabel);
+            m_internalTree->findNode(parentLabel)->addChildNode(node);
           }
         }
       }
diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui
index 04af473c..f74a2620 100644
--- a/quanta/components/tableeditor/tableeditors.ui
+++ b/quanta/components/tableeditor/tableeditors.ui
@@ -638,5 +638,5 @@
     <tabstop>footerColSpinBox</tabstop>
     <tabstop>footerTableData</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index d823fc1f..0ac7ede2 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -630,7 +630,7 @@ void ActionConfigDialog::saveCurrentAction()
           {
             currentAction->unplug(tb->page(i));
             currentAction->unplug(p_toolbar->menu);
-            node.tqparentNode().removeChild(node);
+            node.parentNode().removeChild(node);
             TQListViewItemIterator iter(actionTreeView);
             while (iter.current())
             {
@@ -816,18 +816,18 @@ void ActionConfigDialog::slotNewAction()
      actionTreeView->setCurrentItem(item);
   } else
   {
-    TQListViewItem *tqparentItem = currentItem->tqparent();
-    if (!tqparentItem)
-      tqparentItem = currentItem;
+    TQListViewItem *parentItem = currentItem->tqparent();
+    if (!parentItem)
+      parentItem = currentItem;
 
-    item = new KListViewItem(tqparentItem, currentItem);
+    item = new KListViewItem(parentItem, currentItem);
     item->setText(0, actionText);
     item->setText(2, currentAction->name());
     item->setPixmap(0, SmallIcon("ball"));
     actionTreeView->setCurrentItem(item);
-    if (tqparentItem != allActionsItem)
+    if (parentItem != allActionsItem)
     {
-      toolbarListBox->insertItem(tqparentItem->text(0));
+      toolbarListBox->insertItem(parentItem->text(0));
       toolbarListBox->setCurrentItem(0);
       toolbarListBox->setSelected(0, true);
     }
diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui
index c5002777..d834bea7 100644
--- a/quanta/dialogs/actionconfigdialogs.ui
+++ b/quanta/dialogs/actionconfigdialogs.ui
@@ -990,7 +990,7 @@
     <slot>slotToggled(bool)</slot>
     <slot>slotTextChanged()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kicondialog.h</includehint>
diff --git a/quanta/dialogs/casewidget.ui b/quanta/dialogs/casewidget.ui
index 916332dd..f3370603 100644
--- a/quanta/dialogs/casewidget.ui
+++ b/quanta/dialogs/casewidget.ui
@@ -104,5 +104,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/debuggeroptionss.ui b/quanta/dialogs/debuggeroptionss.ui
index d44b604e..3bca0951 100644
--- a/quanta/dialogs/debuggeroptionss.ui
+++ b/quanta/dialogs/debuggeroptionss.ui
@@ -137,5 +137,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/dirtydialog.ui b/quanta/dialogs/dirtydialog.ui
index d339ebdc..50783723 100644
--- a/quanta/dialogs/dirtydialog.ui
+++ b/quanta/dialogs/dirtydialog.ui
@@ -150,5 +150,5 @@
     <tabstop>buttonIgnore</tabstop>
     <tabstop>buttonLoad</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui
index 0921fa98..41802d95 100644
--- a/quanta/dialogs/donationdialog.ui
+++ b/quanta/dialogs/donationdialog.ui
@@ -146,7 +146,7 @@ is the future of software, but it is no guarantee of success. How many open sour
 <Q_SLOTS>
     <slot>init()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>ktextbrowser.h</includehint>
diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui
index 60c47e20..b2455cf7 100644
--- a/quanta/dialogs/dtdselectdialog.ui
+++ b/quanta/dialogs/dtdselectdialog.ui
@@ -108,5 +108,5 @@ Dialog message2:</string>
 <Q_SLOTS>
     <slot>init()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp
index 72759a00..88201b3d 100644
--- a/quanta/dialogs/dtepeditdlg.cpp
+++ b/quanta/dialogs/dtepeditdlg.cpp
@@ -354,7 +354,7 @@ void DTEPEditDlg::readStructures()
     group.hasFileName = m_config->readBoolEntry("HasFileName", false);
     group.fileNameRx = m_config->readEntry("FileNameRx");
     group.appendToTags = m_config->readBoolEntry("AppendToTags", false);
-    group.tqparentGroup = m_config->readEntry("ParentGroup");
+    group.parentGroup = m_config->readEntry("ParentGroup");
     group.definitionRx = m_config->readEntry("DefinitionRx");
     group.definitionRxMinimal = m_config->readBoolEntry("DefinitionRx_Minimal", false);
     group.usageRx = m_config->readEntry("UsageRx");
@@ -397,7 +397,7 @@ void DTEPEditDlg::writeStructures(KConfig *config)
     config->writeEntry("AppendToTags", group.appendToTags);
     if (m_family == 1)
     {
-      writeEntry(config, "ParentGroup", group.tqparentGroup);
+      writeEntry(config, "ParentGroup", group.parentGroup);
       writeEntry(config, "DefinitionRx", group.definitionRx);
       config->writeEntry("DefinitionRx_Minimal", group.definitionRxMinimal);
       writeEntry(config, "UsageRx", group.usageRx);
@@ -453,7 +453,7 @@ void DTEPEditDlg::slotEditStructGroup()
     structDlg.hasFilename->setChecked(group.hasFileName);
     structDlg.fileNameRxEdit->setText(group.fileNameRx);
     structDlg.appendToTags->setChecked(group.appendToTags);
-    structDlg.tqparentGroupEdit->setText(group.tqparentGroup);
+    structDlg.parentGroupEdit->setText(group.parentGroup);
     for (int i = 0; i < structDlg.tagTypeCombo->count(); i++)
     {
       if (structDlg.tagTypeCombo->text(i) == group.tagType)
@@ -513,7 +513,7 @@ StructGroup DTEPEditDlg::readFromStructDlg(DTEPStructureEditDlgS *structDlg)
   group.hasFileName = structDlg->hasFilename->isChecked();
   group.fileNameRx = structDlg->fileNameRxEdit->text();
   group.appendToTags = structDlg->appendToTags->isChecked();
-  group.tqparentGroup = structDlg->tqparentGroupEdit->text();
+  group.parentGroup = structDlg->parentGroupEdit->text();
   group.tagType = structDlg->tagTypeCombo->currentText();
   group.definitionRx = structDlg->definitionRxEdit->text();
   group.definitionRxMinimal = structDlg->definitionRxMinimal->isChecked();
diff --git a/quanta/dialogs/dtepeditdlg.h b/quanta/dialogs/dtepeditdlg.h
index 6906e40d..a1b9357c 100644
--- a/quanta/dialogs/dtepeditdlg.h
+++ b/quanta/dialogs/dtepeditdlg.h
@@ -37,7 +37,7 @@ struct StructGroup {
   bool hasFileName;
   TQString fileNameRx;
   bool appendToTags;
-  TQString tqparentGroup;
+  TQString parentGroup;
   TQString definitionRx;
   bool definitionRxMinimal;
   TQString usageRx;
diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui
index 3b36feeb..1167f46e 100644
--- a/quanta/dialogs/dtepeditdlgs.ui
+++ b/quanta/dialogs/dtepeditdlgs.ui
@@ -1963,5 +1963,5 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
     <slot>slotDeleteStructGroup()</slot>
     <slot>slotFamilyChanged(int)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui
index 2e2e4153..b7813f8d 100644
--- a/quanta/dialogs/dtepstructureeditdlgs.ui
+++ b/quanta/dialogs/dtepstructureeditdlgs.ui
@@ -358,7 +358,7 @@ Example 3:&lt;br&gt;
                 </widget>
                 <widget class="KLineEdit" row="0" column="1" rowspan="1" colspan="4">
                     <property name="name">
-                        <cstring>tqparentGroupEdit</cstring>
+                        <cstring>parentGroupEdit</cstring>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>The name of the group that may be the tqparent of this</string>
@@ -624,7 +624,7 @@ The first captured area (between "&lt;b&gt;(&lt;/b&gt;" and "&lt;b&gt;)&lt;/b&gt
     <tabstop>hasFilename</tabstop>
     <tabstop>fileNameRxEdit</tabstop>
     <tabstop>appendToTags</tabstop>
-    <tabstop>tqparentGroupEdit</tabstop>
+    <tabstop>parentGroupEdit</tabstop>
     <tabstop>tagTypeCombo</tabstop>
     <tabstop>definitionRxEdit</tabstop>
     <tabstop>definitionRxMinimal</tabstop>
@@ -639,7 +639,7 @@ The first captured area (between "&lt;b&gt;(&lt;/b&gt;" and "&lt;b&gt;)&lt;/b&gt
     <tabstop>variableGroup</tabstop>
     <tabstop>classGroup</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kicondialog.h</includehint>
 </includehints>
diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui
index 22ef785f..e5066449 100644
--- a/quanta/dialogs/fourbuttonmessagebox.ui
+++ b/quanta/dialogs/fourbuttonmessagebox.ui
@@ -160,5 +160,5 @@
 <functions>
     <function specifier="non virtual" returnType="int">status()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui
index b2684e01..007fbba4 100644
--- a/quanta/dialogs/loadentitydlgs.ui
+++ b/quanta/dialogs/loadentitydlgs.ui
@@ -68,5 +68,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui
index 8e115d0f..debb4b5c 100644
--- a/quanta/dialogs/settings/abbreviations.ui
+++ b/quanta/dialogs/settings/abbreviations.ui
@@ -346,7 +346,7 @@
     <slot>slotRemoveDTEP()</slot>
     <slot>slotNewGroup()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klistbox.h</includehint>
diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui
index 733b66eb..82d1976f 100644
--- a/quanta/dialogs/settings/codetemplatedlgs.ui
+++ b/quanta/dialogs/settings/codetemplatedlgs.ui
@@ -77,5 +77,5 @@
     <slot>reject()</slot>
     <slot>pushButton4_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp
index 5f96a2eb..04593921 100644
--- a/quanta/dialogs/settings/filemasks.cpp
+++ b/quanta/dialogs/settings/filemasks.cpp
@@ -31,7 +31,7 @@ FileMasks::FileMasks(TQWidget *tqparent, const char *name)
 
 FileMasks::~FileMasks(){
 }
-/** set tqmasks to default */
+/** set masks to default */
 void FileMasks::setToDefault()
 {
  KMimeType::List list = KMimeType::allMimeTypes();
diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui
index fb7d322a..e4c408d3 100644
--- a/quanta/dialogs/settings/filemaskss.ui
+++ b/quanta/dialogs/settings/filemaskss.ui
@@ -332,5 +332,5 @@
     <tabstop>reloadProject</tabstop>
     <tabstop>reloadFiles</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/parseroptionsui.ui b/quanta/dialogs/settings/parseroptionsui.ui
index 2a5fed0b..2637e71d 100644
--- a/quanta/dialogs/settings/parseroptionsui.ui
+++ b/quanta/dialogs/settings/parseroptionsui.ui
@@ -310,5 +310,5 @@
     <tabstop>refreshFrequency</tabstop>
     <tabstop>spinExpand</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/previewoptionss.ui b/quanta/dialogs/settings/previewoptionss.ui
index e3743258..02bdc979 100644
--- a/quanta/dialogs/settings/previewoptionss.ui
+++ b/quanta/dialogs/settings/previewoptionss.ui
@@ -276,5 +276,5 @@
     <tabstop>radioNoCloseButtons</tabstop>
     <tabstop>radioDelayedCloseButtons</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui
index 242e7e7c..e14cfda6 100644
--- a/quanta/dialogs/settings/styleoptionss.ui
+++ b/quanta/dialogs/settings/styleoptionss.ui
@@ -197,5 +197,5 @@ We suggest to leave this option off and use an tqunicode or locale encoding for
     <tabstop>tagAutoClose</tabstop>
     <tabstop>useAutoCompletion</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui
index c0ed272f..e45807c8 100644
--- a/quanta/dialogs/specialchardialogs.ui
+++ b/quanta/dialogs/specialchardialogs.ui
@@ -145,7 +145,7 @@
     <tabstop>buttonChar</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klistbox.h</includehint>
diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp
index 12ecec0d..7a7ea593 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.cpp
+++ b/quanta/dialogs/tagdialogs/tagdialog.cpp
@@ -148,7 +148,7 @@ void TagDialog::parseTag()
     TQDomDocument doc;
     if (dtdTag->name().lower() == "img") //NOTE: HTML specific code!
     {
-       mainDlg = new TagImgDlg(dtdTag->tqparentDTD, this);
+       mainDlg = new TagImgDlg(dtdTag->parentDTD, this);
       ((TagImgDlg *)mainDlg)->writeAttributes( dict );
     }
     //read the tag file it is available
@@ -164,7 +164,7 @@ void TagDialog::parseTag()
        {
           TQDomNode n = nodeList.item(i);
           TQString nodeTagName = n.toElement().attribute("name");
-          if (!dtdTag->tqparentDTD->caseSensitive)
+          if (!dtdTag->parentDTD->caseSensitive)
               nodeTagName = nodeTagName.upper();
           if (nodeTagName == tagName && n.toElement().elementsByTagName("attr").count() > 0) //read a tag
           {
@@ -192,7 +192,7 @@ void TagDialog::parseTag()
     addTab( mainDlg, i18n("Main") );
   }
 
-  KConfig *dtdConfig = new KConfig(dtdTag->tqparentDTD->fileName);
+  KConfig *dtdConfig = new KConfig(dtdTag->parentDTD->fileName);
   dtdConfig->setGroup("General");
   int numOfPages = dtdConfig->readNumEntry("NumOfPages");
   extraPageList = new TQPtrList<Tagxml>();
@@ -429,7 +429,7 @@ void TagDialog::insertTag(Document *w, bool insertInLine)
     TQString newTag = getAttributeString();
     newTag = TQString("<")+QuantaCommon::tagCase(dtdTag->name())+newTag;
 
-    if ( dtdTag->tqparentDTD->singleTagStyle == "xml" &&
+    if ( dtdTag->parentDTD->singleTagStyle == "xml" &&
           (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional()))
         )
     {
diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui
index d3e03fd5..84be37bc 100644
--- a/quanta/dialogs/tagdialogs/tagmail.ui
+++ b/quanta/dialogs/tagdialogs/tagmail.ui
@@ -126,5 +126,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/tagdialogs/tagmisc.ui b/quanta/dialogs/tagdialogs/tagmisc.ui
index 4d39033d..24db77c7 100644
--- a/quanta/dialogs/tagdialogs/tagmisc.ui
+++ b/quanta/dialogs/tagdialogs/tagmisc.ui
@@ -64,5 +64,5 @@
     <tabstop>elementName</tabstop>
     <tabstop>addClosingTag</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp
index 41388efc..a8428b20 100644
--- a/quanta/dialogs/tagdialogs/tagxml.cpp
+++ b/quanta/dialogs/tagdialogs/tagxml.cpp
@@ -47,7 +47,7 @@ Tagxml::~Tagxml()
 
 void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag)
 {
-    m_dtd = dtdTag->tqparentDTD;
+    m_dtd = dtdTag->parentDTD;
     m_dtdTag = dtdTag;
     TQGridLayout *grid = new TQGridLayout( this );
     grid->setSpacing( 13 );
diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index 2b584854..0bca2cf2 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -236,7 +236,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui
       int line = el.attribute("line").toInt(&ok, 10);
       if (!annotations.tqcontains(line) || (annotations[line].first != text))
       {
-        n.tqparentNode().removeChild(n);
+        n.parentNode().removeChild(n);
         modified = true;
       } else
         annotations.remove(line);
diff --git a/quanta/parsers/dtd/dtepcreationdlg.ui b/quanta/parsers/dtd/dtepcreationdlg.ui
index adaeabc4..db29d504 100644
--- a/quanta/parsers/dtd/dtepcreationdlg.ui
+++ b/quanta/parsers/dtd/dtepcreationdlg.ui
@@ -148,5 +148,5 @@
     <tabstop>defaultExtension</tabstop>
     <tabstop>caseSensitive</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/parsers/node.h b/quanta/parsers/node.h
index ab8e6267..d2007482 100644
--- a/quanta/parsers/node.h
+++ b/quanta/parsers/node.h
@@ -37,7 +37,7 @@ struct GroupElement{
     /* The tag which point to the actual place in the node */
     Tag *tag;
     /*The tqparent node indicating the beginning of a structure */
-    Node *tqparentNode;
+    Node *parentNode;
     bool global;
     bool deleted;
     TQString type;
@@ -99,7 +99,7 @@ public:
  TQString nodeName();
  TQString nodeValue();
  void setNodeValue(const TQString &value);
- Node* tqparentNode() {return tqparent;}
+ Node* parentNode() {return tqparent;}
  Node* firstChild() {return child;}
  Node* lastChild();
  Node* DOMpreviousSibling() {return prev;}
diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp
index 0a9441db..c795f11e 100644
--- a/quanta/parsers/parser.cpp
+++ b/quanta/parsers/parser.cpp
@@ -115,11 +115,11 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
   bool nodeFound = false;
   bool goUp;
   Node *rootNode = 0L;
-  Node *tqparentNode = a_node;
+  Node *parentNode = a_node;
   Node *currentNode = a_node;
   if (currentNode && (currentNode->tag->type != Tag::XmlTag ||
       currentNode->tag->single))
-      tqparentNode = currentNode->tqparent;
+      parentNode = currentNode->tqparent;
   Tag *tag = 0L;
   TQTag *qTag = 0L;
   textLine.append(write->text(startLine, startCol, startLine, write->editIf->lineLength(startLine)));
@@ -144,13 +144,13 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
       if ( specialStartPos != -1 &&
           (specialStartPos <= tagStartPos || tagStartPos == -1) )
       {
-        currentNode = ParserCommon::createTextNode(write, currentNode, line, specialStartPos, tqparentNode);
+        currentNode = ParserCommon::createTextNode(write, currentNode, line, specialStartPos, parentNode);
         if (!rootNode)
             rootNode = currentNode;
         TQString foundText = m_dtd->specialAreaStartRx.cap();
         //create a toplevel node for the special area
         AreaStruct area(line, specialStartPos, line, specialStartPos + foundText.length() - 1);
-        Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, tqparentNode, currentNode);
+        Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, parentNode, currentNode);
         if (node->tqparent && node->prev == node->tqparent) //some strange cases, but it's possible, eg.: <a href="<? foo ?>""></a><input size="<? foo ?>" >
         {
            node->prev->next = 0L;
@@ -266,18 +266,18 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
         if (m_dtd->specialTags.tqcontains(tag->name.lower()) && !tag->single)
         {
         //TODO: handle goUp here
-          Node *node = new Node(tqparentNode);
+          Node *node = new Node(parentNode);
           nodeNum++;
           node->tag = tag;
           node->insideSpecial = true;
-          if (currentNode && currentNode != tqparentNode)
+          if (currentNode && currentNode != parentNode)
           {
             currentNode->next = node;
             node->prev = currentNode;
           } else
           {
-            if (tqparentNode)
-                tqparentNode->child = node;
+            if (parentNode)
+                parentNode->child = node;
           }
           if (!rootNode)
               rootNode = node;
@@ -315,21 +315,21 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
         }
 
         qTag = 0L;
-        goUp = ( tqparentNode &&
-                ( (tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(tqparentNode->tag, tag)
+        goUp = ( parentNode &&
+                ( (tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(parentNode->tag, tag)
                   ) ||
-                    tqparentNode->tag->single )
+                    parentNode->tag->single )
               );
-        if (tqparentNode && !goUp)
+        if (parentNode && !goUp)
         {
-          qTag = QuantaCommon::tagFromDTD(m_dtd, tqparentNode->tag->name);
+          qTag = QuantaCommon::tagFromDTD(m_dtd, parentNode->tag->name);
           if ( qTag )
           {
             TQString searchFor = (m_dtd->caseSensitive)?tag->name:tag->name.upper();
             searchFor.remove('/');
             if ( qTag->stoppingTags.tqcontains(searchFor))
             {
-              tqparentNode->tag->closingMissing = true; //tqparent is single...
+              parentNode->tag->closingMissing = true; //tqparent is single...
               goUp = true;
             }
           }
@@ -340,9 +340,9 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
       if (nodeFound)
       {
         //first create a text/empty node between the current position and the last node
-        Node *savedParentNode = tqparentNode;
-        currentNode = ParserCommon::createTextNode(write, currentNode, tagStartLine, tagStartPos, tqparentNode);
-        if (savedParentNode != tqparentNode)
+        Node *savedParentNode = parentNode;
+        currentNode = ParserCommon::createTextNode(write, currentNode, tagStartLine, tagStartPos, parentNode);
+        if (savedParentNode != parentNode)
             goUp = false;
         if (!rootNode)
             rootNode = currentNode;
@@ -351,19 +351,19 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
         if (goUp)
         {
           //handle cases like <ul><li></ul>
-          if (tag->type == Tag::XmlTagEnd && !QuantaCommon::closesTag(tqparentNode->tag, tag))
+          if (tag->type == Tag::XmlTagEnd && !QuantaCommon::closesTag(parentNode->tag, tag))
           {
-            while ( tqparentNode->tqparent &&
-                    QuantaCommon::closesTag(tqparentNode->tqparent->tag, tag)
+            while ( parentNode->tqparent &&
+                    QuantaCommon::closesTag(parentNode->tqparent->tag, tag)
                   )
             {
-              tqparentNode = tqparentNode->tqparent;
+              parentNode = parentNode->tqparent;
             }
           } else
           if (qTag && tag->type != Tag::XmlTagEnd)
           {
             //handle the case when a tag is a stopping tag for tqparent, and grandtqparent and so on.
-            Node *n = tqparentNode;
+            Node *n = parentNode;
             TQString searchFor = (m_dtd->caseSensitive)?tag->name:tag->name.upper();
             while (qTag && n)
             {
@@ -374,7 +374,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
                 {
                   n->tag->closingMissing = true; //tqparent is single...
                   if (n->tqparent)
-                    tqparentNode = n;
+                    parentNode = n;
                   n = n->tqparent;
                 } else
                 {
@@ -384,29 +384,29 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
             }
           }
 
-          node = new Node(tqparentNode->tqparent);
+          node = new Node(parentNode->tqparent);
           nodeNum++;
-          node->prev = tqparentNode;
-          tqparentNode->next = node;
-          tqparentNode = tqparentNode->tqparent;
+          node->prev = parentNode;
+          parentNode->next = node;
+          parentNode = parentNode->tqparent;
           node->closesPrevious = true;
         } else
         {
-          node = new Node(tqparentNode);
+          node = new Node(parentNode);
           nodeNum++;
-          if (currentNode && currentNode != tqparentNode)
+          if (currentNode && currentNode != parentNode)
           {
             currentNode->next = node;
             node->prev = currentNode;
           } else
           {
-            if (tqparentNode)
+            if (parentNode)
             {
-              if (!tqparentNode->child)
-                tqparentNode->child = node;
+              if (!parentNode->child)
+                parentNode->child = node;
               else
               {
-                Node *n = tqparentNode->child;
+                Node *n = parentNode->child;
                 while (n->next)
                   n = n->next;
                 n->next = node;
@@ -416,7 +416,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
           }
         }
         if (!tag->single)
-            tqparentNode = node;
+            parentNode = node;
 
         node->tag = tag;
         if (tag->type == Tag::NeedsParsing)
@@ -467,7 +467,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
 #endif
     cleanGroups();
     m_saParser->setParsingEnabled(true);
-    currentNode = m_saParser->parseArea(area, "", "", tqparentNode, true, true); //TODO: don't parse in detail here
+    currentNode = m_saParser->parseArea(area, "", "", parentNode, true, true); //TODO: don't parse in detail here
     m_saParser->setParsingEnabled(false);
     el = m_saParser->lastParsedLine();
     ec = m_saParser->lastParsedColumn();
@@ -484,16 +484,16 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
       el = endLine;
       ec = endCol + 1;
     }
-    currentNode = ParserCommon::createTextNode(write, currentNode, el, ec, tqparentNode);
+    currentNode = ParserCommon::createTextNode(write, currentNode, el, ec, parentNode);
   } else
   if (el != endLine || ec != endCol)
   {
     if (currentNode && currentNode->tag->type == Tag::ScriptTag)
     {
-      tqparentNode = currentNode;
+      parentNode = currentNode;
       currentNode = 0L;
     }
-    currentNode = ParserCommon::createTextNode(write, currentNode, endLine, endCol, tqparentNode);
+    currentNode = ParserCommon::createTextNode(write, currentNode, endLine, endCol, parentNode);
   }
   if (!rootNode)
     rootNode = currentNode;
@@ -623,9 +623,9 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact)
       {
         if (node->tqparent)
         {
-          int tqparentEl, tqparentEc;
-          node->tqparent->tag->endPos(tqparentEl, tqparentEc);
-          if (!exact && QuantaCommon::isBetween(line, col, bl, bc, tqparentEl, tqparentEc) == 0)
+          int parentEl, parentEc;
+          node->tqparent->tag->endPos(parentEl, parentEc);
+          if (!exact && QuantaCommon::isBetween(line, col, bl, bc, parentEl, parentEc) == 0)
           {
             node = node->tqparent;
           }
@@ -1563,14 +1563,14 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
                     node->fileName = fileName;
                     GroupElement *groupElement = new GroupElement;
                     groupElement->node = node;
-                    groupElement->tqparentNode = 0L;
+                    groupElement->parentNode = 0L;
                     int minPos = areaPos + pos + 1;
                     for (TQValueList<GroupElementPosition>::Iterator gPosIt = gPositions.begin(); gPosIt != gPositions.end(); ++gPosIt)
                     {
                       GroupElementPosition gPos = (*gPosIt);
                       if ( (areaPos + pos > gPos.startPos) && (areaPos + pos < gPos.endPos) && (gPos.startPos < minPos))
                       {
-                        groupElement->tqparentNode = gPos.element->node;          
+                        groupElement->parentNode = gPos.element->node;          
                         minPos = gPos.startPos; 
                       }
                     }
@@ -1588,8 +1588,8 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
                       TQTag *qTag = new TQTag();
                       qTag->setName(s.left(s.tqfind('(')));
                       qTag->className = "";
-                      if (groupElement->tqparentNode)
-                        qTag->className = groupElement->tqparentNode->tag->name;
+                      if (groupElement->parentNode)
+                        qTag->className = groupElement->parentNode->tag->name;
                       write->userTagList.tqreplace(s.lower(), qTag);
                     }
                   }
@@ -1658,7 +1658,7 @@ void Parser::parseForXMLGroup(Node *node)
     groupElement->deleted = false;
     groupElement->tag = newTag;
     groupElement->node = node;
-    groupElement->tqparentNode = 0L;
+    groupElement->parentNode = 0L;
     groupElement->global = true;
     groupElement->group = const_cast<XMLStructGroup*>(&(xmlGroupIt.data()));
     node->m_groupElements.append(groupElement);
diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp
index 8a9a4be5..469bedd6 100644
--- a/quanta/parsers/parsercommon.cpp
+++ b/quanta/parsers/parsercommon.cpp
@@ -78,7 +78,7 @@ void appendAreaToTextNode(Document *write, const AreaStruct &area, Node *node)
   node->tag->setTagPosition(bLine, bCol, area.eLine, area.eCol);
 }
 
-Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqparentNode)
+Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *parentNode)
 {
   Tag *textTag = 0L;
   Node *textNode = 0L;
@@ -89,10 +89,10 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqp
   {
     node->tag->endPos(bLine, bCol);
   } else
-  if (tqparentNode)
-    tqparentNode->tag->endPos(bLine, bCol);
-  if (tqparentNode)
-    dtd = tqparentNode->tag->dtd();
+  if (parentNode)
+    parentNode->tag->endPos(bLine, bCol);
+  if (parentNode)
+    dtd = parentNode->tag->dtd();
   eCol--;
   if (bLine == 0 && bCol == 0)
     bCol = -1;
@@ -110,13 +110,13 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqp
       textTag->type = Tag::Text;
     }
 
-    if (tqparentNode && tqparentNode->tag->single)
+    if (parentNode && parentNode->tag->single)
     {
-      textNode = new Node(tqparentNode->tqparent);
+      textNode = new Node(parentNode->tqparent);
       nodeNum++;
-      textNode->prev = tqparentNode;
-      tqparentNode->next = textNode;
-      tqparentNode = tqparentNode->tqparent;
+      textNode->prev = parentNode;
+      parentNode->next = textNode;
+      parentNode = parentNode->tqparent;
     } else
     {
       if ( node &&
@@ -129,21 +129,21 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqp
         textTag = 0L;
       } else
       {
-        textNode = new Node(tqparentNode);
+        textNode = new Node(parentNode);
         nodeNum++;
-        if (node && node != tqparentNode)
+        if (node && node != parentNode)
         {
           node->next = textNode;
           textNode->prev = node;
         } else
         {
-          if (tqparentNode)
+          if (parentNode)
           {
-            Node *n = tqparentNode->child;
+            Node *n = parentNode->child;
             while (n && n->next)
               n = n->next;
             if (!n)
-              tqparentNode->child = textNode;
+              parentNode->child = textNode;
             else
             {
               n->next = textNode;
@@ -163,7 +163,7 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqp
 }
 
 Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQString &areaName,
-                          const DTDStruct *dtd, Node *tqparentNode, Node *currentNode)
+                          const DTDStruct *dtd, Node *parentNode, Node *currentNode)
 {
   Tag *tag = new Tag();
   tag->setTagPosition(area);
@@ -178,17 +178,17 @@ Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQStrin
   tag->type = Tag::ScriptTag;
   tag->validXMLTag = false;
 
-  Node *node = new Node(tqparentNode);
+  Node *node = new Node(parentNode);
   nodeNum++;
   node->tag = tag;
   node->insideSpecial = true;
-  if (tqparentNode)
+  if (parentNode)
   {
-    if (!tqparentNode->child)
-        tqparentNode->child = node;
+    if (!parentNode->child)
+        parentNode->child = node;
     else
     {
-        Node *n = tqparentNode->child;
+        Node *n = parentNode->child;
         while (n->next)
           n = n->next;
         n->next = node;
diff --git a/quanta/parsers/parsercommon.h b/quanta/parsers/parsercommon.h
index 021541b0..d1c76092 100644
--- a/quanta/parsers/parsercommon.h
+++ b/quanta/parsers/parsercommon.h
@@ -39,16 +39,16 @@ namespace ParserCommon{
   /** Appends a text area to a text node. */
   void appendAreaToTextNode(Document *write, const AreaStruct &area, Node *node);
   /** Creates a text/empty node between node and the provided position */
-  Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqparentNode);
+  Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *parentNode);
   /** Creates a head node for special areas.
       area: the area belonging to this node
       areaName: the special area name (type)
       dtd: the tqparent DTD
-      tqparentNode: the tqparent of the node
+      parentNode: the tqparent of the node
       currentNode: the last child of the tqparent, if it exists
   */
   Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQString &areaName,
-                            const DTDStruct *dtd, Node *tqparentNode, Node *currentNode);
+                            const DTDStruct *dtd, Node *parentNode, Node *currentNode);
 
 /** Print the doc structure tree to the standard output.
     Only for debugging purposes. */
diff --git a/quanta/parsers/qtag.cpp b/quanta/parsers/qtag.cpp
index d31f91b8..6a98c3b1 100644
--- a/quanta/parsers/qtag.cpp
+++ b/quanta/parsers/qtag.cpp
@@ -24,7 +24,7 @@ TQTag::TQTag()
  single = false;
  optional = false;
  type = "xmltag";
- tqparentDTD = 0L;
+ parentDTD = 0L;
 }
 
 TQTag::TQTag( TQTag &t)
@@ -33,7 +33,7 @@ TQTag::TQTag( TQTag &t)
   single = t.single;
   optional = t.optional;
   m_fileName = t.m_fileName;
-  tqparentDTD = t.tqparentDTD;
+  parentDTD = t.parentDTD;
   type = t.type;
   returnType = t.returnType;
   comment = t.comment;
@@ -105,7 +105,7 @@ bool TQTag::isAttribute(const TQString &attrName)
   //Check in the common attributes
   for(i = 0; i < (signed)commonGroups.count(); i++)
   {
-    groupAttrs = tqparentDTD->commonAttrs->tqfind(commonGroups[i]);
+    groupAttrs = parentDTD->commonAttrs->tqfind(commonGroups[i]);
     if(groupAttrs)
     {
       for(a = groupAttrs->first(); a; a = groupAttrs->next())
@@ -136,7 +136,7 @@ void TQTag::setName(const TQString& theName)
 /** No descriptions */
 TQString TQTag::name(bool doNotConvert)
 {
-  if (doNotConvert || !tqparentDTD || tqparentDTD->caseSensitive)
+  if (doNotConvert || !parentDTD || parentDTD->caseSensitive)
       return tagName;
   else
       return tagName.upper();
@@ -169,7 +169,7 @@ TQTag TQTag::operator = (TQTag &t)
   single = t.single;
   optional = t.optional;
   m_fileName = t.m_fileName;
-  tqparentDTD = t.tqparentDTD;
+  parentDTD = t.parentDTD;
   type = t.type;
   returnType = t.returnType;
   comment = t.comment;
@@ -204,7 +204,7 @@ Attribute* TQTag::attribute(const TQString& name)
 bool TQTag::isChild(const TQString& tag, bool trueIfNoChildsDefined)
 {
  TQString tagName = tag;
-  tagName = tqparentDTD->caseSensitive ? tagName : tagName.upper();
+  tagName = parentDTD->caseSensitive ? tagName : tagName.upper();
   if(trueIfNoChildsDefined)
     return (childTags.isEmpty() || childTags.tqcontains(tagName));
   else
@@ -247,10 +247,10 @@ bool TQTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodes
     return isChild(node->tag->name, trueIfNoChildsDefined);
 }
 
-TQPtrList<TQTag> TQTag::tqparents()
+TQPtrList<TQTag> TQTag::parents()
 {
   TQPtrList<TQTag> qTagList;
-  TQDictIterator<TQTag> it((*tqparentDTD->tagsList));
+  TQDictIterator<TQTag> it((*parentDTD->tagsList));
   for(; it.current(); ++it)
   {
     if(it.current()->isChild(name()))
diff --git a/quanta/parsers/qtag.h b/quanta/parsers/qtag.h
index 679fbc55..ed4b594a 100644
--- a/quanta/parsers/qtag.h
+++ b/quanta/parsers/qtag.h
@@ -58,7 +58,7 @@ class XMLStructGroup {
     bool hasFileName;     ///<the group contains filename(s)
     TQRegExp fileNameRx;   ///<delete the matches of this regexp to obtain a filename (eg. linked, included file name)
     bool appendToTags; ///<true if the group elements must be used as normal tags in autocompletion
-    TQString tqparentGroup; ///<if the group element can be a child of another group (eg. member function of a class), holds the tqparent name. Makes sense only if appentToTags is true
+    TQString parentGroup; ///<if the group element can be a child of another group (eg. member function of a class), holds the tqparent name. Makes sense only if appentToTags is true
 };
 
 
@@ -248,7 +248,7 @@ public:
   //prefer using this variant, it handle Text, Empty, XmlTagEnd nodes!
   bool isChild(Node *node, bool trueIfNoChildsDefined = true, bool treatEmptyNodesAsText = false);
   /*** Returns the list of tqparent of this tag. */
-  TQPtrList<TQTag> tqparents();
+  TQPtrList<TQTag> parents();
 
   /** No descriptions */
   TQString fileName();
@@ -258,7 +258,7 @@ public:
   Attribute* attribute(const TQString& name);
 
   /** The tag belongs to this DTD */
-  const DTDStruct *tqparentDTD;
+  const DTDStruct *parentDTD;
   /** The tag has the attributes of the above common groups */
   TQStringList commonGroups;
   TQStringList stoppingTags;
diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp
index 5f45a73a..49973c70 100644
--- a/quanta/parsers/sagroupparser.cpp
+++ b/quanta/parsers/sagroupparser.cpp
@@ -182,10 +182,10 @@ void SAGroupParser::parseForScriptGroup(Node *node)
         }
         if (tmpNode && tmpNode->tag->type == Tag::ScriptStructureBegin)
         {
-          groupElement->tqparentNode = tmpNode;
+          groupElement->parentNode = tmpNode;
         } else
         {
-          groupElement->tqparentNode = 0L;
+          groupElement->parentNode = 0L;
         }
         groupElement->global = true;
         tmpNode = node->tqparent;
@@ -194,7 +194,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
           if ( tmpNode->tag->type == Tag::ScriptStructureBegin && tmpNode->tag->dtd()->localScopeKeywordsRx.search(tmpNode->tag->cleanStr) != -1)
           {
             groupElement->global = false;
-            groupElement->tqparentNode = tmpNode;
+            groupElement->parentNode = tmpNode;
             break;
           }
           tmpNode = tmpNode->tqparent;
@@ -207,11 +207,11 @@ void SAGroupParser::parseForScriptGroup(Node *node)
           int nameEnd = s.tqfind('(');
           qTag->setName(s.left(nameEnd));
           qTag->className = "";
-          if (groupElement->tqparentNode)
+          if (groupElement->parentNode)
           {
-            for (GroupElementList::ConstIterator it2 = groupElement->tqparentNode->m_groupElements.constBegin(); it2 != groupElement->tqparentNode->m_groupElements.constEnd(); ++it2)
+            for (GroupElementList::ConstIterator it2 = groupElement->parentNode->m_groupElements.constBegin(); it2 != groupElement->parentNode->m_groupElements.constEnd(); ++it2)
             {
-              if ((*it2)->group->name == group.tqparentGroup)
+              if ((*it2)->group->name == group.parentGroup)
               {
                 qTag->className = (*it2)->tag->name;
                 break;
@@ -253,7 +253,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
                 else
                   break;
               }
-            // Now we are left with the current line, lets check if the variable is inside tqparentheses
+            // Now we are left with the current line, lets check if the variable is inside parentheses
               int lineOpenParenth=tagWholeLineStr.tqfind('(');
               if(lineOpenParenth != -1)
               {
diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp
index e562d47b..9a30273c 100644
--- a/quanta/parsers/saparser.cpp
+++ b/quanta/parsers/saparser.cpp
@@ -157,7 +157,7 @@ bool SAParser::slotParseOneLine()
                      s_currentNode->tag->type == Tag::Empty) )
                   ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
                 else
-                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, s_currentContext.area.eCol + 1, s_currentContext.tqparentNode);
+                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, s_currentContext.area.eCol + 1, s_currentContext.parentNode);
 
                 s_currentNode->tag->type = Tag::ScriptStructureBegin;
                 s_currentNode->tag->single = false;
@@ -166,7 +166,7 @@ bool SAParser::slotParseOneLine()
                 s_currentContext.lastNode = s_currentNode;
 
                 s_contextStack.push(s_currentContext);
-                s_currentContext.tqparentNode = s_currentNode;
+                s_currentContext.parentNode = s_currentNode;
                 s_col = s_context.area.bCol + s_context.startString.length();
                 s_currentContext.area.bLine = s_line;
                 s_currentContext.area.bCol = s_col;
@@ -208,14 +208,14 @@ bool SAParser::slotParseOneLine()
                      s_currentNode->tag->type == Tag::Empty) )
                   ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
                 else
-                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, groupKeywordPos, s_currentContext.tqparentNode);
+                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, groupKeywordPos, s_currentContext.parentNode);
                 if (s_currentNode)
                 {
                   s_currentNode->insideSpecial = true;
                   s_currentNode->specialInsideXml = m_specialInsideXml;
                 }
                 s_previousContext = s_contextStack.pop();
-                s_currentContext.tqparentNode = s_previousContext.tqparentNode;
+                s_currentContext.parentNode = s_previousContext.parentNode;
                 s_currentContext.lastNode = s_previousContext.lastNode;
                 s_currentContext.type = s_previousContext.type;
                 s_currentContext.area.bLine = s_line;
@@ -232,14 +232,14 @@ bool SAParser::slotParseOneLine()
                 tag->setDtd(s_dtd);
                 tag->type = Tag::ScriptStructureEnd;
                 tag->single = true;
-                Node *node = new Node(s_currentContext.tqparentNode);
+                Node *node = new Node(s_currentContext.parentNode);
                 nodeNum++;
                 node->tag = tag;
                 node->insideSpecial = true;
                 node->specialInsideXml = m_specialInsideXml;
-                if (s_currentContext.tqparentNode && !s_currentContext.tqparentNode->child)
+                if (s_currentContext.parentNode && !s_currentContext.parentNode->child)
                 {
-                  s_currentContext.tqparentNode->child = node;
+                  s_currentContext.parentNode->child = node;
                 }
                 else if (s_currentContext.lastNode)
                 {
@@ -275,7 +275,7 @@ bool SAParser::slotParseOneLine()
                     s_currentNode->tag->type == Tag::Empty) )
                   ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
                 else
-                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, specialAreaPos, s_currentContext.tqparentNode);
+                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, specialAreaPos, s_currentContext.parentNode);
                 if (s_currentNode)
                 {
                   s_currentNode->insideSpecial = true;
@@ -284,7 +284,7 @@ bool SAParser::slotParseOneLine()
               }
               //create a toplevel node for the included special area
               AreaStruct area(s_line, specialAreaPos, s_line, specialAreaPos + foundText.length() - 1);
-              Node *node = ParserCommon::createScriptTagNode(m_write, area, foundText, s_dtd, s_currentContext.tqparentNode, s_currentNode);
+              Node *node = ParserCommon::createScriptTagNode(m_write, area, foundText, s_dtd, s_currentContext.parentNode, s_currentNode);
 #ifdef DEBUG_PARSER
               kdDebug(24001) << "Parsing a nested area." << endl;
 #endif
@@ -419,10 +419,10 @@ bool SAParser::slotParseOneLine()
         {
           s_context.area.bLine = s_line;
           s_context.area.eLine = s_context.area.eCol = -1;
-          s_context.tqparentNode = s_currentContext.tqparentNode;
+          s_context.parentNode = s_currentContext.parentNode;
           s_currentContext.area.eLine = s_context.area.bLine;
           s_currentContext.area.eCol = s_context.area.bCol - 1;
-       //   s_currentContext.tqparentNode = s_parentNode;
+       //   s_currentContext.parentNode = s_parentNode;
           s_contextStack.push(s_currentContext);
           if (s_fullParse)
           {
@@ -451,14 +451,14 @@ bool SAParser::slotParseOneLine()
               }
               tag->single = true;
               //create a node with the above tag
-              Node *node = new Node(s_currentContext.tqparentNode);
+              Node *node = new Node(s_currentContext.parentNode);
               nodeNum++;
               node->tag = tag;
               node->insideSpecial = true;
               node->specialInsideXml = m_specialInsideXml;
-              if (s_currentContext.tqparentNode && !s_currentContext.tqparentNode->child)
+              if (s_currentContext.parentNode && !s_currentContext.parentNode->child)
               {
-                s_currentContext.tqparentNode->child = node;
+                s_currentContext.parentNode->child = node;
               }
               else if (s_currentNode)
               {
@@ -522,12 +522,12 @@ bool SAParser::slotParseOneLine()
                 s_currentNode->tag->type == Tag::Empty) )
               ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
             else
-              s_currentNode = ParserCommon::createTextNode(m_write, 0L, s_line, pos, s_currentContext.tqparentNode);
+              s_currentNode = ParserCommon::createTextNode(m_write, 0L, s_line, pos, s_currentContext.parentNode);
             s_currentNode->insideSpecial = true;
             s_currentNode->specialInsideXml = m_specialInsideXml;
           }
           s_previousContext = s_contextStack.pop();
-          s_currentContext.tqparentNode = s_previousContext.tqparentNode;
+          s_currentContext.parentNode = s_previousContext.parentNode;
           s_currentContext.type = s_previousContext.type;
           s_currentContext.area.bLine = s_line;
           s_currentContext.area.bCol = pos + 1;
@@ -570,7 +570,7 @@ bool SAParser::slotParseOneLine()
             tag->type = Tag::Comment;
             tag->single = true;
             //create a node with the above tag
-            Node *node = new Node(s_currentContext.tqparentNode);
+            Node *node = new Node(s_currentContext.parentNode);
             nodeNum++;
             node->tag = tag;
             node->insideSpecial = true;
@@ -585,7 +585,7 @@ bool SAParser::slotParseOneLine()
             s_currentNode = node;
           }
           s_previousContext = s_contextStack.pop();
-          s_currentContext.tqparentNode = s_previousContext.tqparentNode;
+          s_currentContext.parentNode = s_previousContext.parentNode;
           s_currentContext.type = s_previousContext.type;
           s_currentContext.area.bLine = s_line;
           s_currentContext.area.bCol = s_currentContext.area.eCol + 1;
@@ -635,11 +635,11 @@ bool SAParser::slotParseOneLine()
 Node* SAParser::parseArea(const AreaStruct &specialArea,
                           const TQString &areaStartString,
                           const TQString &forcedAreaEndString,
-                          Node *tqparentNode,
+                          Node *parentNode,
                           bool fullParse, bool synchronous)
 {
   m_synchronous = synchronous;
-  s_parentNode = tqparentNode;
+  s_parentNode = parentNode;
   s_fullParse = fullParse;
 #ifdef DEBUG_PARSER
   kdDebug(24001) << "parseArea full: " << s_fullParse << "  synch: " << m_synchronous <<endl;
@@ -656,11 +656,11 @@ Node* SAParser::parseArea(const AreaStruct &specialArea,
   s_dtd = 0L;
   if (s_parentNode && !areaStartString.isEmpty())
   {
-    const DTDStruct *tqparentDTD = m_dtd;
+    const DTDStruct *parentDTD = m_dtd;
     if (s_parentNode->tqparent)
-      tqparentDTD = s_parentNode->tqparent->tag->dtd();
-    s_dtd = DTDs::ref()->tqfind(tqparentDTD->specialAreaNames[areaStartString]);
-    s_areaEndString = tqparentDTD->specialAreas[areaStartString];
+      parentDTD = s_parentNode->tqparent->tag->dtd();
+    s_dtd = DTDs::ref()->tqfind(parentDTD->specialAreaNames[areaStartString]);
+    s_areaEndString = parentDTD->specialAreas[areaStartString];
     s_searchForAreaEnd = true;
   }
   if (!forcedAreaEndString.isEmpty())
@@ -702,7 +702,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea,
   s_currentContext.area.bLine = s_line;
   s_currentContext.area.bCol = s_col;
   s_currentContext.area.eLine = s_currentContext.area.eCol = -1;
-  s_currentContext.tqparentNode = s_parentNode;
+  s_currentContext.parentNode = s_parentNode;
   s_currentNode = s_parentNode;
   m_lastParsedNode = 0L;
   s_useReturnVars = false;
diff --git a/quanta/parsers/saparser.h b/quanta/parsers/saparser.h
index d344fb55..01ea34e0 100644
--- a/quanta/parsers/saparser.h
+++ b/quanta/parsers/saparser.h
@@ -57,7 +57,7 @@ public:
                area. It may end before the end position.
   areaStartString: the special area starting string
   forcedAreaEndString: force this as the special area ending string.
-  tqparentNode: the Node under where the special area goes
+  parentNode: the Node under where the special area goes
   fullParse: the script node will be fully parsed for groups, structures or so. If false, only the script beginning and end will be determined.
   synchronous: if true, the function does not return until the parsing is finished, otherwise
   return immediately.
@@ -66,7 +66,7 @@ public:
   Node* parseArea(const AreaStruct &specialArea,
                   const TQString &areaStartString,
                   const TQString &forcedAreaEndString,
-                  Node *tqparentNode,
+                  Node *parentNode,
                   bool fullParse, bool synchronous);
   /** Returns the line where the last parsing run ended. */
   int lastParsedLine() {return m_lastParsedLine;}
@@ -97,7 +97,7 @@ private:
     int type;
     AreaStruct area;
     TQString startString;
-    Node *tqparentNode;
+    Node *parentNode;
     Node *lastNode;
   };
   enum ContextType {
diff --git a/quanta/parsers/tag.cpp b/quanta/parsers/tag.cpp
index f6460fce..a2dbcf71 100644
--- a/quanta/parsers/tag.cpp
+++ b/quanta/parsers/tag.cpp
@@ -328,7 +328,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write)
       {
         newTag = new TQTag();
         newTag->setName(name);
-        newTag->tqparentDTD = m_dtd;
+        newTag->parentDTD = m_dtd;
       }
       for (int i = 0; i >attrCount(); i++)
       {
@@ -574,7 +574,7 @@ void Tag::modifyAttributes(TQDict<TQString> *attrDict)
   {
     attribute = it.currentKey();
     value = *(it.current());
-    if (qTag && qTag->tqparentDTD->singleTagStyle == "xml" && attribute=="/")
+    if (qTag && qTag->parentDTD->singleTagStyle == "xml" && attribute=="/")
     {
      ++it;
      continue;
@@ -622,7 +622,7 @@ TQString Tag::toString()
   attrString.append(QuantaCommon::tagCase(name));
   tagString.prepend(attrString);
 
-  if (attrs.isEmpty() && qTag && qTag->tqparentDTD->singleTagStyle == "xml" &&
+  if (attrs.isEmpty() && qTag && qTag->parentDTD->singleTagStyle == "xml" &&
       (qTag->isSingle() ||
       (!qConfig.closeOptionalTags && qTag->isOptional()) || single)
      )
diff --git a/quanta/parts/kafka/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui
index e83d6303..de2293dd 100644
--- a/quanta/parts/kafka/htmldocumentpropertiesui.ui
+++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui
@@ -452,5 +452,5 @@
     <slot access="protected" specifier="pure virtual">CSSChanged(TQListViewItem * )</slot>
     <slot access="protected" specifier="pure virtual">linkChanged( const TQString&amp; )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp
index e9419799..b15d3c74 100644
--- a/quanta/parts/kafka/htmlenhancer.cpp
+++ b/quanta/parts/kafka/htmlenhancer.cpp
@@ -47,7 +47,7 @@ HTMLEnhancer::~HTMLEnhancer()
 	delete m_stddirs;
 }
 
-bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode)
+bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode)
 {
 	DOM::Node domNode, domNode2, attr, *ptDomNode;
 	bool tbody, goUp;
@@ -127,7 +127,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node ne
 	}
     
     TQTag* qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(),
-                                          tqparentDNode.nodeName().string());
+                                          parentDNode.nodeName().string());
 
 	//THEN tqreplace, if asked, scripts by a little icon.
     if(node->tag->type == Tag::ScriptTag && m_showIconForScripts && qTag->isChild("IMG", false))
@@ -160,7 +160,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node ne
 			kafkaCommon::editDomNodeAttribute(domNode, "img", m_wkafkapart->defaultDTD(),
 				"title", text, m_wkafkapart->getKafkaWidget()->document());
 
-			if(!kafkaCommon::insertDomNode(domNode, tqparentDNode, nextDNode))
+			if(!kafkaCommon::insertDomNode(domNode, parentDNode, nextDNode))
 				return false;
 			m_wkafkapart->connectDomNodeToQuantaNode(domNode, node);
 		}
@@ -196,7 +196,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node ne
             kafkaCommon::editDomNodeAttribute(domNode, "img", m_wkafkapart->defaultDTD(),
                 "title", text, m_wkafkapart->getKafkaWidget()->document());
 
-            if(!kafkaCommon::insertDomNode(domNode, tqparentDNode, nextDNode))
+            if(!kafkaCommon::insertDomNode(domNode, parentDNode, nextDNode))
                 return false;
             m_wkafkapart->connectDomNodeToQuantaNode(domNode, node);
         }
diff --git a/quanta/parts/kafka/htmlenhancer.h b/quanta/parts/kafka/htmlenhancer.h
index 73c62251..065654a4 100644
--- a/quanta/parts/kafka/htmlenhancer.h
+++ b/quanta/parts/kafka/htmlenhancer.h
@@ -47,10 +47,10 @@ public:
 	 * The DOM::Node must be built before calling this
 	 * function.
 	 * @param node The Node we want to enhance.
-	 * @param tqparentDNode the tqparent DOM::Node of the root DOM::Node of node.
+	 * @param parentDNode the tqparent DOM::Node of the root DOM::Node of node.
 	 * @param nextDNode the DOM::Node next to the root DOM::Node of node.
 	 */
-	virtual bool enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode);
+	virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode);
 
 	/**
 	 * This functions is called once the whole DOM::Node tree is built. It will add empty
diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp
index 0d15ca02..26aadd51 100644
--- a/quanta/parts/kafka/kafkacommon.cpp
+++ b/quanta/parts/kafka/kafkacommon.cpp
@@ -386,9 +386,9 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod
        !node->prev && getNodeDisplay(node->tqparent, true) == kafkaCommon::blockDisplay)
     {
         AreaStruct node_area = node->tag->area();
-        AreaStruct tqparent_area = node->tqparent->tag->area();
+        AreaStruct parent_area = node->tqparent->tag->area();
 
-        if(node_area.bLine == tqparent_area.bLine)
+        if(node_area.bLine == parent_area.bLine)
         {
             node->tag->setIndentationDone(true);
             return;
@@ -969,7 +969,7 @@ Node* kafkaCommon::createMandatoryNodeSubtree(Node *node, Document *doc)
         {
             if(it.data())
             {
-                nodeTQTag = QuantaCommon::tagFromDTD(nodeTQTag->tqparentDTD, it.key());
+                nodeTQTag = QuantaCommon::tagFromDTD(nodeTQTag->parentDTD, it.key());
                 if(!nodeTQTag)
                     return node;
                 currentParent = createAndInsertNode(nodeTQTag->name(), "", Tag::XmlTag, doc,
@@ -1404,10 +1404,10 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
             //node is not the first Child of parentNode, we have to duplicate parentNode, and put node and
             //all its next sibling as child of the new parentNode.
             /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
-            parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
+            parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
             parentNode, parentNode, modifs);*/
             newParentNode = duplicateNode(parentNode);
-            insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
+            insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
             child = parentNode->firstChild();
             if(cursorOffset != 0)
             {
@@ -1447,10 +1447,10 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
             //node is not the first Child of parentNode, we have to duplicate parentNode, and put node and
             //all its next sibling as child of the new parentNode.
             /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
-                parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
+                parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
                 parentNode, parentNode, modifs);*/
                 newParentNode = duplicateNode(parentNode);
-                insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
+                insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
                 child = parentNode->firstChild();
                 while(child /*&& child == endNode*/ &&
                       (child == endNode || child->hasForChild(endNode)/* ||
@@ -1670,10 +1670,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
             //node is not the first Child of parentNode, we have to duplicate parentNode, and put node and
             //all its next sibling as child of the new parentNode.
             /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
-            	parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
+            	parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
             	parentNode, parentNode, modifs);*/
             newParentNode = duplicateNode(parentNode);
-            insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
+            insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
             child = parentNode->firstChild();
             while(child && child != startNode && !child->hasForChild(startNode))
             {
@@ -1694,10 +1694,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
             //node is not the last Child of parentNode, we have to duplicate parentNode, and put all
             //the next sibling of node as child of the new parentNode
             /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
-            	parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
+            	parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
             	parentNode, parentNode, modifs);*/
             newParentNode = duplicateNode(parentNode);
-            insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
+            insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
             if(parentNode == commonParentStartChild)
                 commonParentStartChild = newParentNode;
             if(parentNode == commonParentEndChild)
@@ -1986,10 +1986,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
                     if (startSelection && endSelection)
                     {
                       /**copyNewNode = duplicateNode(newNode);
-                      insertNode(copyNewNode, startSelection->tqparentNode(), startSelection,
+                      insertNode(copyNewNode, startSelection->parentNode(), startSelection,
                         endSelection->next, modifs);*/
                       copyNewNode = duplicateNodeSubtree(newNode);
-                      insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection,
+                      insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
                                         endSelection->next, modifs);
                       nodeInserted = true;
                     }
@@ -2067,10 +2067,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
                 if (startSelection && endSelection)
                 {
                   /**copyNewNode = duplicateNode(newNode);
-                  insertNode(copyNewNode, startSelection->tqparentNode(), startSelection,
+                  insertNode(copyNewNode, startSelection->parentNode(), startSelection,
                     endSelection->next, modifs);*/
                   copyNewNode = duplicateNodeSubtree(newNode);
-                  insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection,
+                  insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
                                     endSelection->next, modifs);
                   nodeInserted = true;
                 }
@@ -2097,10 +2097,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
             while(endSelection && endSelection->tag->type == Tag::Empty)
                 endSelection = endSelection->prev;
             /**copyNewNode = duplicateNode(newNode);
-            insertNode(copyNewNode, startSelection->tqparentNode(), startSelection,
+            insertNode(copyNewNode, startSelection->parentNode(), startSelection,
             	endSelection->next, modifs);*/
             copyNewNode = duplicateNodeSubtree(newNode);
-            insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection,
+            insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
                               endSelection->next, modifs);
             nodeInserted = true;
         }
@@ -2643,7 +2643,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
                                 int startOffset, Node *endNode, int endOffset, Node **cursorNode, long &cursorOffset,
                                 NodeModifsSet *modifs)
 {
-    TQTag *nodeNameTQTag, *tqparentTQTag;
+    TQTag *nodeNameTQTag, *parentTQTag;
     Node *node, *lastNodeNameStartNode, *lastNodeNameEndNode;
     Node *parentNode, *newParentNode, *child, *next;
     bool goUp, nodesRemoved = false, DTDError = false, result;
@@ -2672,7 +2672,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
         return kafkaCommon::extractionBadParameters;
 
     //Then, process startNode and endNode : look if a nodeName tqparent is one of
-    //startNode/endNode's inline tqparents and if it is the case, split the necessary Nodes.
+    //startNode/endNode's inline parents and if it is the case, split the necessary Nodes.
     //The comparaison is made in lowercase, even in xml : it could be strange, for an user, to have
     //its nodes not removed because there are in the wrong case.
     node = startNode;
@@ -2730,7 +2730,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
             if(node != parentNode->firstChild())
             {
                 newParentNode = duplicateNode(parentNode);
-                insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
+                insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
                 child = parentNode->firstChild();
                 while(child && child != startNode && !child->hasForChild(startNode))
                 {
@@ -2752,7 +2752,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
             if(node != parentNode->SLastChild())
             {
                 newParentNode = duplicateNode(parentNode);
-                insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
+                insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
                 if(parentNode == lastNodeNameStartNode)
                     lastNodeNameStartNode = newParentNode;
                 child = parentNode->firstChild();
@@ -2782,13 +2782,13 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
         next = getNextNode(node, goUp);
         if(node->tag->type == Tag::XmlTag && node->tag->name.lower() == nodeName.lower())
         {
-            tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
-            if(tqparentTQTag)
+            parentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
+            if(parentTQTag)
             {
                 child = node->firstChild();
                 while(child)
                 {
-                    if(!tqparentTQTag->isChild(child))
+                    if(!parentTQTag->isChild(child))
                         DTDError = true;
                     child = child->next;
                 }
@@ -2951,7 +2951,7 @@ void kafkaCommon::splitStartNodeSubtree(Node* startNode, Node* commonParent,
         if(node != parentNode->firstChild())
         {
             Node* newParentNode = duplicateNode(parentNode);
-            insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
+            insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
             Node* child = parentNode->firstChild();
             while(child && child != startNode && !child->hasForChild(startNode))
             {
@@ -2989,7 +2989,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent,
         if(node != parentNode->lastChild())
         {
             Node* newParentNode = duplicateNode(parentNode);
-            insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
+            insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
             if(parentNode == commonParentStartChild)
                 commonParentStartChild = newParentNode;
             if(parentNode == commonParentEndChild)
@@ -3908,24 +3908,24 @@ bool kafkaCommon::isInline(DOM::Node domNode)
     return isInline(domNode.nodeName().string());
 }
 
-bool kafkaCommon::tqparentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
+bool kafkaCommon::parentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
                                  const DTDStruct* dtd)
 {
-    TQTag *tqparentTQTag;
+    TQTag *parentTQTag;
     DOM::Node child;
 
     if(!dtd || tqparent.isNull())
         return false;
 
-    tqparentTQTag = QuantaCommon::tagFromDTD(dtd, tqparent.nodeName().string());
+    parentTQTag = QuantaCommon::tagFromDTD(dtd, tqparent.nodeName().string());
 
-    if(!tqparentTQTag)
+    if(!parentTQTag)
         return false;
 
     child = startNode;
     while(!child.isNull())
     {
-        if(!tqparentTQTag->isChild(child.nodeName().string()))
+        if(!parentTQTag->isChild(child.nodeName().string()))
             return false;
         if(child == endNode)
             return true;
diff --git a/quanta/parts/kafka/kafkacommon.h b/quanta/parts/kafka/kafkacommon.h
index 0a1d25bd..fdec2aef 100644
--- a/quanta/parts/kafka/kafkacommon.h
+++ b/quanta/parts/kafka/kafkacommon.h
@@ -290,19 +290,19 @@ public:
 	 * WARNING : baseNode is used as the rootNode.
 	 * It will also try to merge text/Empty Nodes.
 	 * @param node The node to insert.
-	 * @param tqparentNode This Node will be the tqparent of node.
+	 * @param parentNode This Node will be the tqparent of node.
 	 * @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at
-	 * the child list of tqparentNode.
+	 * the child list of parentNode.
 	 * TODO: @param rootNode The rootNode of the tree we want to insert the Node (usually &baseNode).
 	 * @param modifs The changes made are logged into modifs. Put 0L if you don't want to log
 	 * and if you know what you're doing!
 	 * @param merge Try to merge with the siblings if possible.
 	 * @return Returns a pointer to the node inserted.
 	 */
-	static Node* insertNode(Node *node, Node* tqparentNode, Node* nextSibling,
+	static Node* insertNode(Node *node, Node* parentNode, Node* nextSibling,
                             NodeModifsSet *modifs/**, Node **rootNode*/, bool merge = true);
 
-    static Node* insertNode(Node *node, Node* tqparentNode, Node* nextSibling, NodeSelection& selection, 
+    static Node* insertNode(Node *node, Node* parentNode, Node* nextSibling, NodeSelection& selection, 
                             NodeModifsSet *modifs, bool merge = true);
  
 	/**
@@ -373,15 +373,15 @@ public:
 	 * WARNING : baseNode is used as the rootNode.
 	 * It will also try to merge text/Empty Nodes.
 	 * @param node The root node of the Node subtree to insert.
-	 * @param tqparentNode This Node will be the tqparent of node.
+	 * @param parentNode This Node will be the tqparent of node.
 	 * @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at
-	 * the child list of tqparentNode.
+	 * the child list of parentNode.
 	 * @param modifs The changes made are logged into modifs. Put 0L if you don't want to log
 	 * and if you know what you're doing!
 	 * @param merge Try to merge with the siblings if possible.
 	 * @return Returns a pointer to the node inserted.
 	 */
-	static Node* insertNodeSubtree(Node *node, Node* tqparentNode, Node* nextSibling,
+	static Node* insertNodeSubtree(Node *node, Node* parentNode, Node* nextSibling,
 		NodeModifsSet *modifs, bool merge = true);
 
 	/**
@@ -401,7 +401,7 @@ public:
 	 * @param modifs The changes made are logged into modifs.
 	 * @return Returns a pointer to the node inserted.
 	 */
-	static Node* insertNodeSubtree(Node *node, Node* tqparentNode, Node* nextSibling,
+	static Node* insertNodeSubtree(Node *node, Node* parentNode, Node* nextSibling,
                                    Node* nextEndSibling, NodeModifsSet *modifs, bool merge = true);
 
 	/**
@@ -414,7 +414,7 @@ public:
     static Node* DTDInsertNodeSubtree(Node *node, NodeSelectionInd& selection, 
                                       Node **cursorNode, long& cursorOffset, NodeModifsSet *modifs);
 	
-    static Node* DTDInsertNodeSubtree(Node* newNode, Node* tqparentNode, Node* nextSibling, 
+    static Node* DTDInsertNodeSubtree(Node* newNode, Node* parentNode, Node* nextSibling, 
                                       NodeSelection& cursorHolder, NodeModifsSet *modifs);
     
     /**
@@ -544,7 +544,7 @@ public:
     
     /**
      * Extract a node subtree in the tree. WARNING This function will log that the nodes were added.
-     * This funtion not only extract the start node but also will extract inline tqparents.
+     * This funtion not only extract the start node but also will extract inline parents.
      * @param startNode The node from which we start the removal.
      * @param startOffset The offset of startNode from which we start the removal.
      * @param endNode The node from which we end the removal.
@@ -576,7 +576,7 @@ public:
      * Get a node subtree from the tree. It is similar to extractNodeSubtree() 
      * but it doesn't extract anything. 
      * It's useful to get a copy of the Node subtree from a selection, for example.
-     * This funtion not only extract the start node but also will extract inline tqparents.
+     * This funtion not only extract the start node but also will extract inline parents.
      * @param startNode The starting Node.
      * @param startOffset If firstNode is a text, specify at which offset the new start Node will be splitted.
      * @param endNode The ending Node.
@@ -630,7 +630,7 @@ public:
 	 * @param nodeToMove The node to move :-)
 	 * @param newParent The new tqparent of nodeToMove.
      * @param newNextSibling The new next Sibling of nodeToMove. If null, node will be appended at
-     * the child list of tqparentNode.
+     * the child list of parentNode.
 	 * @param modifs The changes made are logged into modifs.
 	 * @param merge Specifies if it should try to merge the Node at its new location.
 	 */
@@ -855,7 +855,7 @@ public:
 	/**
 	 * Get the node's depth in the tree.
 	 * @param node The node we want the depth.
-	 * @return Returns the depth of node. It is basically the number of tqparents of node.
+	 * @return Returns the depth of node. It is basically the number of parents of node.
 	 * It will return 0 if node has no tqparent Nodes, and -1 if node doesn't exists.
 	 */
 	static int nodeDepth(Node *node);
@@ -991,12 +991,12 @@ public:
 	static int childPosition(DOM::Node domNode);
 
 	/**
-	 * Returns the position'th child of tqparentNode.
-	 * @param tqparentNode The tqparent Node of the node to return.
+	 * Returns the position'th child of parentNode.
+	 * @param parentNode The tqparent Node of the node to return.
 	 * @param position We return the position'th child Node.
 	 * @param fallback If set to true, it will always return a valid Node (except if there is no child!!)
 	 */
-	static DOM::Node getChildNode(DOM::Node tqparentNode, int position, bool fallback = false);
+	static DOM::Node getChildNode(DOM::Node parentNode, int position, bool fallback = false);
 
 	/**
 	 * Specify if a DOM::Node is inline (as specified in isInline()) or text.
@@ -1008,7 +1008,7 @@ public:
 	 * Specify if tqparent supports the siblings DOM::Nodes starting from startNode to endNode
 	 * according to the DTD dtd.
 	 */
-	static bool tqparentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
+	static bool parentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
 		const DTDStruct* dtd);
     
 
diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp
index 4dfe3f7d..ed31f049 100644
--- a/quanta/parts/kafka/kafkahtmlpart.cpp
+++ b/quanta/parts/kafka/kafkahtmlpart.cpp
@@ -1034,12 +1034,12 @@ void KafkaWidget::keyDelete()
             }
             else if(isParent && !nextIsBlock)
             {
-                if(kafkaCommon::tqparentSupports(toplevelBlock, startNode2, endNode2,
+                if(kafkaCommon::parentSupports(toplevelBlock, startNode2, endNode2,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock, startNode2, endNode2, DOM::Node(), false);
                 else
                 {
-                    if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
+                    if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
                                                    w->getCurrentDoc()->defaultDTD()))
                         moveDomNodes(commonParent, startNode, endNode, childOfCommonParent2,
                                      true);
@@ -1051,13 +1051,13 @@ void KafkaWidget::keyDelete()
             }
             else if(isParent && nextIsBlock)
             {
-                if(kafkaCommon::tqparentSupports(toplevelBlock, startNode2, endNode2,
+                if(kafkaCommon::parentSupports(toplevelBlock, startNode2, endNode2,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock, startNode2, endNode2, DOM::Node(), false);
                 else
                 {
-                    if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
-                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::tqparentSupports(
+                    if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
+                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::parentSupports(
                                 commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD()))
                     {
                         moveDomNodes(commonParent, startNode, endNode, childOfCommonParent,
@@ -1073,7 +1073,7 @@ void KafkaWidget::keyDelete()
             }
             else if(!isParent && nextIsBlock)
             {
-                if(kafkaCommon::tqparentSupports(commonParent, startNode2, endNode2,
+                if(kafkaCommon::parentSupports(commonParent, startNode2, endNode2,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(commonParent, startNode2, endNode2, childOfCommonParent2, true);
                 else
@@ -1460,13 +1460,13 @@ void KafkaWidget::keyBackspace()
             }
             else if(isParent && !prevIsBlock)
             {
-                if(kafkaCommon::tqparentSupports(toplevelBlock2, startNode, endNode,
+                if(kafkaCommon::parentSupports(toplevelBlock2, startNode, endNode,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock2, startNode, endNode, toplevelBlock2.firstChild(),
                                  true);
                 else
                 {
-                    if(kafkaCommon::tqparentSupports(commonParent, startNode2, endNode2,
+                    if(kafkaCommon::parentSupports(commonParent, startNode2, endNode2,
                                                    w->getCurrentDoc()->defaultDTD()))
                         moveDomNodes(commonParent, startNode2, endNode2,
                                      childOfCommonParent2, true);
@@ -1478,14 +1478,14 @@ void KafkaWidget::keyBackspace()
             }
             else if(isParent && prevIsBlock)
             {
-                if(kafkaCommon::tqparentSupports(toplevelBlock2, startNode, endNode,
+                if(kafkaCommon::parentSupports(toplevelBlock2, startNode, endNode,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock2, startNode, endNode, toplevelBlock2.firstChild(),
                                  true);
                 else
                 {
-                    if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
-                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::tqparentSupports(
+                    if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
+                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::parentSupports(
                                 commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD()))
                     {
                         moveDomNodes(commonParent, startNode, endNode, childOfCommonParent,
@@ -1501,7 +1501,7 @@ void KafkaWidget::keyBackspace()
             }
             else if(!isParent && prevIsBlock)
             {
-                if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
+                if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(commonParent, startNode, endNode, childOfCommonParent, false);
                 else
diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h
index 9365f925..c0c1012f 100644
--- a/quanta/parts/kafka/kafkahtmlpart.h
+++ b/quanta/parts/kafka/kafkahtmlpart.h
@@ -114,7 +114,7 @@ public:
 
     /**
      * It will move DOM::Nodes from startNode to endNode as tqchildren of newParent. It does NOT check
-     * if the move is valid, so it may crash. Please check before with kafkaCommon::tqparentSupports().
+     * if the move is valid, so it may crash. Please check before with kafkaCommon::parentSupports().
      * @param newParent The new tqparent of the DOM::Nodes.
      * @param startNode The first node to move.
      * @param endNode Starting from endNode, the last sibling to move.
diff --git a/quanta/parts/kafka/kafkasyncoptionsui.ui b/quanta/parts/kafka/kafkasyncoptionsui.ui
index 54d7d5d0..509ab551 100644
--- a/quanta/parts/kafka/kafkasyncoptionsui.ui
+++ b/quanta/parts/kafka/kafkasyncoptionsui.ui
@@ -192,5 +192,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/parts/kafka/nodeenhancer.h b/quanta/parts/kafka/nodeenhancer.h
index 22737082..6e8bc44c 100644
--- a/quanta/parts/kafka/nodeenhancer.h
+++ b/quanta/parts/kafka/nodeenhancer.h
@@ -45,10 +45,10 @@ public:
 	 * The DOM::Node must be built before calling this
 	 * function.
 	 * @param node The Node we want to enhance.
-	 * @param tqparentDNode the tqparent DOM::Node of the root DOM::Node of node.
+	 * @param parentDNode the tqparent DOM::Node of the root DOM::Node of node.
 	 * @param nextDNode the DOM::Node next to the root DOM::Node of node.
 	 */
-	virtual bool enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode) = 0;
+	virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode) = 0;
 
 	/**
 	 * This function apply some modifications once the whole DOM::Node tree is built.
diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp
index 8eb6cfbe..85f23398 100644
--- a/quanta/parts/kafka/undoredo.cpp
+++ b/quanta/parts/kafka/undoredo.cpp
@@ -703,10 +703,10 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                                   {
                                           //try
                                           //{
-                                                  dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode);
+                                                  dn = n->_rootNode.parentNode().removeChild(n->_rootNode);
                                           //} catch(DOM::DOMException e) {kafkaSyncError();}
                                           //try{
-                                                  domNode.tqparentNode().insertBefore(dn, domNode);
+                                                  domNode.parentNode().insertBefore(dn, domNode);
                                           //} catch(DOM::DOMException e) {}
                                   }
                                   else if(n->tag->type == Tag::XmlTag || n->tag->type == Tag::Text)
@@ -733,7 +733,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                           }
                   }
                   //try{
-                          domNode.tqparentNode().removeChild(domNode);
+                          domNode.parentNode().removeChild(domNode);
                   //} catch(DOM::DOMException e) {kafkaSyncError();}
           }
           else if(_node->tag->type == Tag::XmlTagEnd && _node->closesPrevious &&
@@ -764,9 +764,9 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                                   {
                                           kafkaInterface->disconnectDomNodeFromQuantaNode(dm);
                                           //try{
-                                                  dm.tqparentNode().removeChild(dm);
+                                                  dm.parentNode().removeChild(dm);
                                           //} catch(DOM::DOMException e) {kafkaSyncError();}
-                                          dm = kafkaCommon::getNextDomNode(dm, goUp, false, domNode.tqparentNode());
+                                          dm = kafkaCommon::getNextDomNode(dm, goUp, false, domNode.parentNode());
                                   }
                           }
                           else
@@ -775,7 +775,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                                   while(!domNode.nextSibling().isNull())
                                   {
                                           //try{
-                                                  dn = domNode.tqparentNode().removeChild(domNode.nextSibling());
+                                                  dn = domNode.parentNode().removeChild(domNode.nextSibling());
                                           //} catch(DOM::DOMException e) {kafkaSyncError();}
                                           //try{
                                                   domNode2.appendChild(dn);
@@ -788,7 +788,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                           while(!domNode.nextSibling().isNull())
                           {
                                   //try{
-                                          dn = domNode.tqparentNode().removeChild(domNode.nextSibling());
+                                          dn = domNode.parentNode().removeChild(domNode.nextSibling());
                                   //} catch(DOM::DOMException e) {kafkaSyncError();}
                                   //try{
                                           domNode2.appendChild(dn);
@@ -810,7 +810,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                   return true;//no kafka node here, due to an invalid pos.
           domNode = _node->_rootNode;
           //try{
-                  domNode.tqparentNode().removeChild(domNode);
+                  domNode.parentNode().removeChild(domNode);
           //} catch(DOM::DOMException e) {kafkaSyncError();}
           kafkaInterface->disconnectDomNodeFromQuantaNode(domNode);
           kafkaInterface->buildKafkaNodeFromNode(_node);
@@ -837,7 +837,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                                   if(!n->_rootNode.isNull())
                                   {
                                           //try{
-                                                  dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode);
+                                                  dn = n->_rootNode.parentNode().removeChild(n->_rootNode);
                                           //} catch(DOM::DOMException e) {kafkaSyncError();}
                                           //try{
                                                   domNode.appendChild(dn);
@@ -857,10 +857,10 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                           if(!n->_rootNode.isNull())
                           {
                                   //try{
-                                          dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode);
+                                          dn = n->_rootNode.parentNode().removeChild(n->_rootNode);
                                   //} catch(DOM::DOMException e) {kafkaSyncError();}
                                   //try{
-                                          domNode.tqparentNode().appendChild(dn);
+                                          domNode.parentNode().appendChild(dn);
                                   //} catch(DOM::DOMException e) {}
                           }
                           else if(n->tag->type == Tag::XmlTag || n->tag->type == Tag::Text)
diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp
index 6eae1afc..91c32106 100644
--- a/quanta/parts/kafka/wkafkapart.cpp
+++ b/quanta/parts/kafka/wkafkapart.cpp
@@ -526,9 +526,9 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
         else
             canInsertEmptyNode = kafkaCommon::hasParent(node, "body");
 
-        Node* tqparent_node = node->tqparent;
-        TQTag* tqparent_node_description_tag = QuantaCommon::tagFromDTD(tqparent_node);
-        if(tqparent_node_description_tag && !tqparent_node_description_tag->isChild(node, false, true))
+        Node* parent_node = node->tqparent;
+        TQTag* parent_node_description_tag = QuantaCommon::tagFromDTD(parent_node);
+        if(parent_node_description_tag && !parent_node_description_tag->isChild(node, false, true))
             canInsertEmptyNode = false;
     }
 
@@ -1930,7 +1930,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
 	Node *node = 0L;
 	NodeModif *modif;
 	kNodeAttrs *props, *newProps;
-	DOM::Node newDomNode, tqparentDomNode, nextSiblingDomNode;
+	DOM::Node newDomNode, parentDomNode, nextSiblingDomNode;
 	DOM::Node *ptDomNode;
 	TQTag *qTag;
 
@@ -1985,7 +1985,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
 			//let's create the corresponding Text Node and the P tag only if necessary
 			modifs = new NodeModifsSet();
 			modif = new NodeModif();
-			tqparentDomNode = domNode.parentNode();
+			parentDomNode = domNode.parentNode();
 			nextSiblingDomNode = domNode.nextSibling();
 
 			if(!qTag->isChild("#text", false))
@@ -1993,7 +1993,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
 				newDomNode = kafkaCommon::createDomNode("p",
 					getNode(domNode.parentNode())->tag->dtd(), m_kafkaPart->document());
 				kafkaCommon::removeDomNode(domNode);
-				kafkaCommon::insertDomNode(newDomNode, tqparentDomNode, nextSiblingDomNode);
+				kafkaCommon::insertDomNode(newDomNode, parentDomNode, nextSiblingDomNode);
 				kafkaCommon::insertDomNode(domNode, newDomNode);
 
 				node = kafkaCommon::createNode("p", "", Tag::XmlTag, m_currentDoc);
@@ -2002,12 +2002,12 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
 				node->setRootNode(ptDomNode);
 				ptDomNode = new DOM::Node(newDomNode);
 				node->setLeafNode(ptDomNode);
-				node = kafkaCommon::insertNode(node, getNode(tqparentDomNode),
+				node = kafkaCommon::insertNode(node, getNode(parentDomNode),
 					getNode(nextSiblingDomNode), getNode(nextSiblingDomNode), modifs);
 				newProps->setNode(node);
 				modifs->addNodeModif(modif);
 
-				tqparentDomNode = newDomNode;
+				parentDomNode = newDomNode;
 				nextSiblingDomNode = DOM::Node();
 				modif = new NodeModif();
 			}
@@ -2019,7 +2019,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
 			ptDomNode = new DOM::Node(domNode);
 			node->setLeafNode(ptDomNode);
 			//avoid the merging of Text Nodes
-			node = kafkaCommon::insertNode(node, getNode(tqparentDomNode),
+			node = kafkaCommon::insertNode(node, getNode(parentDomNode),
 				getNode(nextSiblingDomNode), modifs, false);
 			props->setNode(node);
 			modifs->addNodeModif(modif);
diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp
index 068bc9d3..bfac210f 100644
--- a/quanta/parts/preview/whtmlpart.cpp
+++ b/quanta/parts/preview/whtmlpart.cpp
@@ -33,11 +33,11 @@
 #include "whtmlpart.h"
 #include "resource.h"
 
-WHTMLPart::WHTMLPart(TQWidget *tqparentWidget, const char *widgetName, bool enableViewSource, 
+WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enableViewSource, 
             TQObject *tqparent, const char *name, GUIProfile prof)
-  : KHTMLPart(tqparentWidget, widgetName, tqparent, name, prof), m_contextMenu(0)
+  : KHTMLPart(parentWidget, widgetName, tqparent, name, prof), m_contextMenu(0)
 {
-  //kdDebug(24000) << "WHTMLPart: " << tqparentWidget << " " << widgetName << " " << tqparent << " " << name << this << endl;
+  //kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << tqparent << " " << name << this << endl;
    hpos = 0;
    // get settings from konq.
    KConfig konqConfig("konquerorrc");
@@ -52,7 +52,7 @@ WHTMLPart::WHTMLPart(TQWidget *tqparentWidget, const char *widgetName, bool enab
    m_enableViewSource = enableViewSource;
    if (m_enableViewSource)
    {
-    m_contextMenu = new KPopupMenu(tqparentWidget);
+    m_contextMenu = new KPopupMenu(parentWidget);
     m_contextMenu->insertItem(i18n("View &Document Source"), this, TQT_SLOT(slotViewSource()));
     
     connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQT_SLOT(popupMenu(const TQString&, const TQPoint&)));
@@ -149,13 +149,13 @@ bool WHTMLPart::forwardEnable()
    return hpos < history.count()-1;
 }
 
-KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * tqparentWidget, const char *widgetName, 
+KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * parentWidget, const char *widgetName, 
                                             TQObject *tqparent, const char *name,
                                             const TQString &, TQString &,
                                             TQStringList &, const TQStringList &)
 {
-  //kdDebug(24000) << "Create WHTMLPart: " << tqparentWidget << " " << widgetName << " " << tqparent << " " << name << endl;
-  return new WHTMLPart(tqparentWidget, widgetName, m_enableViewSource, tqparent, name);
+  //kdDebug(24000) << "Create WHTMLPart: " << parentWidget << " " << widgetName << " " << tqparent << " " << name << endl;
+  return new WHTMLPart(parentWidget, widgetName, m_enableViewSource, tqparent, name);
 }
 
 bool WHTMLPart::eventFilter(TQObject *watched, TQEvent *e)
diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h
index 4133b045..91f88b1e 100644
--- a/quanta/parts/preview/whtmlpart.h
+++ b/quanta/parts/preview/whtmlpart.h
@@ -31,7 +31,7 @@ class WHTMLPart : public KHTMLPart  {
    Q_OBJECT
   TQ_OBJECT
 public:
-  WHTMLPart(TQWidget *tqparentWidget = 0, const char *widgetname = 0, bool enableViewSource = false,
+  WHTMLPart(TQWidget *parentWidget = 0, const char *widgetname = 0, bool enableViewSource = false,
             TQObject *tqparent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
   virtual ~WHTMLPart();
 
@@ -61,7 +61,7 @@ signals:
 
 protected:
   virtual void urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs());
-  virtual KParts::ReadOnlyPart *createPart( TQWidget *tqparentWidget, const char *widgetName,
+  virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *tqparent, const char *name,
                                             const TQString &mimetype, TQString &serviceName,
                                             TQStringList &serviceTypes, const TQStringList &params);
diff --git a/quanta/plugins/pluginconfig.ui b/quanta/plugins/pluginconfig.ui
index 03f6de6d..17f1d8f0 100644
--- a/quanta/plugins/pluginconfig.ui
+++ b/quanta/plugins/pluginconfig.ui
@@ -263,7 +263,7 @@
     <slot>pluginType_highlighted(const QString&amp;)</slot>
     <slot>slotPluginTypeHighlighted(const QString&amp;)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kicondialog.h</includehint>
 </includehints>
diff --git a/quanta/plugins/plugineditor.ui b/quanta/plugins/plugineditor.ui
index 5188166c..d464cadb 100644
--- a/quanta/plugins/plugineditor.ui
+++ b/quanta/plugins/plugineditor.ui
@@ -204,5 +204,5 @@
     <tabstop>refreshButton</tabstop>
     <tabstop>pluginList</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui
index a9f8461d..98aadf20 100644
--- a/quanta/project/eventconfigurationdlgs.ui
+++ b/quanta/project/eventconfigurationdlgs.ui
@@ -216,7 +216,7 @@
     <slot>slotAddEvent()</slot>
     <slot>slotDeleteEvent()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui
index ba10f39b..d93b1336 100644
--- a/quanta/project/eventeditordlgs.ui
+++ b/quanta/project/eventeditordlgs.ui
@@ -232,5 +232,5 @@
 <Q_SLOTS>
     <slot>slotActionChanged(const QString &amp;name)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/membereditdlgs.ui b/quanta/project/membereditdlgs.ui
index f8d22bbe..422ae876 100644
--- a/quanta/project/membereditdlgs.ui
+++ b/quanta/project/membereditdlgs.ui
@@ -181,7 +181,7 @@
     <slot>slotMemberSelected()</slot>
     <slot>slotSelectFromAddrBook()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index aa80e4f3..98b21135 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -149,10 +149,10 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint )
       el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(url, d->baseURL) ));
       d->dom.firstChild().firstChild().appendChild( el );
       KURL u = url.upURL();
-      ProjectURL *tqparentURL = d->m_projectFiles.tqfind(u);
+      ProjectURL *parentURL = d->m_projectFiles.tqfind(u);
       int uploadtqStatus = 1;
-      if (tqparentURL)
-        uploadtqStatus = tqparentURL->uploadtqStatus;
+      if (parentURL)
+        uploadtqStatus = parentURL->uploadtqStatus;
       d->m_projectFiles.insert( new ProjectURL(url, "", uploadtqStatus, false, el) );
     }
     url.setPath(url.directory(false));
@@ -658,14 +658,14 @@ void Project::slotOptions()
 
     el = projectNode.namedItem("author").toElement();
     if (!el.isNull())
-       el.tqparentNode().removeChild(el);
+       el.parentNode().removeChild(el);
     el =d->dom.createElement("author");
     projectNode.appendChild( el );
     el.appendChild(d->dom.createTextNode( d->author ) );
 
     el = projectNode.namedItem("email").toElement();
     if (!el.isNull())
-       el.tqparentNode().removeChild(el);
+       el.parentNode().removeChild(el);
     el =d->dom.createElement("email");
     projectNode.appendChild( el );
     el.appendChild(d->dom.createTextNode( d->email ) );
@@ -673,7 +673,7 @@ void Project::slotOptions()
     // Debugger
     el =projectNode.namedItem("debuggerclient").toElement();
     if (!el.isNull())
-       el.tqparentNode().removeChild(el);
+       el.parentNode().removeChild(el);
     el =d->dom.createElement("debuggerclient");
     projectNode.appendChild( el );
     el.appendChild(d->dom.createTextNode( d->debuggerClient ) );
@@ -684,7 +684,7 @@ void Project::slotOptions()
     excludeStr = optionsPage.lineExclude->text();
     el =projectNode.namedItem("exclude").toElement();
     if (!el.isNull())
-       el.tqparentNode().removeChild(el);
+       el.parentNode().removeChild(el);
     el =d->dom.createElement("exclude");
     if (d->m_excludeCvsignore)
       el.setAttribute("cvsignore", "true");
@@ -1389,7 +1389,7 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa
     QuantaCommon::setUrl(u2, el.attribute("url"));
     if (!tqcontains(u2))
     {
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     }
   }
 }
diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp
index 82b4d86e..26c3da8a 100644
--- a/quanta/project/projectlist.cpp
+++ b/quanta/project/projectlist.cpp
@@ -74,7 +74,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
     {
       if (excludeRx.exactMatch(path) || tqfind(url.url(-1)))
       {
-        el.tqparentNode().removeChild(el);
+        el.parentNode().removeChild(el);
         modified = true;
         i--;
       } else
@@ -89,7 +89,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
           TQFileInfo fi( url.path() );
           if ( !fi.exists() )
           {
-            el.tqparentNode().removeChild( el );
+            el.parentNode().removeChild( el );
             modified = true;
             i--;
           } else
@@ -129,7 +129,7 @@ bool ProjectList::removeFromListAndXML(const KURL &url)
   ProjectURL *p = tqfind(url);
   if (p) {
     TQDomElement el = p->domElement;
-    el.tqparentNode().removeChild(el);
+    el.parentNode().removeChild(el);
     remove(url.url(-1));
     return true;
   }
diff --git a/quanta/project/projectnewfinals.ui b/quanta/project/projectnewfinals.ui
index 50cb98f4..136245bb 100644
--- a/quanta/project/projectnewfinals.ui
+++ b/quanta/project/projectnewfinals.ui
@@ -41,9 +41,9 @@
             <height>32000</height>
         </size>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -292,5 +292,5 @@
     <tabstop>insertGlobalTemplates</tabstop>
     <tabstop>insertLocalTemplates</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/projectnewgenerals.ui b/quanta/project/projectnewgenerals.ui
index d64b0e92..8176cb04 100644
--- a/quanta/project/projectnewgenerals.ui
+++ b/quanta/project/projectnewgenerals.ui
@@ -44,9 +44,9 @@
             <height>32000</height>
         </size>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -450,5 +450,5 @@
     <tabstop>radioLocal</tabstop>
     <tabstop>radioWeb</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui
index 7ebdc26f..56ca7775 100644
--- a/quanta/project/projectnewlocals.ui
+++ b/quanta/project/projectnewlocals.ui
@@ -41,9 +41,9 @@
             <height>32000</height>
         </size>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -337,7 +337,7 @@
     <tabstop>addFolder</tabstop>
     <tabstop>clearList</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>uploadtreeview.h</includehint>
 </includehints>
diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui
index 97b7fc7f..4711434a 100644
--- a/quanta/project/projectnewwebs.ui
+++ b/quanta/project/projectnewwebs.ui
@@ -41,9 +41,9 @@
             <height>32000</height>
         </size>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -283,7 +283,7 @@
     <tabstop>commandLine</tabstop>
     <tabstop>button</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kled.h</includehint>
     <includehint>uploadtreeview.h</includehint>
diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui
index a2879e94..9a577bdd 100644
--- a/quanta/project/projectoptions.ui
+++ b/quanta/project/projectoptions.ui
@@ -536,5 +536,5 @@
     <slot>buttonToolbar_clicked()</slot>
     <slot>comboDebuggerClient_activated( int idx )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index e5a9e8e5..a481b309 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -887,7 +887,7 @@ void ProjectPrivate::slotDeleteProjectView(const TQString &view)
     el = node.cloneNode().toElement();
     if (el.attribute("name") == view)
     {
-      node.tqparentNode().removeChild(node);
+      node.parentNode().removeChild(node);
       if (currentProjectView == view)
         currentProjectView = "";
       tqparent->setModified();
@@ -919,7 +919,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
           KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>A project view named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>")
                                             .tqarg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue)
       {
-        node.tqparentNode().removeChild(node);
+        node.parentNode().removeChild(node);
         break;
       } else
       {
@@ -1095,7 +1095,7 @@ void ProjectPrivate::getStatusFromTree()
   for ( unsigned int i = 0; i < nl.count(); i++ )
   {
     el = nl.item(i).toElement();
-    el.tqparentNode().removeChild( el );
+    el.parentNode().removeChild( el );
     i--;
   }
   TQStringList folderList;
@@ -1263,7 +1263,7 @@ bool ProjectPrivate::saveProject()
     el = nl.item(i).toElement();
     if ( el.nodeName() == "openfile" )
     {
-      el.tqparentNode().removeChild( el );
+      el.parentNode().removeChild( el );
       i--;
     }
   }
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index 5502198f..74f59ddf 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -800,7 +800,7 @@ void ProjectUpload::loadRemoteUploadInfo()
 
 void ProjectUpload::saveRemoteUploadInfo()
 {
-    TQDomNode tqparent = m_currentProfileElement.tqparentNode();
+    TQDomNode tqparent = m_currentProfileElement.parentNode();
     TQDomNode profileNode = m_currentProfileElement.cloneNode(false);
     tqparent.removeChild(m_currentProfileElement);
     tqparent.appendChild(profileNode);
diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui
index 9c94e17f..3bc4e83a 100644
--- a/quanta/project/projectuploads.ui
+++ b/quanta/project/projectuploads.ui
@@ -490,7 +490,7 @@
     <slot>slotRemoveProfile()</slot>
     <slot>slotNewProfileSelected(const QString&amp;)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>uploadtreeview.h</includehint>
 </includehints>
diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui
index 8cdafab6..019f40a7 100644
--- a/quanta/project/rescanprjdir.ui
+++ b/quanta/project/rescanprjdir.ui
@@ -247,7 +247,7 @@
     <tabstop>buttonCancel</tabstop>
     <tabstop>buttonHelp</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>uploadtreeview.h</includehint>
diff --git a/quanta/project/subprojecteditdlgs.ui b/quanta/project/subprojecteditdlgs.ui
index ac9470ed..d1a0a168 100644
--- a/quanta/project/subprojecteditdlgs.ui
+++ b/quanta/project/subprojecteditdlgs.ui
@@ -69,5 +69,5 @@
     <tabstop>locationEdit</tabstop>
     <tabstop>createNew</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui
index 0949cf88..eba26cf6 100644
--- a/quanta/project/teammembersdlgs.ui
+++ b/quanta/project/teammembersdlgs.ui
@@ -237,7 +237,7 @@
     <slot>slotDeleteMember()</slot>
     <slot>slotSetToYourself()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui
index 9d36a26e..40fbd905 100644
--- a/quanta/project/uploadprofiledlgs.ui
+++ b/quanta/project/uploadprofiledlgs.ui
@@ -306,5 +306,5 @@ is obscured, saving the password in any file is a security risk. Use this option
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/uploadprofiles.cpp b/quanta/project/uploadprofiles.cpp
index 779903ab..13df5eda 100644
--- a/quanta/project/uploadprofiles.cpp
+++ b/quanta/project/uploadprofiles.cpp
@@ -60,7 +60,7 @@ bool UploadProfiles::removeFromMapAndXML(const TQString &name)
     return false;
   // ok now remove
   TQDomElement el = (*it).domElement;
-  el.tqparentNode().removeChild(el);
+  el.parentNode().removeChild(el);
   erase(name);
   return true;
 }
diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui
index bd5ce2e4..466dbc27 100644
--- a/quanta/project/uploadprofilespage.ui
+++ b/quanta/project/uploadprofilespage.ui
@@ -121,5 +121,5 @@
 <Q_SLOTS>
     <slot>buttonEditProfiles_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi
index a7cd94c0..3f547a50 100644
--- a/quanta/quanta_uml.xmi
+++ b/quanta/quanta_uml.xmi
@@ -104,7 +104,7 @@
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="243" type="uint" abstract="0" documentation="" name="readTagFile" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="244" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fileName" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="245" value="" type="DTDStruct *" abstract="0" documentation="" name="tqparentDTD" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="245" value="" type="DTDStruct *" abstract="0" documentation="" name="parentDTD" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="246" value="" type="QTagList *" abstract="0" documentation="" name="tagList" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="247" type="void" abstract="0" documentation="" name="removeContainer" static="0" scope="200" >
@@ -765,7 +765,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Attribute stereotype="" package="" xmi.id="660" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="commonGroups" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="661" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_fileName" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="662" value="" type="bool" abstract="0" documentation="" name="optional" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="663" value="" type="DTDStruct *" abstract="0" documentation="" name="tqparentDTD" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="663" value="" type="DTDStruct *" abstract="0" documentation="" name="parentDTD" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="664" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="returnType" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="665" value="" type="bool" abstract="0" documentation="" name="single" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="666" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="stoppingTags" static="0" scope="200" />
@@ -1088,12 +1088,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="950" abstract="0" documentation="An extended KListViewItem for folders." name="FilesTreeFolder" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="955" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="956" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="956" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="957" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="958" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="959" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="960" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="960" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="961" value="" type="const QString &amp;" abstract="0" documentation="" name="p_name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="962" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
@@ -1122,8 +1122,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="980" type="virtual " abstract="0" documentation="" name="~FilesTreeFolder" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="951" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="952" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparentFolder" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="953" value="" type="FilesTreeView *" abstract="0" documentation="" name="tqparentView" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="952" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parentFolder" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="953" value="" type="FilesTreeView *" abstract="0" documentation="" name="parentView" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="954" value="" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="981" abstract="0" documentation="An extended KLIstViewItem for files." name="FilesTreeFile" static="0" scope="200" >
@@ -1218,16 +1218,16 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="1053" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1054" type="virtual " abstract="0" documentation="" name="~UploadTreeFolder" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1034" value="" type="KURL" abstract="0" documentation="" name="m_url" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="1035" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="tqparentFolder" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="1035" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parentFolder" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1055" abstract="0" documentation="Item for project folders." name="ProjectTreeFolder" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1059" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1060" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1060" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1061" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1062" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1063" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1064" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1064" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1065" value="" type="const QString &amp;" abstract="0" documentation="" name="name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1066" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
@@ -1251,7 +1251,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="1080" type="void" abstract="0" documentation="" name="setup" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1081" type="" abstract="0" documentation="" name="~ProjectTreeFolder" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1056" value="" type="QPtrList" abstract="0" documentation="" name="filesTreeList" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="1057" value="" type="ProjectTreeView *" abstract="0" documentation="" name="tqparentView" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="1057" value="" type="ProjectTreeView *" abstract="0" documentation="" name="parentView" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="1058" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="path" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1082" abstract="0" documentation="Item for project files. It's different from a standard file as the project files are basically XML tag elements." name="ProjectTreeFile" static="0" scope="200" >
@@ -2637,8 +2637,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="815" id="968" label="init" />
       <listitem open="0" type="815" id="969" label="key" />
       <listitem open="0" type="814" id="951" label="name" />
-      <listitem open="0" type="814" id="952" label="tqparentFolder" />
-      <listitem open="0" type="814" id="953" label="tqparentView" />
+      <listitem open="0" type="814" id="952" label="parentFolder" />
+      <listitem open="0" type="814" id="953" label="parentView" />
       <listitem open="0" type="815" id="972" label="setOpen" />
       <listitem open="0" type="815" id="974" label="setup" />
       <listitem open="0" type="815" id="975" label="sortChildItems" />
@@ -2807,7 +2807,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="814" id="1056" label="filesTreeList" />
       <listitem open="0" type="815" id="1069" label="insertItem" />
       <listitem open="0" type="815" id="1072" label="paintCell" />
-      <listitem open="0" type="814" id="1057" label="tqparentView" />
+      <listitem open="0" type="814" id="1057" label="parentView" />
       <listitem open="0" type="814" id="1058" label="path" />
       <listitem open="0" type="815" id="1078" label="setOpen" />
       <listitem open="0" type="815" id="1080" label="setup" />
@@ -2875,7 +2875,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="814" id="661" label="m_fileName" />
       <listitem open="0" type="815" id="685" label="name" />
       <listitem open="0" type="814" id="662" label="optional" />
-      <listitem open="0" type="814" id="663" label="tqparentDTD" />
+      <listitem open="0" type="814" id="663" label="parentDTD" />
       <listitem open="0" type="814" id="664" label="returnType" />
       <listitem open="0" type="815" id="686" label="setFileName" />
       <listitem open="0" type="815" id="688" label="setName" />
@@ -3395,7 +3395,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="815" id="1044" label="fullName" />
       <listitem open="0" type="815" id="1045" label="key" />
       <listitem open="0" type="814" id="1034" label="m_url" />
-      <listitem open="0" type="814" id="1035" label="tqparentFolder" />
+      <listitem open="0" type="814" id="1035" label="parentFolder" />
       <listitem open="0" type="815" id="1048" label="setOpen" />
       <listitem open="0" type="815" id="1050" label="setWhichPixmap" />
       <listitem open="0" type="815" id="1052" label="setup" />
diff --git a/quanta/scripts/TemplateMagic.pl b/quanta/scripts/TemplateMagic.pl
index 261cd791..400187d1 100644
--- a/quanta/scripts/TemplateMagic.pl
+++ b/quanta/scripts/TemplateMagic.pl
@@ -217,7 +217,7 @@ print OFH <<E
           </property>
       </widget>
   </widget>
-  <tqlayoutdefaults spacing="6" margin="11"/>
+  <layoutdefaults spacing="6" margin="11"/>
   </UI>
 
 E
diff --git a/quanta/scripts/checkxml.kmdr b/quanta/scripts/checkxml.kmdr
index 27853adf..07d72ddd 100755
--- a/quanta/scripts/checkxml.kmdr
+++ b/quanta/scripts/checkxml.kmdr
@@ -282,5 +282,5 @@ checkXML index.docbook 2&gt;&amp;1</string>
     <tabstop>ExecButton2</tabstop>
     <tabstop>CloseButton1</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/docbook_table.kmdr b/quanta/scripts/docbook_table.kmdr
index b8f30a4e..b3ac688e 100755
--- a/quanta/scripts/docbook_table.kmdr
+++ b/quanta/scripts/docbook_table.kmdr
@@ -246,5 +246,5 @@ echo '   &lt;/thead&gt;';</string>
     <tabstop>CloseButton1</tabstop>
     <tabstop>CloseButton1_2</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/dwt.kmdr b/quanta/scripts/dwt.kmdr
index 94eb7fbf..7a9b3ff6 100755
--- a/quanta/scripts/dwt.kmdr
+++ b/quanta/scripts/dwt.kmdr
@@ -188,5 +188,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/gubed_install.kmdr b/quanta/scripts/gubed_install.kmdr
index c0bdbf01..a73fc003 100755
--- a/quanta/scripts/gubed_install.kmdr
+++ b/quanta/scripts/gubed_install.kmdr
@@ -291,5 +291,5 @@ rmdir /tmp/gubed-install &gt; /dev/null
         </property>
     </widget>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/htmlquickstart.kmdr b/quanta/scripts/htmlquickstart.kmdr
index 66dd808b..fb7b4336 100755
--- a/quanta/scripts/htmlquickstart.kmdr
+++ b/quanta/scripts/htmlquickstart.kmdr
@@ -30,14 +30,14 @@
         <stringlist>
             <string></string>
             <string>@execBegin
-quanta=`dcop quanta-@tqparentPid`
+quanta=`dcop quanta-@parentPid`
 if [ -z "$quanta" ]; then
     quanta=`dcop quanta`
     if [ ! -z "$quanta" ]; then
        quantadcop=quanta
     fi
 else
-    quantadcop=quanta-@tqparentPid
+    quantadcop=quanta-@parentPid
 fi
 
 if [ ! -z "$quantadcop" ]; then
@@ -161,14 +161,14 @@ echo '@CBPHPFooter'
 echo '&lt;/body&gt;'
 echo '&lt;/html&gt;'
 
-quanta=`dcop quanta-@tqparentPid`
+quanta=`dcop quanta-@parentPid`
 if [ -z "$quanta" ]; then
     quanta=`dcop quanta`
     if [ ! -z "$quanta" ]; then
        quantadcop=quanta
     fi
 else
-    quantadcop=quanta-@tqparentPid
+    quantadcop=quanta-@parentPid
 fi
 
 if [ ! -z "$quantadcop" ]; then
@@ -983,5 +983,5 @@ echo "$PADDING&lt;/script&gt;"</string>
     <tabstop>CloseButton1</tabstop>
     <tabstop>CloseButton1_2</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/listwizard.kmdr b/quanta/scripts/listwizard.kmdr
index edd5ec00..ad0673cc 100755
--- a/quanta/scripts/listwizard.kmdr
+++ b/quanta/scripts/listwizard.kmdr
@@ -437,5 +437,5 @@ Here is one example of a variablelist:
     <tabstop>CloseButton1_2</tabstop>
     <tabstop>ItemizedOption</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/meinproc.kmdr b/quanta/scripts/meinproc.kmdr
index d0c90a6a..9b564df2 100755
--- a/quanta/scripts/meinproc.kmdr
+++ b/quanta/scripts/meinproc.kmdr
@@ -280,5 +280,5 @@ fi</string>
     <tabstop>ExecButton2</tabstop>
     <tabstop>CloseButton1</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/picturewizard.kmdr b/quanta/scripts/picturewizard.kmdr
index 414e0476..ff48ed9e 100755
--- a/quanta/scripts/picturewizard.kmdr
+++ b/quanta/scripts/picturewizard.kmdr
@@ -583,5 +583,5 @@ echo '&lt;/inlinemediaobject&gt;'</string>
     <tabstop>CloseButton1_2</tabstop>
     <tabstop>MediaOption</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/scriptinfo.kmdr b/quanta/scripts/scriptinfo.kmdr
index f84682e7..2c69b342 100755
--- a/quanta/scripts/scriptinfo.kmdr
+++ b/quanta/scripts/scriptinfo.kmdr
@@ -450,5 +450,5 @@ $options&lt;name&gt;@Name&lt;/name&gt;
     <tabstop>TabWidget1</tabstop>
     <tabstop>TextEdit3</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/tablewizard.kmdr b/quanta/scripts/tablewizard.kmdr
index b3fb3ddb..b0176e88 100755
--- a/quanta/scripts/tablewizard.kmdr
+++ b/quanta/scripts/tablewizard.kmdr
@@ -445,5 +445,5 @@ Select the table type:
     <tabstop>OKButton</tabstop>
     <tabstop>CloseButton1_2</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/tidy.kmdr b/quanta/scripts/tidy.kmdr
index c01e75b7..2c01e864 100755
--- a/quanta/scripts/tidy.kmdr
+++ b/quanta/scripts/tidy.kmdr
@@ -1074,5 +1074,5 @@ fi
         <slot>setWidgetText(const QString&amp;)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/xmlval.kmdr b/quanta/scripts/xmlval.kmdr
index ec4ae69d..b9eb408d 100755
--- a/quanta/scripts/xmlval.kmdr
+++ b/quanta/scripts/xmlval.kmdr
@@ -495,5 +495,5 @@ xmllint $CMDLINE 2&gt;&amp;1
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/xsltproc.kmdr b/quanta/scripts/xsltproc.kmdr
index ffaceebe..2f5ee689 100755
--- a/quanta/scripts/xsltproc.kmdr
+++ b/quanta/scripts/xsltproc.kmdr
@@ -290,5 +290,5 @@ fi</string>
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index c0dc3816..9b136e58 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -565,9 +565,9 @@ bool Document::insertChildTags(TQTag *tag, TQTag *lastTag)
     if (it.data())
     {
       childInserted = true;
-      TQTag *childTag = QuantaCommon::tagFromDTD(tag->tqparentDTD, it.key());
+      TQTag *childTag = QuantaCommon::tagFromDTD(tag->parentDTD, it.key());
       TQString tagStr =QuantaCommon::tagCase(it.key());
-      if ( tag->tqparentDTD->singleTagStyle == "xml" &&
+      if ( tag->parentDTD->singleTagStyle == "xml" &&
            ( childTag->isSingle() ||
             (childTag->isOptional() && !qConfig.closeOptionalTags)) )
       {
@@ -1000,7 +1000,7 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string)
     if ( string == ">" && tagName[0] != '/' && !tagName.endsWith("/") &&
          !s.endsWith("/>") && tag)
     {
-      if ( tag->tqparentDTD->singleTagStyle == "xml" &&
+      if ( tag->parentDTD->singleTagStyle == "xml" &&
            (tag->isSingle() || (!qConfig.closeOptionalTags && tag->isOptional()))
          )
       {
@@ -1125,7 +1125,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n
       GroupElementList elementList = it.data();
       for (uint i = 0; i < elementList.count(); i++)
       {
-        if (elementList[i]->tqparentNode == 0L || elementList[i]->global)
+        if (elementList[i]->parentNode == 0L || elementList[i]->global)
         {
           completion.text = it.key().section('|', -1).stripWhiteSpace();
           completions->append(completion);
@@ -1133,11 +1133,11 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n
         } else
         {
           Node *n = node;
-          while (n && n != elementList[i]->tqparentNode)
+          while (n && n != elementList[i]->parentNode)
           {
             n = n->tqparent;
           }
-          if (n == elementList[i]->tqparentNode)
+          if (n == elementList[i]->parentNode)
           {
             completion.text = it.key().section('|', -1).stripWhiteSpace();
             completions->append(completion);
@@ -1172,15 +1172,15 @@ bool Document::isDerivatedFrom(const TQString& className, const TQString &baseCl
   if (className.isEmpty() || !completionDTD->classInheritance.tqcontains(className))
     return false;
 
-  TQString tqparentClass = completionDTD->classInheritance[className];
+  TQString parentClass = completionDTD->classInheritance[className];
   int result = 0;
   do {
-    if (tqparentClass == baseClass)
+    if (parentClass == baseClass)
       result = 1; //className extends baseClass
     else
     {
-      if (completionDTD->classInheritance.tqcontains(tqparentClass))
-        tqparentClass = completionDTD->classInheritance[tqparentClass];
+      if (completionDTD->classInheritance.tqcontains(parentClass))
+        parentClass = completionDTD->classInheritance[parentClass];
       else
         result = -1;//nothing was found in the inheritance list
     }
@@ -1208,9 +1208,9 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
       node = node->tqparent;
   if (node && node->tag->type != Tag::XmlTag)
       node = 0L;
-  TQTag *tqparentTQTag= 0L;
+  TQTag *parentTQTag= 0L;
   if (node && node->tqparent)
-      tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
+      parentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
   TQString textLine = editIf->textLine(line).left(col);
   TQString word = findWordRev(textLine, completionDTD).upper();
   TQString classStr = "";
@@ -1229,7 +1229,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
         objStr = r->cap(1);
         if (objStr == "this")
         {
-          TQString tqparentGroupStr = "";
+          TQString parentGroupStr = "";
           bool classFound = false;
           parser->synchParseInDetail(); 
           Node *n = parser->nodeAt(line, col);
@@ -1244,11 +1244,11 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
             while (it != n->m_groupElements.end())
             {
               GroupElement *e = *it;
-              if (tqparentGroupStr.isEmpty() && e->group->appendToTags)
+              if (parentGroupStr.isEmpty() && e->group->appendToTags)
               {
-                tqparentGroupStr = e->group->tqparentGroup;
+                parentGroupStr = e->group->parentGroup;
               }
-              if (!tqparentGroupStr.isEmpty() && e->group->name == tqparentGroupStr)
+              if (!parentGroupStr.isEmpty() && e->group->name == parentGroupStr)
               {
                 classStr = e->tag->name;
                 classFound = true;
@@ -1301,7 +1301,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
       tagName = tag->name();
       if (!tagName.isEmpty() && tagName.upper().startsWith(word))
       {
-        if (!tqparentTQTag || (tqparentTQTag && tqparentTQTag->isChild(tagName)))
+        if (!parentTQTag || (parentTQTag && parentTQTag->isChild(tagName)))
         {
           tagName = tag->name() + TQString("%1").tqarg(i, 10);
           tagNameList += tagName;
@@ -1438,7 +1438,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con
               //list common attributes for this tag
               for (TQStringList::Iterator it = tag->commonGroups.begin(); it != tag->commonGroups.end(); ++it)
               {
-                AttributeList *attrs = tag->tqparentDTD->commonAttrs->tqfind(*it);
+                AttributeList *attrs = tag->parentDTD->commonAttrs->tqfind(*it);
                 for (uint j = 0; j < attrs->count(); j++)
                 {
                   TQString name = attrs->at(j)->name;
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 5061abd4..d6bdd9e1 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -322,7 +322,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
       delete tag;
       continue; //skip this tag
     }
-    tag->tqparentDTD = dtd;
+    tag->parentDTD = dtd;
     //read the possible stopping tags
     TQStrList stoppingTags;
     dtdConfig->readListEntry(tag->name() + "_stoppingtags",stoppingTags);
@@ -547,7 +547,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
         group.hasDefinitionRx = !group.definitionRx.pattern().isEmpty();
         group.isMinimalDefinitionRx = dtdConfig->readBoolEntry("DefinitionRx_Minimal", false);
         group.appendToTags = dtdConfig->readBoolEntry("AppendToTags", false);
-        group.tqparentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
+        group.parentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
         tagStr = dtdConfig->readEntry("TagType", "Text").stripWhiteSpace();
         if (tagStr == "XmlTag")
             group.tagType = Tag::XmlTag;
@@ -588,7 +588,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
         group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace();
         group.icon = dtdConfig->readEntry("Icon").stripWhiteSpace();
         group.appendToTags = dtdConfig->readBoolEntry("AppendToTags", false);
-        group.tqparentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
+        group.parentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
         TQString tagStr = dtdConfig->readEntry("Tag").stripWhiteSpace();
         if (!tagStr.isEmpty())
         {
@@ -667,7 +667,7 @@ void DTDs::resolveInherited (DTDStruct *dtd)
 
 
 /** Reads the tags for the tag files. Returns the number of read tags. */
-uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagList *tagList)
+uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList *tagList)
 {
 //  kdDebug(24000) << "dtds::readTagFile:" << fileName << endl;
  TQFile f(fileName);
@@ -702,13 +702,13 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagLi
       TQString extends = e.attribute("extends");
       TQString name = e.attribute("name");
       if (!name.isEmpty() && !extends.isEmpty())
-        tqparentDTD->classInheritance[name] = extends;
+        parentDTD->classInheritance[name] = extends;
       continue;
     }
     TQTag *tag = new TQTag();
     tag->setName(e.attribute("name"));
     tag->setFileName(fileName);
-    tag->tqparentDTD = tqparentDTD;
+    tag->parentDTD = parentDTD;
     bool common = false;
     setAttributes(&n, tag, common);
     if (common)
@@ -720,10 +720,10 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagLi
       commonAttrList->setAutoDelete(true);
       *commonAttrList = *attrs;
       //delete tag;
-      tqparentDTD->commonAttrs->insert(groupName, commonAttrList);
+      parentDTD->commonAttrs->insert(groupName, commonAttrList);
     } else
     {
-      if (tqparentDTD->caseSensitive)
+      if (parentDTD->caseSensitive)
       {
         tagList->tqreplace(tag->name(), tag);  //append the tag to the list for this DTD
       } else
@@ -750,9 +750,9 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
  tmpStr = el.attribute("common");
  if ((tmpStr != "1" && tmpStr != "yes")) //in case of common tags, we are not interested in these options
  {
-    if (tag->tqparentDTD->commonAttrs)
+    if (tag->parentDTD->commonAttrs)
     {
-      TQDictIterator<AttributeList> it(*(tag->tqparentDTD->commonAttrs));
+      TQDictIterator<AttributeList> it(*(tag->parentDTD->commonAttrs));
       for( ; it.current(); ++it )
       {
         TQString lookForAttr = "has" + TQString(it.currentKey()).stripWhiteSpace();
@@ -804,7 +804,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
         if (tmpStr == "child")
         {
             TQString childTag = item.attribute("name");
-            if (!tag->tqparentDTD->caseSensitive)
+            if (!tag->parentDTD->caseSensitive)
                 childTag = childTag.upper();
             tag->childTags.insert(childTag, item.attribute("usage") == "required");
         }
@@ -820,7 +820,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
        if (item.tagName() == "stoppingtag")
        {
          TQString stopTag = item.attribute("name");
-         if (!tag->tqparentDTD->caseSensitive)
+         if (!tag->parentDTD->caseSensitive)
             stopTag = stopTag.upper();
          tag->stoppingTags.append(stopTag);
        }
@@ -837,7 +837,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
      attr->method = el.attribute("method");
      attr->arguments = el.attribute("arguments");
 
-     attr->type = el.attribute("type",tag->tqparentDTD->defaultAttrType);
+     attr->type = el.attribute("type",tag->parentDTD->defaultAttrType);
      attr->defaultValue = el.attribute("defaultValue");
      attr->status = el.attribute("status");
 
diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h
index ae7c28f1..4f351182 100644
--- a/quanta/src/dtds.h
+++ b/quanta/src/dtds.h
@@ -209,11 +209,11 @@ private:
   /** Reads the tags from the tag files.
    *
    * @param fileName path of the tag file
-   * @param tqparentDTD the DTD where the tags belog to
+   * @param parentDTD the DTD where the tags belog to
    * @param tagList the list where the tags are inserted
    * @return the number of read tags.
    */
-  uint readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagList *tagList);
+  uint readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList *tagList);
 
   /** Parses the dom document and retrieve the tag attributes
   *
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 1ca3aa96..cb4795a3 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -1026,7 +1026,7 @@ void QuantaApp::slotOptionsConfigureKeys()
           el.setAttribute("shortcut", action->shortcut().toString());
           el = node.toElement();
           node = node.nextSibling();
-          el.tqparentNode().removeChild(el);
+          el.parentNode().removeChild(el);
         } else
         {
           node = node.nextSibling();
@@ -2846,7 +2846,7 @@ void QuantaApp::slotRenameToolbar(const TQString& name)
       {
         if (tb->id(i) == name)
         {
-          tb->setTabLabel(tb->page(i)->tqparentWidget(), i18n(p_toolbar->name.utf8()));
+          tb->setTabLabel(tb->page(i)->parentWidget(), i18n(p_toolbar->name.utf8()));
           m_tagsMenu->changeItem(m_tagsMenu->idAt(i + 2), i18n(p_toolbar->name.utf8()));
           break;
         }
@@ -2920,7 +2920,7 @@ void QuantaApp::slotDeleteAction(KAction *action)
       //we found a toolbar that contains the action
       if (nodeList.item(j).toElement().attribute("name") == actionName)
       {
-        nodeList.item(j).tqparentNode().removeChild(nodeList.item(j));
+        nodeList.item(j).parentNode().removeChild(nodeList.item(j));
         KXMLGUIFactory::saveConfigFile(guiClient->domDocument(), guiClient->xmlFile());
         break;
       }
@@ -2976,7 +2976,7 @@ void QuantaApp::slotRemoveAction(const TQString& toolbarName, const TQString& a_
         {
           action->unplug(ToolbarTabWidget::ref()->page(toolbarName));
           action->unplug(p_toolbar->menu);
-          node.tqparentNode().removeChild(node);
+          node.parentNode().removeChild(node);
         }
         node = node.nextSibling();
       }
@@ -4445,13 +4445,13 @@ void QuantaApp::slotInsertCSS()
   while (styleNode && styleNode->tqparent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css")
     styleNode = styleNode->tqparent;
 
-  Node *tqparentNode = node;
-  if (tqparentNode->tag->type == Tag::XmlTagEnd && tqparentNode->prev)
-    tqparentNode = tqparentNode->prev;
+  Node *parentNode = node;
+  if (parentNode->tag->type == Tag::XmlTagEnd && parentNode->prev)
+    parentNode = parentNode->prev;
   else
-    while (tqparentNode && tqparentNode->tqparent &&
-           tqparentNode->tag->type != Tag::XmlTag)
-      tqparentNode = tqparentNode->tqparent;
+    while (parentNode && parentNode->tqparent &&
+           parentNode->tag->type != Tag::XmlTag)
+      parentNode = parentNode->tqparent;
   TQString fullDocument = w->editIf->text().stripWhiteSpace();
 
   if (styleNode->tag->name.lower() == "comment block" && styleNode->tqparent) {
@@ -4513,29 +4513,29 @@ void QuantaApp::slotInsertCSS()
       }
      delete dlg;
   } else
-  if (tqparentNode && tqparentNode->tag->type == Tag::XmlTag)
+  if (parentNode && parentNode->tag->type == Tag::XmlTag)
   {
-        kdDebug(24000) << "[CSS editor] We will add a style attribute to: " << tqparentNode->tag->name << endl;
+        kdDebug(24000) << "[CSS editor] We will add a style attribute to: " << parentNode->tag->name << endl;
     CSSEditor *dlg = new CSSEditor(this);
     TQFileInfo fi(ViewManager::ref()->currentURL());
     dlg->setFileToPreview(projectBaseURL().path() +  fi.baseName(),false);
 
 
-    tqparentNode->tag->beginPos(bLine, bCol);
-    tqparentNode->tag->endPos(eLine, eCol);
+    parentNode->tag->beginPos(bLine, bCol);
+    parentNode->tag->endPos(eLine, eCol);
     dlg->setFooter(">" + w->text(eLine, eCol + 1, lastLine, lastCol));
 
     TQString temp;
-    if (tqparentNode->tag->hasAttribute("style"))
+    if (parentNode->tag->hasAttribute("style"))
     {
-      dlg->setInlineStyleContent(tqparentNode->tag->attributeValue("style"));
-      Tag tempTag(*(tqparentNode->tag));
+      dlg->setInlineStyleContent(parentNode->tag->attributeValue("style"));
+      Tag tempTag(*(parentNode->tag));
       tempTag.deleteAttribute("style");
       temp = tempTag.toString();
 
     } else {
       dlg->setInlineStyleContent(TQString());
-      temp = tqparentNode->tag->toString();
+      temp = parentNode->tag->toString();
     }
     //using TQString::mid sometimes generates strange results; maybe this is due to a (random) blank in temp
     temp = temp.left(temp.length()-1);//remove >
@@ -4545,7 +4545,7 @@ void QuantaApp::slotInsertCSS()
     dlg->initialize();
     if( dlg->exec() )
     {
-      w->changeTagAttribute(tqparentNode->tag, "style", dlg->generateProperties());
+      w->changeTagAttribute(parentNode->tag, "style", dlg->generateProperties());
     }
     delete dlg;
    } else
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index d1e2054c..d188adee 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -229,7 +229,7 @@ void QuantaInit::initQuanta()
       TQDomElement el = node.toElement();
       m_quanta->oldShortcuts.insert(el.attribute("name"), el.attribute("shortcut"));
       node = node.nextSibling();
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     } else
     {
       node = node.nextSibling();
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 1ea690dc..4bebfcc3 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -292,7 +292,7 @@ void QuantaDoc::slotAttribPopup()
       for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it)
       {
        TQPopupMenu* popUpMenu = new TQPopupMenu(attribMenu, (*it).latin1());
-       AttributeList *attrs = qtag->tqparentDTD->commonAttrs->tqfind(*it);
+       AttributeList *attrs = qtag->parentDTD->commonAttrs->tqfind(*it);
        for (uint j = 0; j < attrs->count(); j++)
        {
         name = attrs->at(j)->name;
@@ -348,7 +348,7 @@ void QuantaDoc::slotInsertAttrib( int id )
         TQTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName);
         for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it)
         {
-          AttributeList *attrs = qtag->tqparentDTD->commonAttrs->tqfind(*it);
+          AttributeList *attrs = qtag->parentDTD->commonAttrs->tqfind(*it);
           menuId += attrs->count();
           if (id <= menuId)
           {
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index 988bf338..45b06603 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -846,7 +846,7 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
     if (!nodeTQTag)
         return;
 
-    qTagList = nodeTQTag->tqparents();
+    qTagList = nodeTQTag->parents();
 #ifdef HEAVY_DEBUG
     kdDebug(25001)<< "nodeTQTag name : " << nodeTQTag->name() << endl;
     /**kdDebug(25001)<< nodeTQTag->isChild("#text", false) << endl;
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index bc91a218..b2c598c6 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -257,7 +257,7 @@ void ViewManager::slotCloseOtherTabs()
    if (dynamic_cast<QuantaView*>(currentView) && !static_cast<QuantaView*>(currentView)->document())
      ToolbarTabWidget::ref()->reparent(0, 0, TQPoint(), false);
   KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator();
-  //save the tqchildren first to a list, as removing tqinvalidates our iterator
+  //save the tqchildren first to a list, as removing invalidates our iterator
   TQValueList<KMdiChildView *> tqchildren;
   for (it->first(); !it->isDone(); it->next())
   {
@@ -427,7 +427,7 @@ bool ViewManager::closeAll(bool createNew)
   parser->setSAParserEnabled(false);
   KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator();
   QuantaView *view;
-  //save the tqchildren first to a list, as removing tqinvalidates our iterator
+  //save the tqchildren first to a list, as removing invalidates our iterator
   TQValueList<KMdiChildView *> tqchildren;
   for (it->first(); !it->isDone(); it->next())
   {
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index ba35ab61..61a71be5 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -86,7 +86,7 @@ BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv )
 
 void BaseTreeViewToolTip::maybeTip( const TQPoint &pos )
 {
-    if ( !tqparentWidget() || !m_view || !m_view->showToolTips() )
+    if ( !parentWidget() || !m_view || !m_view->showToolTips() )
 	return;
 
     TQListViewItem *item = m_view->itemAt(pos);
diff --git a/quanta/treeviews/fileinfodlg.ui b/quanta/treeviews/fileinfodlg.ui
index 145b4f4e..d9b45eeb 100644
--- a/quanta/treeviews/fileinfodlg.ui
+++ b/quanta/treeviews/fileinfodlg.ui
@@ -90,5 +90,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui
index 6498445a..97c666b6 100644
--- a/quanta/treeviews/quantapropertiespage.ui
+++ b/quanta/treeviews/quantapropertiespage.ui
@@ -59,7 +59,7 @@
                     </property>
                     <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="4">
                         <property name="name">
-                            <cstring>tqparentAttr</cstring>
+                            <cstring>parentAttr</cstring>
                         </property>
                         <property name="text">
                             <string>&amp;Inherit type from tqparent (nothing)</string>
@@ -221,7 +221,7 @@
 </widget>
 <connections>
     <connection>
-        <sender>tqparentAttr</sender>
+        <sender>parentAttr</sender>
         <signal>toggled(bool)</signal>
         <receiver>typesCombo</receiver>
         <slot>setDisabled(bool)</slot>
@@ -241,7 +241,7 @@
 </connections>
 <tabstops>
     <tabstop>typesCombo</tabstop>
-    <tabstop>tqparentAttr</tabstop>
+    <tabstop>parentAttr</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp
index a0ac8baa..fbd41228 100644
--- a/quanta/treeviews/structtreetag.cpp
+++ b/quanta/treeviews/structtreetag.cpp
@@ -37,14 +37,14 @@ StructTreeTag::StructTreeTag(TQListView *tqparent, TQString a_title)
   node = 0L;
   hasOpenFileMenu = false;
   groupTag = 0L;
-  tqparentTree = static_cast<StructTreeView*>(tqparent);
+  parentTree = static_cast<StructTreeView*>(tqparent);
 }
 
 StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title,
                              TQListViewItem *after )
 : KListViewItem(tqparent, after, a_title)
 {
-  tqparentTree = tqparent->tqparentTree;
+  parentTree = tqparent->parentTree;
   hasOpenFileMenu = false;
   groupTag = 0L;
   static const TQString space = " ";
@@ -105,36 +105,36 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri
 
               if (!typingInProgress)
               {
-                TQTag *tqparentTQTag = 0L;
+                TQTag *parentTQTag = 0L;
                 if (node->tqparent)
-                  tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
+                  parentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
                 TQString qTagName = node->tag->dtd()->caseSensitive ? node->tag->name : node->tag->name.upper();
                 int line, col;
                 node->tag->beginPos(line, col);
-                if (tqparentTQTag && !tqparentTQTag->childTags.tqcontains(qTagName) &&
-                !tqparentTQTag->childTags.isEmpty())
+                if (parentTQTag && !parentTQTag->childTags.tqcontains(qTagName) &&
+                !parentTQTag->childTags.isEmpty())
                 {
                   node->tag->write()->setErrorMark(line);
-                  TQString tqparentTagName = node->tag->dtd()->caseSensitive ? node->tqparent->tag->name : node->tqparent->tag->name.upper();
-                  tqparentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(tqparentTagName));
+                  TQString parentTagName = node->tag->dtd()->caseSensitive ? node->tqparent->tag->name : node->tqparent->tag->name.upper();
+                  parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(parentTagName));
                 }
                 TQString nextTagName;
                 if (node->next)
                 {
                   nextTagName = node->tag->dtd()->caseSensitive ? node->next->tag->name : node->next->tag->name.upper();
                 }
-                tqparentTQTag = QuantaCommon::tagFromDTD(node);
-                if (tqparentTQTag && !tqparentTQTag->isSingle() &&
-                    !tqparentTQTag->isOptional() &&
+                parentTQTag = QuantaCommon::tagFromDTD(node);
+                if (parentTQTag && !parentTQTag->isSingle() &&
+                    !parentTQTag->isOptional() &&
                     (!node->next || ( !node->getClosingNode()))  )
                 {
                   node->tag->write()->setErrorMark(line);
-                  tqparentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
+                  parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
                 } else
-                if (!tqparentTQTag && node->tag->name.upper() != "!DOCTYPE")
+                if (!parentTQTag && node->tag->name.upper() != "!DOCTYPE")
                 {
                   node->tag->write()->setErrorMark(line);
-                  tqparentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName));
+                  parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName));
                 }
               }
               break;
@@ -182,7 +182,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri
                 if (!node->prev || qTagName != "/" + qPrevTagName)
                 {
                   node->tag->write()->setErrorMark(line);
-                  tqparentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
+                  parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
                 }
               }
               title = tag->tagStr().left(70).stripWhiteSpace();
@@ -207,7 +207,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, TQString a_title )
   node = 0L;
   hasOpenFileMenu = false;
   groupTag = 0L;
-  tqparentTree = tqparent->tqparentTree;
+  parentTree = tqparent->parentTree;
 }
 
 
diff --git a/quanta/treeviews/structtreetag.h b/quanta/treeviews/structtreetag.h
index cd0e35b8..6170870d 100644
--- a/quanta/treeviews/structtreetag.h
+++ b/quanta/treeviews/structtreetag.h
@@ -39,7 +39,7 @@ public:
   bool hasOpenFileMenu;
   Tag* groupTag;
   TQRegExp fileNameRx;
-  StructTreeView *tqparentTree;
+  StructTreeView *parentTree;
 };
 
 #endif
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index 8519f72b..f2154208 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -159,7 +159,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
   Node *currentNode = baseNode;
   StructTreeTag *currentItem = top; //after this
   StructTreeTag *item = 0L;
-  StructTreeTag *tqparentItem = top; //under this
+  StructTreeTag *parentItem = top; //under this
   int level = 0;
   TQString title;
   TQString tagStr;
@@ -219,7 +219,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
     if (!groupOnly)
     {
       title = "";
-      item = new StructTreeTag(tqparentItem, currentNode, title, currentItem);
+      item = new StructTreeTag(parentItem, currentNode, title, currentItem);
       item->setOpen(level < openLevel);
       currentNode->mainListItem = item;
 
@@ -264,7 +264,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
     if (currentNode->child)
     {
       currentNode = currentNode->child;
-      tqparentItem = item;
+      parentItem = item;
       currentItem = 0L;
       level++;
     } else
@@ -280,7 +280,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
         while (currentNode)
         {
           level--;
-          //tqparentItem = dynamic_cast<StructTreeTag*>(tqparentItem->tqparent());
+          //parentItem = dynamic_cast<StructTreeTag*>(parentItem->tqparent());
           if (currentNode->tqparent && currentNode->tqparent->next)
           {
             currentNode = currentNode->tqparent->next;
@@ -296,15 +296,15 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
               currentItem = static_cast<StructTreeTag*>(currentNode->prev->mainListItem);
           if (currentNode->tqparent)
           {
-            tqparentItem = static_cast<StructTreeTag*>(currentNode->tqparent->mainListItem);
-            if (!tqparentItem)
+            parentItem = static_cast<StructTreeTag*>(currentNode->tqparent->mainListItem);
+            if (!parentItem)
             {
-              tqparentItem = top;
+              parentItem = top;
             }
           }
           else
           {
-            tqparentItem = top;
+            parentItem = top;
           }
         }
 
@@ -877,9 +877,9 @@ void StructTreeView::contentsMousePressEvent(TQMouseEvent* e)
 
 void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after)
 {
-    StructTreeTag* tqparent_item = dynamic_cast<StructTreeTag*> (tqparent);
+    StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (tqparent);
     StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after);
-    if(!tqparent_item/* || !after_item*/) // can happen if the element is inserted as the first child
+    if(!parent_item/* || !after_item*/) // can happen if the element is inserted as the first child
         return;
     
     TQPtrList<TQListViewItem> selected_items = selectedItems(false);        
@@ -896,28 +896,28 @@ void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem*
     else
         start_node_subtree = kafkaCommon::getNodeSubtree(start_node, 0, end_node, end_node->tag->tagStr().length());
 
-    Node* tqparent_node = tqparent_item->node;
-    if(!tqparent_node)
+    Node* parent_node = parent_item->node;
+    if(!parent_node)
         return;
     Node* next_node = 0;
     if(after_item)
         next_node = after_item->node->SNext();
     else
-        next_node = tqparent_node->firstChild();
+        next_node = parent_node->firstChild();
     
     NodeSelection cursor_holder;
     NodeModifsSet *modifs = new NodeModifsSet();
     
-    kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, tqparent_node, next_node, cursor_holder, modifs);
+    kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, parent_node, next_node, cursor_holder, modifs);
     
     write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, 0, false);    
 }
 
 void StructTreeView::moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after)
 {
-    StructTreeTag* tqparent_item = dynamic_cast<StructTreeTag*> (tqparent);
+    StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (tqparent);
     StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after);
-    if(!tqparent_item || !after_item)
+    if(!parent_item || !after_item)
         return;
     
     TQPtrList<TQListViewItem> selected_items = selectedItems(false);        
@@ -939,14 +939,14 @@ void StructTreeView::moveSelectedItems(TQListViewItem* tqparent, TQListViewItem*
         start_node_subtree = kafkaCommon::DTDExtractNodeSubtree(start_node, 0, end_node, end_node->tag->tagStr().length(), 
             &cursor_node, cursor_offset, modifs);
 
-    Node* tqparent_node = tqparent_item->node;
-    if(!tqparent_node)
+    Node* parent_node = parent_item->node;
+    if(!parent_node)
         return;
     Node* next_node = after_item->node->SNext();
     
     NodeSelection cursor_holder(cursor_node, cursor_offset);
     
-    kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, tqparent_node, next_node, cursor_holder, modifs);
+    kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, parent_node, next_node, cursor_holder, modifs);
     
     write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, &cursor_holder, false);    
 }
diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp
index 46de89b3..981aea04 100644
--- a/quanta/treeviews/tagattributetree.cpp
+++ b/quanta/treeviews/tagattributetree.cpp
@@ -333,7 +333,7 @@ void TagAttributeTree::setCurrentNode(Node *node)
     for (uint i = 0; i < qTag->commonGroups.count(); i++)
     {
       group = new TopLevelItem(this, group, i18n(qTag->commonGroups[i].utf8()));
-      AttributeList *groupAttrs = qTag->tqparentDTD->commonAttrs->tqfind(qTag->commonGroups[i]);
+      AttributeList *groupAttrs = qTag->parentDTD->commonAttrs->tqfind(qTag->commonGroups[i]);
       for (uint j = 0; j < groupAttrs->count(); j++)
       {
         Attribute *attr = groupAttrs->at(j);
diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui
index 6e2f41bb..54e8637b 100644
--- a/quanta/treeviews/templatedirform.ui
+++ b/quanta/treeviews/templatedirform.ui
@@ -57,7 +57,7 @@
         </widget>
         <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqparentAttr</cstring>
+                <cstring>parentAttr</cstring>
             </property>
             <property name="text">
                 <string>&amp;Inherit tqparent attribute</string>
@@ -147,7 +147,7 @@
 </widget>
 <connections>
     <connection>
-        <sender>tqparentAttr</sender>
+        <sender>parentAttr</sender>
         <signal>toggled(bool)</signal>
         <receiver>typesCombo</receiver>
         <slot>setDisabled(bool)</slot>
@@ -156,14 +156,14 @@
 <tabstops>
     <tabstop>dirName</tabstop>
     <tabstop>typesCombo</tabstop>
-    <tabstop>tqparentAttr</tabstop>
+    <tabstop>parentAttr</tabstop>
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
 <Q_SLOTS>
     <slot>okBtn_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index 5efd8b05..2f061462 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -383,10 +383,10 @@ void TemplatesTreeView::slotNewDir()
 
    if (m_dirInfo.mimeType.isEmpty())
    {
-    createDirDlg->tqparentAttr->setText(i18n("&Inherit tqparent attribute (nothing)"));
+    createDirDlg->parentAttr->setText(i18n("&Inherit tqparent attribute (nothing)"));
    } else
    {
-     createDirDlg->tqparentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType]));
+     createDirDlg->parentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType]));
    }
    if (createDirDlg->exec())
    {
@@ -407,7 +407,7 @@ void TemplatesTreeView::slotNewDir()
                    Maybe you do not have permission to write in the %1 folder.").tqarg(startDir));
       return;
    }
-   if (! createDirDlg->tqparentAttr->isChecked())
+   if (! createDirDlg->parentAttr->isChecked())
    {
       m_dirInfo.mimeType = i18nToType[createDirDlg->typesCombo->currentText()];
       m_dirInfo.preText = "";
@@ -612,14 +612,14 @@ void TemplatesTreeView::slotProperties()
   m_parentDirInfo = readDirInfo(dotFileInfo.dirPath());
   if (!dotFileInfo.exists() || m_dirInfo.mimeType == m_parentDirInfo.mimeType)
   {
-     m_quantaProperties->tqparentAttr->setChecked(true);
+     m_quantaProperties->parentAttr->setChecked(true);
   }
   if (m_parentDirInfo.mimeType.isEmpty())
    {
-    m_quantaProperties->tqparentAttr->setText(i18n("&Inherit tqparent attribute (nothing)"));
+    m_quantaProperties->parentAttr->setText(i18n("&Inherit tqparent attribute (nothing)"));
    } else
    {
-    m_quantaProperties->tqparentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType]));
+    m_quantaProperties->parentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType]));
    }
    m_quantaProperties->preTextEdit->setText(m_dirInfo.preText);
    m_quantaProperties->postTextEdit->setText(m_dirInfo.postText);
@@ -681,7 +681,7 @@ void TemplatesTreeView::slotPropertiesApplied()
   DirInfo m_localDirInfo;
   TQString typeString = "";
 
-  if (!m_quantaProperties->tqparentAttr->isChecked())
+  if (!m_quantaProperties->parentAttr->isChecked())
   {
     m_localDirInfo.mimeType = m_quantaProperties->typesCombo->currentText();
     typeString = m_localDirInfo.mimeType;
diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp
index f43b8f99..b4ad6845 100644
--- a/quanta/treeviews/uploadtreefile.cpp
+++ b/quanta/treeviews/uploadtreefile.cpp
@@ -32,7 +32,7 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, c
 {
   m_url = a_url;
   isDir = false;
-  tqparentFolder = tqparent;
+  parentFolder = tqparent;
   m_fileItem = new KFileItem(a_fileItem);
   m_confirm = false;
 
@@ -45,7 +45,7 @@ UploadTreeFile::UploadTreeFile( TQListView *tqparent, const KURL &a_url, const K
 {
   m_url = a_url;
   isDir = false;
-  tqparentFolder = 0L;
+  parentFolder = 0L;
   m_fileItem = new KFileItem(a_fileItem);
   m_confirm = false;
 
diff --git a/quanta/treeviews/uploadtreefile.h b/quanta/treeviews/uploadtreefile.h
index c2a118fc..246b3fe0 100644
--- a/quanta/treeviews/uploadtreefile.h
+++ b/quanta/treeviews/uploadtreefile.h
@@ -43,7 +43,7 @@ public:
   bool confirmUpload() {return m_confirm;}
 
 public:
-  UploadTreeFolder * tqparentFolder;
+  UploadTreeFolder * parentFolder;
   KURL m_url;
   bool isDir;
   bool m_confirm;
diff --git a/quanta/treeviews/uploadtreefolder.cpp b/quanta/treeviews/uploadtreefolder.cpp
index dc43419c..7e719912 100644
--- a/quanta/treeviews/uploadtreefolder.cpp
+++ b/quanta/treeviews/uploadtreefolder.cpp
@@ -30,7 +30,7 @@
 UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparent, const char * name )
     : KListViewItem( tqparent, name, "", "", "" )
 {
-  tqparentFolder = tqparent;
+  parentFolder = tqparent;
   m_url = a_url;
   m_url.adjustPath(1);
 
@@ -43,7 +43,7 @@ UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparen
 UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * tqparent, const char * name )
     : KListViewItem( tqparent, name, "", "", "" )
 {
-  tqparentFolder = 0L;
+  parentFolder = 0L;
   m_url = a_url;
   m_url.adjustPath(1);
 
@@ -64,9 +64,9 @@ TQString UploadTreeFolder::fullName()
 {
   TQString s="";
 
-  if ( tqparentFolder )
+  if ( parentFolder )
   {
-    s = tqparentFolder->fullName();
+    s = parentFolder->fullName();
     s += m_url.fileName()+"/";
   }
   else {
diff --git a/quanta/treeviews/uploadtreefolder.h b/quanta/treeviews/uploadtreefolder.h
index 000c14bf..fd08276f 100644
--- a/quanta/treeviews/uploadtreefolder.h
+++ b/quanta/treeviews/uploadtreefolder.h
@@ -46,7 +46,7 @@ public:
   void setWhichPixmap(const TQString& pixmap );
 
 public:
-  UploadTreeFolder * tqparentFolder;
+  UploadTreeFolder * parentFolder;
   KURL m_url;
 
 public slots: // Public slots
diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp
index 250cc3a2..3b07b112 100644
--- a/quanta/treeviews/uploadtreeview.cpp
+++ b/quanta/treeviews/uploadtreeview.cpp
@@ -52,7 +52,7 @@ UploadTreeView::~UploadTreeView()
 
 int UploadTreeView::checkboxTree( TQListViewItem *it )
 {
-  tqparentWidget()->setCursor(KCursor::workingCursor());
+  parentWidget()->setCursor(KCursor::workingCursor());
 
   TQListViewItem *itIter = it ? it->firstChild() : firstChild();
 
@@ -127,7 +127,7 @@ int UploadTreeView::checkboxTree( TQListViewItem *it )
     }
   }
 
-  tqparentWidget()->setCursor(KCursor::arrowCursor());
+  parentWidget()->setCursor(KCursor::arrowCursor());
 
   return retVal;
 }
@@ -177,7 +177,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
       itF->setSelected( true );
     }
 
-    itF = itF->tqparentFolder;
+    itF = itF->parentFolder;
   }
   else
   {
@@ -191,10 +191,10 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
       itFile->setWhichPixmap("check_clear");
       itFile->setSelected(false);
     }
-    itF = itFile->tqparentFolder;
+    itF = itFile->parentFolder;
   }
 
-  //iterate through the item's tqparents and set the correct checkboxes for them
+  //iterate through the item's parents and set the correct checkboxes for them
   while (itF)
   {
     bool hasSelected = false;
@@ -227,7 +227,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
       itF->setWhichPixmap( "check_clear" );
       itF->setSelected( false );
     }
-    itF = itF->tqparentFolder;
+    itF = itF->parentFolder;
   }
 }
 
diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp
index adf4e5d0..bc3a052f 100644
--- a/quanta/utility/newstuff.cpp
+++ b/quanta/utility/newstuff.cpp
@@ -50,13 +50,13 @@ void QNewDTEPStuff::installResource()
     } else
         ok = false;
     if (!ok)
-        KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error"));
+        KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error"));
 }
 
-QNewToolbarStuff::QNewToolbarStuff(const TQString &type,  TQWidget *tqparentWidget)
-  :KNewStuffSecure(type, tqparentWidget)
+QNewToolbarStuff::QNewToolbarStuff(const TQString &type,  TQWidget *parentWidget)
+  :KNewStuffSecure(type, parentWidget)
 {
-  connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), tqparentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&)));
+  connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&)));
 }
 
 
@@ -64,26 +64,26 @@ void QNewToolbarStuff::installResource()
 {
     KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "toolbars/" + TQFileInfo(m_tarName).fileName());
     bool ok = true;
-    if (QuantaCommon::checkOverwrite(destURL, tqparentWidget()))
+    if (QuantaCommon::checkOverwrite(destURL, parentWidget()))
     {
-        if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget()))
+        if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, parentWidget()))
           ok = false;
         else
         {
-           if (KMessageBox::questionYesNo(tqparentWidget(), i18n("Do you want to load the newly downloaded toolbar?"), i18n("Load Toolbar"), i18n("Load"), KStdGuiItem::cancel()) == KMessageBox::Yes)
+           if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to load the newly downloaded toolbar?"), i18n("Load Toolbar"), i18n("Load"), KStdGuiItem::cancel()) == KMessageBox::Yes)
            {
               emit loadToolbarFile(destURL);
            }
         }
         if (!ok)
-            KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded toolbar tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Toolbar Installation Error"));
+            KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded toolbar tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Toolbar Installation Error"));
      }
 }
 
-QNewTemplateStuff::QNewTemplateStuff(const TQString &type,  TQWidget *tqparentWidget)
-  :KNewStuffSecure(type, tqparentWidget)
+QNewTemplateStuff::QNewTemplateStuff(const TQString &type,  TQWidget *parentWidget)
+  :KNewStuffSecure(type, parentWidget)
 {
-  connect(this, TQT_SIGNAL(openFile(const KURL&)), tqparentWidget, TQT_SLOT(slotFileOpen(const KURL&)));
+  connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&)));
 }
 
 
@@ -91,19 +91,19 @@ void QNewTemplateStuff::installResource()
 {
     KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "templates/" + TQFileInfo(m_tarName).fileName());
     bool ok = true;
-    if (QuantaCommon::checkOverwrite(destURL, tqparentWidget()))
+    if (QuantaCommon::checkOverwrite(destURL, parentWidget()))
     {
-        if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget()))
+        if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, parentWidget()))
           ok = false;
         else
         {
-           if (KMessageBox::questionYesNo(tqparentWidget(), i18n("Do you want to open the newly downloaded template?"), i18n("Open Template"), KStdGuiItem::open(), KStdGuiItem::cancel()) == KMessageBox::Yes)
+           if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to open the newly downloaded template?"), i18n("Open Template"), KStdGuiItem::open(), KStdGuiItem::cancel()) == KMessageBox::Yes)
            {
               emit openFile(destURL);
            }
         }
         if (!ok)
-            KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded template file."), i18n("Template Installation Error"));
+            KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded template file."), i18n("Template Installation Error"));
      }
 }
 
@@ -121,7 +121,7 @@ void QNewScriptStuff::installResource()
         ok = false;
 
     if (!ok)
-        KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error"));
+        KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error"));
 }
 
 void QNewDocStuff::installResource()
@@ -138,7 +138,7 @@ void QNewDocStuff::installResource()
     ok = false;
 
     if (!ok)
-      KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Documentation Installation Error"));
+      KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Documentation Installation Error"));
 }
 
 #include "newstuff.moc"
diff --git a/quanta/utility/newstuff.h b/quanta/utility/newstuff.h
index 3be6857d..f504accf 100644
--- a/quanta/utility/newstuff.h
+++ b/quanta/utility/newstuff.h
@@ -35,8 +35,8 @@ class QNewDTEPStuff: public KNewStuffSecure
   TQ_OBJECT
 
 public:
-    QNewDTEPStuff(const TQString &type,  TQWidget *tqparentWidget=0)
-      :KNewStuffSecure(type, tqparentWidget){};
+    QNewDTEPStuff(const TQString &type,  TQWidget *parentWidget=0)
+      :KNewStuffSecure(type, parentWidget){};
     ~QNewDTEPStuff() {};
 
 private:
@@ -54,7 +54,7 @@ class QNewToolbarStuff: public KNewStuffSecure
   TQ_OBJECT
 
 public:
-  QNewToolbarStuff(const TQString &type,  TQWidget *tqparentWidget=0);
+  QNewToolbarStuff(const TQString &type,  TQWidget *parentWidget=0);
   ~QNewToolbarStuff() {};
   
 signals:
@@ -75,7 +75,7 @@ class QNewTemplateStuff: public KNewStuffSecure
   TQ_OBJECT
 
 public:
-  QNewTemplateStuff(const TQString &type,  TQWidget *tqparentWidget=0);
+  QNewTemplateStuff(const TQString &type,  TQWidget *parentWidget=0);
   ~QNewTemplateStuff() {};
 
 signals:
@@ -96,8 +96,8 @@ class QNewScriptStuff: public KNewStuffSecure
   TQ_OBJECT
 
 public:
-    QNewScriptStuff(const TQString &type,  TQWidget *tqparentWidget=0)
-      :KNewStuffSecure(type, tqparentWidget){};
+    QNewScriptStuff(const TQString &type,  TQWidget *parentWidget=0)
+      :KNewStuffSecure(type, parentWidget){};
     ~QNewScriptStuff() {};
 
 private:
@@ -115,8 +115,8 @@ class QNewDocStuff: public KNewStuffSecure
   TQ_OBJECT
 
   public:
-    QNewDocStuff(const TQString &type,  TQWidget *tqparentWidget=0)
-  :KNewStuffSecure(type, tqparentWidget){};
+    QNewDocStuff(const TQString &type,  TQWidget *parentWidget=0)
+  :KNewStuffSecure(type, parentWidget){};
     ~QNewDocStuff() {};
 
   private:
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index f354dc5c..3030d661 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -72,14 +72,14 @@ int MyProcess::commSetupDoneC()
   return KProcess::commSetupDoneC();
 }
 
-TagAction::TagAction( TQDomElement *element, KMainWindow *tqparentMainWindow, bool toggle)
+TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool toggle)
     : KToggleAction(element->attribute("text").isEmpty() ? TQString("") : i18n(element->attribute("text").utf8()), 
-                    KShortcut(element->attribute("shortcut")), 0, 0, tqparentMainWindow->actionCollection(), element->attribute("name").ascii()),
+                    KShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name").ascii()),
  //disable toggle now m_toggle(toggle)
   m_toggle(false)
 {
   setToolTip(element->attribute("tooltip"));
-  m_parentMainWindow = tqparentMainWindow;
+  m_parentMainWindow = parentMainWindow;
   m_modified = false;
   m_useInputFile = false;
   m_useOutputFile = false;
@@ -1066,7 +1066,7 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en
     if (!nodeTQTag) return;
 
     bool specialTagInsertion = false;
-    TQPtrList<TQTag> qTagList = nodeTQTag->tqparents();
+    TQPtrList<TQTag> qTagList = nodeTQTag->parents();
     TQTag* qTag = 0;
     for (qTag = qTagList.first(); qTag; qTag = qTagList.next())
     {
@@ -1248,15 +1248,15 @@ void TagAction::deapplyTagInSelection(Node* start_node, int start_offset, Node*
         Node* common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, tag_parent);
         Node* common_parent_end_child = kafkaCommon::getCommonParentChild(end_node, tag_parent);
     
-        Node* tqparent_of_tag_parent = tag_parent->tqparent;
+        Node* parent_of_tag_parent = tag_parent->tqparent;
         if(common_parent_end_child == common_parent_start_child)
             common_parent_end_child = 0;
         if(!common_parent_start_child)
             common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, commonParent);
-        kafkaCommon::moveNode(common_parent_start_child, tqparent_of_tag_parent, tag_parent, selection, modifs, true, true);
+        kafkaCommon::moveNode(common_parent_start_child, parent_of_tag_parent, tag_parent, selection, modifs, true, true);
     
         if(common_parent_end_child)
-            kafkaCommon::moveNode(common_parent_end_child, tqparent_of_tag_parent, tag_parent, selection, modifs, true, true);
+            kafkaCommon::moveNode(common_parent_end_child, parent_of_tag_parent, tag_parent, selection, modifs, true, true);
     
     // Remove tag_parent node subtree if empty
         if(!tag_parent->hasChildNodes())
diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h
index d940faf7..1f114a81 100644
--- a/quanta/utility/tagaction.h
+++ b/quanta/utility/tagaction.h
@@ -55,7 +55,7 @@ public:
      * @param toggle If set to true, the class behaves like a KToggleAction;
      *               Else it behaves like a KAction. This avoids the multi-inheritance problem.
      */
-    TagAction(TQDomElement *element, KMainWindow *tqparentMainWindow, bool toggle = false);
+    TagAction(TQDomElement *element, KMainWindow *parentMainWindow, bool toggle = false);
     virtual ~TagAction();
 
     TQDomElement data() const { return tag; }
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index dc994716..7d85aaba 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -47,7 +47,7 @@ TagActionSetAbstract::TagActionSetAbstract(TQObject *tqparent, const char *name)
 TagActionSetAbstract::~TagActionSetAbstract()
 {}
 
-Node* TagActionSetAbstract::tqparentTag(Node* node, TQString const& tagName)
+Node* TagActionSetAbstract::parentTag(Node* node, TQString const& tagName)
 {
     Q_ASSERT(node);
 
@@ -221,14 +221,14 @@ bool TagActionSet::isInDivArea() const
 {
     Q_ASSERT(m_currentNode);
     
-    return tqparentTag(m_currentNode, "div");
+    return parentTag(m_currentNode, "div");
 }
 
 void TagActionSet::slotCopyDivElement()
 {
     Q_ASSERT(m_currentNode);
     
-    Node* divNode = tqparentTag(m_currentNode, "div");
+    Node* divNode = parentTag(m_currentNode, "div");
     Q_ASSERT(divNode);
     
     Node* divClosingNode = divNode->getClosingNode();
@@ -245,7 +245,7 @@ void TagActionSet::slotCutDivElement()
 {
     Q_ASSERT(m_currentNode);
     
-    Node* divNode = tqparentTag(m_currentNode, "div");
+    Node* divNode = parentTag(m_currentNode, "div");
     Q_ASSERT(divNode);
     
     Node* divClosingNode = divNode->getClosingNode();
@@ -274,7 +274,7 @@ TableTagActionSet::TableTagActionSet(TQObject *tqparent, const char *name)
 
 bool TableTagActionSet::isInTagContext() const
 {
-    return tqparentTag(m_currentNode, "table");
+    return parentTag(m_currentNode, "table");
 }
 
 void TableTagActionSet::initActionMenus(TQWidget* widget)
@@ -575,14 +575,14 @@ void TableTagActionSet::slotInsertTable()
 
 bool TableTagActionSet::canInsertRowAbove() const
 {
-    return isInTagContext() && tqparentTag(m_currentNode, "tbody");
+    return isInTagContext() && parentTag(m_currentNode, "tbody");
 }
 
 void TableTagActionSet::slotInsertRowAbove()
 {
     Q_ASSERT(m_currentNode);
 
-    Node* nearRow = tqparentTag(m_currentNode, "tr");
+    Node* nearRow = parentTag(m_currentNode, "tr");
 
     if(!nearRow)
         return;
@@ -610,11 +610,11 @@ void TableTagActionSet::slotInsertRowBelow()
     Q_ASSERT(m_currentNode);
 
     Node* nearRow = 0;
-    Node* aux = tqparentTag(m_currentNode, "thead");
+    Node* aux = parentTag(m_currentNode, "thead");
     if(aux)
         nearRow= firstChildTag(tableStart(), "tr");
     else
-        nearRow = tqparentTag(m_currentNode, "tr");
+        nearRow = parentTag(m_currentNode, "tr");
 
     if(!nearRow)
         return;
@@ -781,7 +781,7 @@ void TableTagActionSet::slotRemoveRows()
 
     if(!selection.hasSelection())
     {
-        Node* nearTr = tqparentTag(m_currentNode, "tr");
+        Node* nearTr = parentTag(m_currentNode, "tr");
         kafkaCommon::extractAndDeleteNode(nearTr, modifs, true, true);
     }
     else
@@ -789,8 +789,8 @@ void TableTagActionSet::slotRemoveRows()
         Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode());
         Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel());
 
-        Node* startTr = tqparentTag(startSelection, "tr");
-        Node* endTr = tqparentTag(endSelection, "tr");
+        Node* startTr = parentTag(startSelection, "tr");
+        Node* endTr = parentTag(endSelection, "tr");
 
         Node* iteratorNode = startTr;
         bool loop(true);
@@ -844,7 +844,7 @@ void TableTagActionSet::slotRemoveColumns()
         if(startColumnIndex == -1 || endColumnIndex == -1)
             return;
             
-        m_currentNode = tqparentTag(m_currentNode, "tbody"); // m_currentNode will become invalid
+        m_currentNode = parentTag(m_currentNode, "tbody"); // m_currentNode will become invalid
         for(int i = 0; i != numberOfColumnsSelected; ++i)
             removeColumn(startColumnIndex, modifs);
     }
@@ -880,9 +880,9 @@ void TableTagActionSet::slotRemoveCellsContent()
     if(!selection.hasSelection())
     {
         Node* aux = m_currentNode;
-        m_currentNode = tqparentTag(m_currentNode, "tbody");
+        m_currentNode = parentTag(m_currentNode, "tbody");
         
-        Node* nearTd = tqparentTag(aux, "td");
+        Node* nearTd = parentTag(aux, "td");
         clearCellContents(nearTd, modifs);
     }
     else
@@ -890,8 +890,8 @@ void TableTagActionSet::slotRemoveCellsContent()
         Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode());
         Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel());
 
-        Node* startTd = tqparentTag(startSelection, "td");
-        Node* endTd = tqparentTag(endSelection, "td");
+        Node* startTd = parentTag(startSelection, "td");
+        Node* endTd = parentTag(endSelection, "td");
         
         if(!startTd || !endTd)
             return;
@@ -933,8 +933,8 @@ void TableTagActionSet::slotMergeSelectedCells()
     Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode());
     Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel());
     
-    Node* startTd = tqparentTag(startSelection, "td");
-    Node* endTd = tqparentTag(endSelection, "td");
+    Node* startTd = parentTag(startSelection, "td");
+    Node* endTd = parentTag(endSelection, "td");
     
     Node* nodeIterator = startTd->SNext();
     Node* stopNode = endTd->SNext();
@@ -975,7 +975,7 @@ Node* TableTagActionSet::tableStart() const
     Q_ASSERT(isInTagContext());
     Q_ASSERT(m_currentNode);
 
-    return tqparentTag(m_currentNode, "table");
+    return parentTag(m_currentNode, "table");
 }
 
 int TableTagActionSet::numberOfColumns() const
@@ -1004,7 +1004,7 @@ int TableTagActionSet::numberOfColumns() const
 int TableTagActionSet::currentColumnIndex() const
 {
     return columnIndex(m_currentNode);
-/*    Node* nearTd = tqparentTag(m_currentNode, "td");
+/*    Node* nearTd = parentTag(m_currentNode, "td");
     if(!nearTd)
         return -1;
 
@@ -1012,7 +1012,7 @@ int TableTagActionSet::currentColumnIndex() const
     if(!_tableStart)
         return -1;
 
-    Node* firstTd = firstChildTag(tqparentTag(m_currentNode, "tr"), "td");
+    Node* firstTd = firstChildTag(parentTag(m_currentNode, "tr"), "td");
     //Node* firstTd = firstChildTag(_tableStart, "td");
     if(!firstTd)
         return -1;
@@ -1032,7 +1032,7 @@ int TableTagActionSet::currentColumnIndex() const
 
 int TableTagActionSet::columnIndex(Node* node) const
 {
-    Node* nearTd = tqparentTag(node, "td");
+    Node* nearTd = parentTag(node, "td");
     if(!nearTd)
         return -1;
 
@@ -1040,7 +1040,7 @@ int TableTagActionSet::columnIndex(Node* node) const
     if(!_tableStart)
         return -1;
 
-    Node* firstTd = firstChildTag(tqparentTag(node, "tr"), "td");
+    Node* firstTd = firstChildTag(parentTag(node, "tr"), "td");
     if(!firstTd)
         return -1;
 
diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h
index 5b813acb..ad51a917 100644
--- a/quanta/utility/tagactionset.h
+++ b/quanta/utility/tagactionset.h
@@ -45,7 +45,7 @@ public:
     
     DOM::Node const& currentDomNode() const {return m_currentDomNode;}
 
-    static Node* tqparentTag(Node* node, TQString const& tagName);
+    static Node* parentTag(Node* node, TQString const& tagName);
     static Node* firstChildTag(Node* node, TQString const& tagName);
     
     virtual bool isInTagContext(/*DOM::Node const& node*/) const = 0;
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index cd3ac37e..90602623 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -65,9 +65,9 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * tqparent, const char * name, WFlag
 
 void ToolbarTabWidget::insertTab(TQWidget *child, const TQString &label, const TQString &id)
 {
-  if (child->inherits("KToolBar") && child->tqparentWidget())
+  if (child->inherits("KToolBar") && child->parentWidget())
   {
-    TQTabWidget::insertTab(child->tqparentWidget(), label);
+    TQTabWidget::insertTab(child->parentWidget(), label);
     toolbarList.insert(id, child);
   }
 }
@@ -78,7 +78,7 @@ TQWidget* ToolbarTabWidget::page(int index)
 
   for (TQMap<TQString, TQWidget*>::Iterator it = toolbarList.begin(); it != toolbarList.end(); ++it)
   {
-    if (it.data()->tqparentWidget() == w)
+    if (it.data()->parentWidget() == w)
     {
       w = *it;
       break;
@@ -92,7 +92,7 @@ TQString ToolbarTabWidget::id(TQWidget *w) const
   TQString idStr;
   for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it)
   {
-    if (it.data()->tqparentWidget() == w)
+    if (it.data()->parentWidget() == w)
     {
       idStr = it.key();
       break;
@@ -107,7 +107,7 @@ TQString ToolbarTabWidget::id(int index) const
   TQString idStr;
   for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it)
   {
-    if (it.data()->tqparentWidget() == w)
+    if (it.data()->parentWidget() == w)
     {
       idStr = it.key();
       break;
@@ -124,7 +124,7 @@ TQWidget* ToolbarTabWidget::page(const TQString& id)
 
 void ToolbarTabWidget::removePage(TQWidget * w)
 {
-  TQWidget *tqparent = w->tqparentWidget();
+  TQWidget *tqparent = w->parentWidget();
   if (w->inherits("KToolBar") && tqparent)
   {
     TQTabWidget::removePage(tqparent);
@@ -179,7 +179,7 @@ void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e )
       pageW = currentPage();
     for (TQMap<TQString, TQWidget*>::Iterator it = toolbarList.begin(); it != toolbarList.end(); ++it)
     {
-      if (it.data()->tqparentWidget() == pageW)
+      if (it.data()->parentWidget() == pageW)
       {
         tabUnderMouse = it.key();
         break;
@@ -227,7 +227,7 @@ QuantaToolBar::QuantaToolBar(TQWidget *tqparent, const char *name, bool honor_st
 :KToolBar (tqparent, name=0, honor_style, readConfig)
 {
   m_popupMenu = new KPopupMenu(this);
-  m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(tqparent->tqparentWidget());
+  m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(tqparent->parentWidget());
   currentActionName = "";
   m_iconTextMenu = new KPopupMenu(this);
   m_iconTextMenu->setCheckable(true);
@@ -311,7 +311,7 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
       for (uint i = 0; i < tqchildrenList->count(); i++)
       {
         KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(tqchildrenList->at(i)));
-        TQPoint p1 = w->tqparentWidget()->mapToGlobal(w->pos());
+        TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos());
         TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height());
         if (TQRect(p1, p2).tqcontains(p))
         {