1 files changed, 18 insertions, 18 deletions

diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp
index 1df58edf7..6e134e381 100644
--- a/filters/kword/html/import/khtmlreader.cpp
+++ b/filters/kword/html/import/khtmlreader.cpp
@@ -236,7 +236,7 @@ void KHTMLReader::parse_head(DOM::Element e)
 				state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\
 				if (!(_writer->getText(state()->paragraph).isEmpty())) \
 					startNewParagraph(false,false); \
-				_writer->tqlayoutAttribute(state()->paragraph, #a,#b,#c); \
+				_writer->layoutAttribute(state()->paragraph, #a,#b,#c); \
 				return true; \
 			} \
 		}
@@ -317,11 +317,11 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout)
 	TQString ct=_writer->getLayoutAttribute(state()->paragraph,"COUNTER","type");
 	if ((!ct.isNull()) && (ct != "0")) 
         {
-		_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","0");
-		_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","0");
-		_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext","");
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","type","0");
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0");
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
 		int currdepth=(_writer->getLayoutAttribute(state()->paragraph,"COUNTER","depth")).toInt();
-		_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1));
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1));
 	}
 }
 
@@ -353,12 +353,12 @@ bool KHTMLReader::parse_CommonAttributes(DOM::Element e)
   // example: <p class="h1" style="text-align:left; ">
   {
     kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl;
-    _writer->tqlayoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
+    _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
   }
   if ( e.getAttribute("class").string()=="Standard" )
   {
     kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl;
-    _writer->tqlayoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
+    _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
   }  
   kdDebug(30503) << "leaving parse_CommonAttributes" << endl;
   return true;
@@ -509,7 +509,7 @@ void KHTMLReader::parseStyle(DOM::Element e)
     if ( s1.getPropertyValue("text-align").string() != TQString() && s1.getPropertyValue("text-align").string() != TQString("left") )
     {
       state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);
-      _writer->tqlayoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
+      _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
     }
   // done
 
@@ -684,7 +684,7 @@ bool KHTMLReader::parse_ul(DOM::Element e)
   _list_depth++;
   if (e.firstChild().nodeName().string().lower() == "#text")  // e.g. <ul>this is indented<li>first listitem</li></ul>
   {
-    _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
+    _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
     startNewLayout();
   }
   for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling()) 
@@ -692,21 +692,21 @@ bool KHTMLReader::parse_ul(DOM::Element e)
     if (items.nodeName().string().lower() == "li") 
     {
       if (!(_writer->getText(state()->paragraph).isEmpty())) startNewLayout();
-      _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
-      _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext",".");
+      _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
+      _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",".");
       if (e.tagName().string().lower() == "ol")
       {
-	_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","1");
-	_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
-        _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext",".");
+	_writer->layoutAttribute(state()->paragraph,"COUNTER","type","1");
+	_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
+        _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",".");
       }
       else
       {
-	_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","10");
-	_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
-        _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext","");
+	_writer->layoutAttribute(state()->paragraph,"COUNTER","type","10");
+	_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
+        _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
       }
-      _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
+      _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
     }
     parseNode(items);
   }