Rename obsolete tq methods to standard names

1 files changed, 18 insertions, 18 deletions

diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp
index 0b1aaa9b..41d1749a 100644
--- a/kword/KWTextParag.cpp
+++ b/kword/KWTextParag.cpp
@@ -552,16 +552,16 @@ KoTextFormat KWTextParag::loadFormat( TQDomElement &formatElem, KoTextFormat * r
 
 void KWTextParag::loadLayout( TQDomElement & attributes )
 {
-    TQDomElement tqlayout = attributes.namedItem( "LAYOUT" ).toElement();
-    if ( !tqlayout.isNull() )
+    TQDomElement layout = attributes.namedItem( "LAYOUT" ).toElement();
+    if ( !layout.isNull() )
     {
         KWDocument * doc = kwTextDocument()->textFrameSet()->kWordDocument();
-        KoParagLayout paragLayout = loadParagLayout( tqlayout, doc, true );
+        KoParagLayout paragLayout = loadParagLayout( layout, doc, true );
         setParagLayout( paragLayout );
 
         // Load default format from style.
         KoTextFormat *defaultFormat = style() ? &style()->format() : 0L;
-        TQDomElement formatElem = tqlayout.namedItem( "FORMAT" ).toElement();
+        TQDomElement formatElem = layout.namedItem( "FORMAT" ).toElement();
         if ( !formatElem.isNull() )
         {
             // Load paragraph format
@@ -577,7 +577,7 @@ void KWTextParag::loadLayout( TQDomElement & attributes )
     else
     {
         // Even the simplest import filter should do <LAYOUT><NAME value="Standard"/></LAYOUT>
-        kdWarning(32001) << "No LAYOUT tag in PARAGRAPH, dunno what tqlayout to apply" << endl;
+        kdWarning(32001) << "No LAYOUT tag in PARAGRAPH, dunno what layout to apply" << endl;
     }
 }
 
@@ -639,7 +639,7 @@ void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loa
                     // However, as it is an invalid XML character, we must replace it
                     // or it will be written out while save the file.
                     KoTextStringChar& ch = string()->at(index);
-                    if (ch.c.tqunicode()==1)
+                    if (ch.c.unicode()==1)
                     {
                         kdDebug() << "Replacing TQChar(1) (in KWTextParag::loadFormatting)" << endl;
                         ch.c='#';
@@ -740,12 +740,12 @@ void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loa
     }
 }
 
-void KWTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int marginIndex )
+void KWTextParag::setParagLayout( const KoParagLayout & layout, int flags, int marginIndex )
 {
-    KoTextParag::setParagLayout( tqlayout, flags, marginIndex );
+    KoTextParag::setParagLayout( layout, flags, marginIndex );
 
     if ( flags & KoParagLayout::PageBreaking )
-        setPageBreaking( tqlayout.pageBreaking );
+        setPageBreaking( layout.pageBreaking );
 }
 
 //////////
@@ -753,7 +753,7 @@ void KWTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int
 // Create a KoParagLayout from XML.
 KoParagLayout KWTextParag::loadParagLayout( TQDomElement & parentElem, KWDocument *doc, bool findStyle )
 {
-    KoParagLayout tqlayout;
+    KoParagLayout layout;
 
     // Only when loading paragraphs, not when loading styles
     if ( findStyle )
@@ -779,12 +779,12 @@ KoParagLayout KWTextParag::loadParagLayout( TQDomElement & parentElem, KWDocumen
             style = doc->styleCollection()->findStyle( "Standard" );
         }
         Q_ASSERT(style);
-        tqlayout.style = style;
+        layout.style = style;
     }
 
-    KoParagLayout::loadParagLayout( tqlayout, parentElem, doc->syntaxVersion() );
+    KoParagLayout::loadParagLayout( layout, parentElem, doc->syntaxVersion() );
 
-    return tqlayout;
+    return layout;
 }
 
 void KWTextParag::join( KoTextParag *parag )
@@ -808,10 +808,10 @@ void KWTextParag::loadOasis( const TQDomElement& paragElement, KoOasisContext& c
             const TQDomElement* paragraphStyle = context.oasisStyles().findStyle( styleName, "paragraph" );
             TQString masterPageName = paragraphStyle ? paragraphStyle->attributeNS( KoXmlNS::style, "master-page-name", TQString() ) : TQString();
 
-            // In KWord we don't support sections so the first paragraph is the one that determines the page tqlayout.
+            // In KWord we don't support sections so the first paragraph is the one that determines the page layout.
             if ( prev() == 0 ) {
                 if ( masterPageName.isEmpty() )
-                    masterPageName = "Standard"; // Seems to be a builtin name for the default tqlayout...
+                    masterPageName = "Standard"; // Seems to be a builtin name for the default layout...
                 currentMasterPageRef = masterPageName; // do this first to avoid recursion
                 context.styleStack().save();
                 context.styleStack().setTypeProperties( "paragraph" );
@@ -822,18 +822,18 @@ void KWTextParag::loadOasis( const TQDomElement& paragElement, KoOasisContext& c
                     doc->variableCollection()->variableSetting()->setStartingPageNumber( pageNumber.toInt() );
                 context.styleStack().restore();
 
-                doc->loadOasisPageLayout( masterPageName, context ); // page tqlayout
+                doc->loadOasisPageLayout( masterPageName, context ); // page layout
             }
             else if ( !masterPageName.isEmpty() // empty means no change
                       && masterPageName != currentMasterPageRef )
             {
-                // Detected a change in the master page -> this means we have to use a new page tqlayout
+                // Detected a change in the master page -> this means we have to use a new page layout
                 // and insert a frame break if not on the first paragraph.
                 kdDebug(32001) << "KWTextParag::loadOasis: change of master page detected: from " << currentMasterPageRef << " to " << masterPageName << " -> inserting page break" << endl;
                 currentMasterPageRef = masterPageName;
                 // [see also KoParagLayout for the 'normal' way to insert page breaks]
                 m_layout.pageBreaking |= KoParagLayout::HardFrameBreakBefore;
-                // We have no way to load/use the new page tqlayout, KWord doesn't have "sections".
+                // We have no way to load/use the new page layout, KWord doesn't have "sections".
             }
         }
     }