Rename obsolete tq methods to standard names

6 files changed, 29 insertions, 29 deletions

diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py
index c0609de6..97527471 100755
--- a/filters/kpresenter/magicpoint/mgp2kpr.py
+++ b/filters/kpresenter/magicpoint/mgp2kpr.py
@@ -283,7 +283,7 @@ class MgpImporter:
     if (self.fontItalic!=0):
       elem.setAttribute("italic", "1")
     
-    text=self.document.createTextNode(tqunicode(line, self.charset, 'ignore'))
+    text=self.document.createTextNode(unicode(line, self.charset, 'ignore'))
     elem.appendChild(text)
     pElem.appendChild(elem)
     self.textElem.appendChild(pElem)
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc
index 55a3e265..47173cb9 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressexport.cc
@@ -758,7 +758,7 @@ void OoImpressExport::appendNote( TQDomDocument & doc, TQDomElement & source, TQ
     TQDomElement noteTextBox = doc.createElement( "draw:text-box" );
 
     //TODO : add draw:text-box size :
-    //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="tqlayout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
+    //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="layout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
 
     TQStringList text = TQStringList::split( "\n", noteText );
     for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) {
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc
index 8b9d1e77..7b84c3d0 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc
@@ -178,10 +178,10 @@ TQByteArray PowerPointImport::createStyles()
 
   // office:automatic-styles
   stylesWriter->startElement( "office:automatic-styles" );
-  stylesWriter->startElement( "style:page-tqlayout" );
+  stylesWriter->startElement( "style:page-layout" );
   stylesWriter->addAttribute( "style:name","pm1" );
   stylesWriter->addAttribute( "style:page-usage","all" );
-  stylesWriter->startElement( "style:page-tqlayout-properties" );
+  stylesWriter->startElement( "style:page-layout-properties" );
   stylesWriter->addAttribute( "fo:margin-bottom","0pt" ); 
   stylesWriter->addAttribute( "fo:margin-left","0pt" );   
   stylesWriter->addAttribute( "fo:margin-right","0pt" );  
@@ -189,8 +189,8 @@ TQByteArray PowerPointImport::createStyles()
   stylesWriter->addAttribute( "fo:page-height", pageHeight );
   stylesWriter->addAttribute( "fo:page-width", pageWidth );
   stylesWriter->addAttribute( "style:print-orientation","landscape" );
-  stylesWriter->endElement(); // style:page-tqlayout-properties
-  stylesWriter->endElement(); // style:page-tqlayout
+  stylesWriter->endElement(); // style:page-layout-properties
+  stylesWriter->endElement(); // style:page-layout
 
   stylesWriter->startElement( "style:style" );
   stylesWriter->addAttribute( "style:name","dp1" );
@@ -237,7 +237,7 @@ TQByteArray PowerPointImport::createStyles()
   stylesWriter->startElement( "office:master-styles" );
   stylesWriter->startElement( "style:master-page" );
   stylesWriter->addAttribute( "style:name", "Standard" );
-  stylesWriter->addAttribute( "style:page-tqlayout-name", "pm1" );
+  stylesWriter->addAttribute( "style:page-layout-name", "pm1" );
   stylesWriter->addAttribute( "draw:style-name", "dp1" );
   stylesWriter->endElement();
   stylesWriter->endElement();
@@ -363,7 +363,7 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->endElement(); // draw:ellipse
 }
 
@@ -401,7 +401,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
   }
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->endElement(); // draw:rect
 }
 
@@ -463,7 +463,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
  // xmlWriter->addAttribute( "svg:x", xStr );
  // xmlWriter->addAttribute( "svg:y", yStr );
   
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
     xmlWriter->startElement( "draw:enhanced-geometry" );
     xmlWriter->addAttribute( "draw:type", "round-rectangle"); 
       xmlWriter->startElement( "draw:equation" );
@@ -525,7 +525,7 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->startElement( "draw:enhanced-geometry" );
     xmlWriter->addAttribute( "draw:type", "diamond");
     xmlWriter->endElement();    
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->endElement(); 
 }
 
@@ -546,7 +546,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
     xmlWriter->startElement( "draw:glue-point" );
     xmlWriter->addAttribute( "svg:x", 5 );
     xmlWriter->addAttribute( "svg:y", 0 );
@@ -657,7 +657,7 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   
         xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
@@ -738,7 +738,7 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
         xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 6.25 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -854,7 +854,7 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "svg:height", heightStr );
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+    xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -918,7 +918,7 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -998,7 +998,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
     xmlWriter->startElement( "draw:enhanced-geometry" );
     
                 if (drawObject->shape() == DrawObject::RightArrow)
@@ -1090,7 +1090,7 @@ void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWrit
   xmlWriter->addAttribute( "svg:y2", y2Str );
   xmlWriter->addAttribute( "svg:x1", x1Str );
   xmlWriter->addAttribute( "svg:x2", x2Str );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
  
  xmlWriter->endElement(); 
 }
@@ -1111,7 +1111,7 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
     xmlWriter->addAttribute( "svg:height", heightStr );
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+    xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -1176,7 +1176,7 @@ void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWri
     xmlWriter->addAttribute( "svg:height", heightStr );
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+    xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 1 );
@@ -1216,7 +1216,7 @@ void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xml
     xmlWriter->addAttribute( "svg:height", heightStr );
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );  
+    xmlWriter->addAttribute( "draw:layer", "layout" );  
     xmlWriter->endElement(); // path
 }
 
@@ -1324,7 +1324,7 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr
 
   xmlWriter->startElement( "draw:frame" );
   xmlWriter->addAttribute( "presentation:style-name", "pr1" );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
@@ -1389,7 +1389,7 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm
   xmlWriter->addAttribute( "draw:master-page-name", "Default" );
   xmlWriter->addAttribute( "draw:name", nameStr );
   xmlWriter->addAttribute( "draw:style-name", styleNameStr );
-  xmlWriter->addAttribute( "presentation:presentation-page-tqlayout-name", "AL1T0");
+  xmlWriter->addAttribute( "presentation:presentation-page-layout-name", "AL1T0");
 
   GroupObject* root = slide->rootObject();
   if( root )
diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp
index abfa9385..2a78b79f 100644
--- a/filters/kpresenter/powerpoint/libppt/pole.cpp
+++ b/filters/kpresenter/powerpoint/libppt/pole.cpp
@@ -94,7 +94,7 @@ class DirEntry
 {
   public:
     bool valid;            // false if invalid (should be skipped)
-    std::string name;      // the name, not in tqunicode anymore 
+    std::string name;      // the name, not in unicode anymore 
     bool dir;              // true if directory   
     unsigned long size;    // size (not valid if directory)
     unsigned long start;   // starting block
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.cpp b/filters/kpresenter/powerpoint/libppt/ustring.cpp
index 23b61d30..b0a44e56 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.cpp
+++ b/filters/kpresenter/powerpoint/libppt/ustring.cpp
@@ -216,13 +216,13 @@ UString UString::null;
 static char *statBuffer = 0L;
 
 UChar::UChar(const UCharReference &c)
-    : uc( c.tqunicode() )
+    : uc( c.unicode() )
 {
 }
 
 UChar UChar::toLower() const
 {
-  // ### properly support tqunicode tolower
+  // ### properly support unicode tolower
   if (uc >= 256 || islower(uc))
     return *this;
 
@@ -644,7 +644,7 @@ bool Libppt::operator<(const UString& s1, const UString& s2)
     l++;
   }
   if (l < lmin)
-    return (c1->tqunicode() < c2->tqunicode());
+    return (c1->unicode() < c2->unicode());
 
   return (l1 < l2);
 }
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.h b/filters/kpresenter/powerpoint/libppt/ustring.h
index c0e34cf4..52a43afe 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.h
+++ b/filters/kpresenter/powerpoint/libppt/ustring.h
@@ -71,7 +71,7 @@ namespace Libppt {
     /**
      * @return the 16 bit Unicode value of the character
      */
-    unsigned short tqunicode() const { return uc; }
+    unsigned short unicode() const { return uc; }
   public:
     /**
      * @return The character converted to lower case.
@@ -128,7 +128,7 @@ namespace Libppt {
     /**
      * @return Unicode value.
      */
-    unsigned short tqunicode() const { return ref().tqunicode(); }
+    unsigned short unicode() const { return ref().unicode(); }
     /**
      * @return Lower byte.
      */