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

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


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

1 files changed, 32 insertions, 32 deletions

diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index fa831de29..4304f346c 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -520,9 +520,9 @@ void OoWriterImport::prepareDocument( TQDomDocument& mainDocument, TQDomElement&
 }
 
 // Copied from the msword importer
-TQDomElement OoWriterImport::createInitialFrame( TQDomElement& tqparentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb )
+TQDomElement OoWriterImport::createInitialFrame( TQDomElement& parentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb )
 {
-    TQDomElement frameElementOut = tqparentFramesetElem.ownerDocument().createElement("FRAME");
+    TQDomElement frameElementOut = parentFramesetElem.ownerDocument().createElement("FRAME");
     frameElementOut.setAttribute( "left", left );
     frameElementOut.setAttribute( "right", right );
     frameElementOut.setAttribute( "top", top );
@@ -531,7 +531,7 @@ TQDomElement OoWriterImport::createInitialFrame( TQDomElement& tqparentFramesetE
     // AutoExtendFrame for header/footer/footnote/endnote, AutoCreateNewFrame for body text
     frameElementOut.setAttribute( "autoCreateNewFrame", autoExtend ? 0 : 1 );
     frameElementOut.setAttribute( "newFrameBehavior", nfb );
-    tqparentFramesetElem.appendChild( frameElementOut );
+    parentFramesetElem.appendChild( frameElementOut );
     return frameElementOut;
 }
 
@@ -552,7 +552,7 @@ KoFilter::ConversiontqStatus OoWriterImport::openFile()
     //kdDebug(30518)<<" m_content.toCString() :"<<m_content.toCString()<<endl;
 
     // We need to keep the TQDomDocument for styles too, unfortunately.
-    // Otherwise styleElement.tqparentNode() returns a null node
+    // Otherwise styleElement.parentNode() returns a null node
     // (see StyleStack::isUserStyle). Most of styles.xml is in m_styles
     // anyway, so this doesn't make a big difference.
     // We now also rely on this in createStyles.
@@ -814,14 +814,14 @@ void OoWriterImport::addStyles( const TQDomElement* style )
 {
     Q_ASSERT( style );
     if ( !style ) return;
-    // this recursive function is necessary as tqparent styles can have tqparents themselves
+    // this recursive function is necessary as tqparent styles can have parents themselves
     if ( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) {
-        const TQString tqparentStyleName = style->attributeNS( ooNS::style, "tqparent-style-name", TQString() );
-        TQDomElement* tqparentStyle = m_styles[ tqparentStyleName ];
-        if ( tqparentStyle )
-            addStyles( tqparentStyle );
+        const TQString parentStyleName = style->attributeNS( ooNS::style, "tqparent-style-name", TQString() );
+        TQDomElement* parentStyle = m_styles[ parentStyleName ];
+        if ( parentStyle )
+            addStyles( parentStyle );
         else
-            kdWarning(30518) << "Parent style not found: " << tqparentStyleName << endl;
+            kdWarning(30518) << "Parent style not found: " << parentStyleName << endl;
     }
     else if ( !m_defaultStyle.isNull() ) // on top of all, the default style
         m_styleStack.push( m_defaultStyle );
@@ -830,18 +830,18 @@ void OoWriterImport::addStyles( const TQDomElement* style )
     m_styleStack.push( *style );
 }
 
-void OoWriterImport::applyListStyle( TQDomDocument& doc, TQDomElement& tqlayoutElement, const TQDomElement& paragraph )
+void OoWriterImport::applyListStyle( TQDomDocument& doc, TQDomElement& layoutElement, const TQDomElement& paragraph )
 {
     // Spec: see 3.3.5 p137
     if ( m_listStyleStack.hasListStyle() && m_nextItemIsListItem ) {
         bool heading = paragraph.localName() == "h";
         m_nextItemIsListItem = false;
         int level = heading ? paragraph.attributeNS( ooNS::text, "level", TQString() ).toInt() : m_listStyleStack.level();
-        writeCounter( doc, tqlayoutElement, heading, level, m_insideOrderedList );
+        writeCounter( doc, layoutElement, heading, level, m_insideOrderedList );
     }
 }
 
-void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& tqlayoutElement, bool heading, int level, bool ordered )
+void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& layoutElement, bool heading, int level, bool ordered )
 {
     const TQDomElement listStyle = m_listStyleStack.currentListStyle();
     //const TQDomElement listStyleProperties = m_listStyleStack.currentListStyleProperties();
@@ -914,7 +914,7 @@ void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& tqlayoutEle
         }
     }
 
-    tqlayoutElement.appendChild(counter);
+    layoutElement.appendChild(counter);
 }
 
 static TQDomElement findListLevelStyle( TQDomElement& fullListStyle, int level )
@@ -1189,8 +1189,8 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem
     //kdDebug(30518) << k_funcinfo << "Para text is: " << paragraphText << endl;
 
     p.appendChild( formats );
-    TQDomElement tqlayoutElement = doc.createElement( "LAYOUT" );
-    p.appendChild( tqlayoutElement );
+    TQDomElement layoutElement = doc.createElement( "LAYOUT" );
+    p.appendChild( layoutElement );
 
     // Style name
     TQString styleName = m_styleStack.userStyleName("paragraph");
@@ -1198,13 +1198,13 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem
     {
         TQDomElement nameElement = doc.createElement("NAME");
         nameElement.setAttribute( "value", kWordStyleName(styleName) );
-        tqlayoutElement.appendChild(nameElement);
+        layoutElement.appendChild(nameElement);
     }
 
-    writeLayout( doc, tqlayoutElement );
-    writeFormat( doc, tqlayoutElement, 1, 0, 0 ); // paragraph format, useful for empty parags
+    writeLayout( doc, layoutElement );
+    writeFormat( doc, layoutElement, 1, 0, 0 ); // paragraph format, useful for empty parags
 
-    applyListStyle( doc, tqlayoutElement, paragraph );
+    applyListStyle( doc, layoutElement, paragraph );
 
     TQDomElement* paragraphStyle = m_styles[paragraph.attributeNS( ooNS::text, "style-name", TQString() )];
     TQString masterPageName = paragraphStyle ? paragraphStyle->attributeNS( ooNS::style, "master-page-name", TQString() ) : TQString();
@@ -1222,10 +1222,10 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem
         else
         {
             m_currentMasterPage = masterPageName;
-            TQDomElement pageBreakElem = tqlayoutElement.namedItem( "PAGEBREAKING" ).toElement();
+            TQDomElement pageBreakElem = layoutElement.namedItem( "PAGEBREAKING" ).toElement();
             if ( !pageBreakElem.isNull() )  {
                 pageBreakElem = doc.createElement( "PAGEBREAKING" );
-                tqlayoutElement.appendChild( pageBreakElem );
+                layoutElement.appendChild( pageBreakElem );
             }
             pageBreakElem.setAttribute( "hardFrameBreak", "true" );
             // We have no way to store the new page tqlayout, KWord doesn't have sections.
@@ -1454,9 +1454,9 @@ void OoWriterImport::writeFormat( TQDomDocument& doc, TQDomElement& formats, int
         formats.appendChild( format );
 }
 
-void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElement )
+void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElement )
 {
-    Q_ASSERT( tqlayoutElement.ownerDocument() == doc );
+    Q_ASSERT( layoutElement.ownerDocument() == doc );
 
     // Always write out the tqalignment, it's required
     TQDomElement flowElement = doc.createElement("FLOW");
@@ -1476,7 +1476,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElem
         else
             flowElement.setAttribute( "align", "auto" );
     }
-    tqlayoutElement.appendChild( flowElement );
+    layoutElement.appendChild( flowElement );
 
     if ( m_styleStack.hasAttributeNS( ooNS::fo, "writing-mode" ) ) // http://web4.w3.org/TR/xsl/slice7.html#writing-mode
     {
@@ -1486,19 +1486,19 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElem
     }
 
     // Indentation (margins)
-    OoUtils::importIndents( tqlayoutElement, m_styleStack );
+    OoUtils::importIndents( layoutElement, m_styleStack );
 
     // Offset before and after paragraph
-    OoUtils::importTopBottomMargin( tqlayoutElement, m_styleStack );
+    OoUtils::importTopBottomMargin( layoutElement, m_styleStack );
 
     // Line spacing
-    OoUtils::importLineSpacing( tqlayoutElement, m_styleStack );
+    OoUtils::importLineSpacing( layoutElement, m_styleStack );
 
     // Tabulators
-    OoUtils::importTabulators( tqlayoutElement, m_styleStack );
+    OoUtils::importTabulators( layoutElement, m_styleStack );
 
     // Borders
-    OoUtils::importBorders( tqlayoutElement, m_styleStack );
+    OoUtils::importBorders( layoutElement, m_styleStack );
 
     // Page breaking. This isn't in OoUtils since it doesn't apply to KPresenter
     if( m_styleStack.hasAttributeNS( ooNS::fo, "break-before") ||
@@ -1528,7 +1528,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElem
             TQString val = m_styleStack.attributeNS( ooNS::fo, "keep-with-next" );
             pageBreak.setAttribute("keepWithNext", ( val == "true" || val == "always" ) ? "true" : "false");
         }
-        tqlayoutElement.appendChild( pageBreak );
+        layoutElement.appendChild( pageBreak );
     }
 
     // TODO in KWord: padding
@@ -1566,7 +1566,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElem
     vertical tqalignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general)
   Michael said those are in fact parag properties:
     style:text-autospace, 3.10.32 - not implemented in kotext
-    style:line-break, 3.10.37 - aptqparently that's for some Asian languages
+    style:line-break, 3.10.37 - apparently that's for some Asian languages
 */
 
 }