From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:56:31 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.
---
 lib/kofficecore/tests/koxmlreadertest.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib/kofficecore/tests/koxmlreadertest.cpp')

diff --git a/lib/kofficecore/tests/koxmlreadertest.cpp b/lib/kofficecore/tests/koxmlreadertest.cpp
index a298bd509..5056e416c 100644
--- a/lib/kofficecore/tests/koxmlreadertest.cpp
+++ b/lib/kofficecore/tests/koxmlreadertest.cpp
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <tqcstring.h>
 #include <tqbuffer.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdatetime.h>
 #include <tqfile.h>
 
@@ -639,7 +639,7 @@ void testDocument()
   CHECK( doc.previousSibling().isNull(), true );
   CHECK( doc.nextSibling().isNull(), true );
 
-  // make sure its children are fine
+  // make sure its tqchildren are fine
   KoXmlElement rootElement;
   rootElement = doc.firstChild().toElement();
   CHECK( rootElement.isNull(), false );
@@ -1419,9 +1419,9 @@ void testSimpleOpenDocumentPresentation()
   xmlstream << "  <office:presentation>";
   xmlstream << "   <draw:page draw:name=\"Title\" draw:style-name=\"dp1\" ";
   xmlstream << "      draw:master-page-name=\"lyt-cool\" ";
-  xmlstream << "      presentation:presentation-page-layout-name=\"AL1T0\">";
+  xmlstream << "      presentation:presentation-page-tqlayout-name=\"AL1T0\">";
   xmlstream << "    <draw:frame presentation:style-name=\"pr1\" ";
-  xmlstream << "      draw:text-style-name=\"P2\" draw:layer=\"layout\" ";
+  xmlstream << "      draw:text-style-name=\"P2\" draw:layer=\"tqlayout\" ";
   xmlstream << "      svg:width=\"23.912cm\" svg:height=\"3.508cm\" ";
   xmlstream << "      svg:x=\"2.058cm\" svg:y=\"1.543cm\" ";
   xmlstream << "      presentation:class=\"title\" ";
@@ -1431,7 +1431,7 @@ void testSimpleOpenDocumentPresentation()
   xmlstream << "     </draw:text-box>";
   xmlstream << "    </draw:frame>";
   xmlstream << "    <draw:frame presentation:style-name=\"pr2\" ";
-  xmlstream << "      draw:text-style-name=\"P3\" draw:layer=\"layout\"";
+  xmlstream << "      draw:text-style-name=\"P3\" draw:layer=\"tqlayout\"";
   xmlstream << "      svg:width=\"23.912cm\" svg:height=\"13.231cm\"";
   xmlstream << "      svg:x=\"2.058cm\" svg:y=\"5.838cm\" ";
   xmlstream << "      presentation:class=\"subtitle\">";
@@ -1440,8 +1440,8 @@ void testSimpleOpenDocumentPresentation()
   xmlstream << "     </draw:text-box>";
   xmlstream << "    </draw:frame>";
   xmlstream << "    <presentation:notes draw:style-name=\"dp2\">";
-  xmlstream << "     <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"layout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>";
-  xmlstream << "     <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"layout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">";
+  xmlstream << "     <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"tqlayout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>";
+  xmlstream << "     <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"tqlayout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">";
   xmlstream << "      <draw:text-box/>";
   xmlstream << "     </draw:frame>";
   xmlstream << "    </presentation:notes>";
@@ -1587,7 +1587,7 @@ void testSimpleOpenDocumentPresentation()
   CHECK( titlePageElement.attributeNS(drawNS,"style-name",""), TQString("dp1") );
   CHECK( titlePageElement.attributeNS(drawNS,"master-page-name",""), TQString("lyt-cool") );
   CHECK( titlePageElement.attributeNS(presentationNS,
-    "presentation-page-layout-name",""), TQString("AL1T0") );
+    "presentation-page-tqlayout-name",""), TQString("AL1T0") );
 
   // <draw:frame> for the title frame
   KoXmlElement titleFrameElement;
@@ -1605,7 +1605,7 @@ void testSimpleOpenDocumentPresentation()
   CHECK( titleFrameElement.attributeNS(presentationNS,"class",""), TQString("title") );
   CHECK( titleFrameElement.attributeNS(presentationNS,"user-transformed",""), TQString("true") );
   CHECK( titleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P2") );
-  CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") );
+  CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") );
   CHECK( titleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") );
   CHECK( titleFrameElement.attributeNS(svgNS,"height",""), TQString("3.508cm") );
   CHECK( titleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") );
@@ -1655,7 +1655,7 @@ void testSimpleOpenDocumentPresentation()
   CHECK( subtitleFrameElement.attributeNS(presentationNS,"class",""), TQString("subtitle") );
   CHECK( subtitleFrameElement.hasAttributeNS(presentationNS,"user-transformed"), false );
   CHECK( subtitleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P3") );
-  CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") );
+  CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") );
   CHECK( subtitleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") );
   CHECK( subtitleFrameElement.attributeNS(svgNS,"height",""), TQString("13.231cm") );
   CHECK( subtitleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") );
@@ -1887,7 +1887,7 @@ void testLargeOpenDocumentSpreadsheet()
   xmlstream << "<office:spreadsheet>";
   for( int i = 0; i < sheetCount; i++ )
   {
-    TQString sheetName = TQString("Sheet%1").arg(i+1);
+    TQString sheetName = TQString("Sheet%1").tqarg(i+1);
     xmlstream << "<table:table table:name=\"" << sheetName;
     xmlstream << "\" table:print=\"false\">";
     for( int j = 0; j < rowCount; j++ )
@@ -1981,7 +1981,7 @@ void testLargeOpenDocumentSpreadsheet()
   tableElement = spreadsheetElement.firstChild().toElement();
   for( int table=0; table < sheetCount; table++ )
   {
-    TQString tableName = TQString("Sheet%1").arg(table+1);
+    TQString tableName = TQString("Sheet%1").tqarg(table+1);
     CHECK( tableElement.isNull(), false );
     CHECK( tableElement.isElement(), true );
     CHECK( tableElement.localName(), TQString("table") );
-- 
cgit v1.2.3