1 files changed, 26 insertions, 26 deletions

diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cc
index 6061da20..fe45ca18 100644
--- a/filters/kword/amipro/amiproimport.cc
+++ b/filters/kword/amipro/amiproimport.cc
@@ -124,43 +124,43 @@ static TQString AmiProFormatListAsXML( AmiProFormatList& formatList )
   return result;
 }
 
-// helper function to convert AmiPro paragraph tqlayout to KWord's LAYOUT
-static TQString AmiProLayoutAsXML( const AmiProLayout& tqlayout )
+// helper function to convert AmiPro paragraph layout to KWord's LAYOUT
+static TQString AmiProLayoutAsXML( const AmiProLayout& layout )
 {
   TQString result;
 
-  TQString referredStyle = tqlayout.name;
+  TQString referredStyle = layout.name;
   if( referredStyle.isEmpty() ) referredStyle = "Standard";
 
-  TQString fontname = tqlayout.fontFamily;
+  TQString fontname = layout.fontFamily;
   if( fontname.isEmpty() ) fontname = KoGlobal::defaultFont().family();
-  TQString fontsize = TQString::number( tqlayout.fontSize );
-  TQString fontcolor = "red=\"" + TQString::number( tqlayout.fontColor.red() ) +
-    "\"  green=\"" +  TQString::number( tqlayout.fontColor.green() ) +
-    "\"  blue=\"" + TQString::number( tqlayout.fontColor.blue() ) + "\"";
-  TQString boldness = tqlayout.bold ? "75" : "50";
-  TQString italic = tqlayout.italic ? "1" : "0";
-  TQString strikeout = tqlayout.strikethrough ? "1" : "0";
-  TQString vertalign = tqlayout.superscript ? "2" : tqlayout.subscript ? "1" : "0";
-  TQString underline = tqlayout.double_underline ? "double" :
-    tqlayout.underline|tqlayout.word_underline ? "1" : "0";
+  TQString fontsize = TQString::number( layout.fontSize );
+  TQString fontcolor = "red=\"" + TQString::number( layout.fontColor.red() ) +
+    "\"  green=\"" +  TQString::number( layout.fontColor.green() ) +
+    "\"  blue=\"" + TQString::number( layout.fontColor.blue() ) + "\"";
+  TQString boldness = layout.bold ? "75" : "50";
+  TQString italic = layout.italic ? "1" : "0";
+  TQString strikeout = layout.strikethrough ? "1" : "0";
+  TQString vertalign = layout.superscript ? "2" : layout.subscript ? "1" : "0";
+  TQString underline = layout.double_underline ? "double" :
+    layout.underline|layout.word_underline ? "1" : "0";
 
   TQString align;
-  align = tqlayout.align==TQt::AlignLeft ? "left" :
-          tqlayout.align==TQt::AlignRight ? "right" :
-          tqlayout.align==TQt::AlignCenter ? "center" :
-          tqlayout.align==TQt::AlignJustify ? "justify" :
+  align = layout.align==TQt::AlignLeft ? "left" :
+          layout.align==TQt::AlignRight ? "right" :
+          layout.align==TQt::AlignCenter ? "center" :
+          layout.align==TQt::AlignJustify ? "justify" :
           "left";
 
   TQString offsets;
-  offsets = "before=\"" + TQString::number(tqlayout.spaceBefore) +
-            "\" after=\"" + TQString::number(tqlayout.spaceAfter) + "\"";
+  offsets = "before=\"" + TQString::number(layout.spaceBefore) +
+            "\" after=\"" + TQString::number(layout.spaceAfter) + "\"";
 
   TQString linespacing;
-  linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
-                tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
-                tqlayout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
-                  TQString::number( tqlayout.linespace );
+  linespacing = layout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
+                layout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
+                layout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
+                  TQString::number( layout.linespace );
 
   result.append( "<LAYOUT>\n" );
   result.append( "  <NAME value=\"" + XMLEscape( referredStyle ) + "\" />\n" );
@@ -308,12 +308,12 @@ bool AmiProConverter::doDefineStyle( const AmiProStyle& style )
 }
 
 bool AmiProConverter::doParagraph( const TQString& text, AmiProFormatList formatList,
-  AmiProLayout& tqlayout )
+  AmiProLayout& layout )
 {
   root.append( "<PARAGRAPH>\n" );
   root.append( "<TEXT>" + XMLEscape( text ) + "</TEXT>\n" );
   root.append( AmiProFormatListAsXML( formatList ) );
-  root.append( AmiProLayoutAsXML( tqlayout ) );
+  root.append( AmiProLayoutAsXML( layout ) );
   root.append( "</PARAGRAPH>\n" );
 
   return true;