Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

2 files changed, 14 insertions, 14 deletions

diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp
index d33675ab..ccbfc0e8 100644
--- a/kpresenter/autoformEdit/AFChoose.cpp
+++ b/kpresenter/autoformEdit/AFChoose.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdir.h>
 #include <tqwhatsthis.h>
 
@@ -86,7 +86,7 @@ void AFChoose::setupTabs()
         for (grpPtr=groupList.first();grpPtr != 0;grpPtr=groupList.next())
         {
             grpPtr->tab = new TQVBox(this);
-            TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) );
+            TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined tqshape by clicking on it then clicking the OK button (or just double-click on the tqshape). You can then insert the tqshape onto your slide by drawing the area with the mouse pointer." ) );
             grpPtr->loadWid = new KIconCanvas(grpPtr->tab);
             // Changes for the new KIconCanvas (Werner)
             TQDir d( grpPtr->dir.absFilePath() );
@@ -137,7 +137,7 @@ void AFChoose::setupTabs()
                         continue; // Invalid .desktop file
                 }
             }
-            grpPtr->loadWid->setBackgroundColor(colorGroup().base());
+            grpPtr->loadWid->setBackgroundColor(tqcolorGroup().base());
             grpPtr->loadWid->setResizeMode(TQIconView::Adjust);
             grpPtr->loadWid->sort();
             connect(grpPtr->loadWid,TQT_SIGNAL(nameChanged(TQString)),
@@ -148,7 +148,7 @@ void AFChoose::setupTabs()
                     TQT_SLOT(slotDoubleClick()));
             grpPtr->label = new TQLabel(grpPtr->tab);
             grpPtr->label->setText(" ");
-            grpPtr->label->setMaximumHeight(grpPtr->label->sizeHint().height());
+            grpPtr->label->setMaximumHeight(grpPtr->label->tqsizeHint().height());
             addTab(grpPtr->tab,grpPtr->name);
         }
     }
diff --git a/kpresenter/autoformEdit/ATFInterpreter.cpp b/kpresenter/autoformEdit/ATFInterpreter.cpp
index 0f01368a..5f010518 100644
--- a/kpresenter/autoformEdit/ATFInterpreter.cpp
+++ b/kpresenter/autoformEdit/ATFInterpreter.cpp
@@ -199,7 +199,7 @@ TQPointArray ATFInterpreter::getPointArray(int wid,int heig)
                     if (i == 14) py = tmp;
                 }
             }
-            pntArray.setPoint(coordList.at(),px,py);
+            pntArray.setPoint(coordList.tqat(),px,py);
         }
     }
     return pntArray;
@@ -239,7 +239,7 @@ void ATFInterpreter::interpret()
 
     for (TQStringList::Iterator it=lines.begin(); it!=lines.end(); ++it)
     {
-        if (!(*it).isEmpty() && (*it).at(0) != COMMENT)
+        if (!(*it).isEmpty() && (*it).tqat(0) != COMMENT)
         {
             if (level.top() == LEVEL_NULL)
             {
@@ -265,7 +265,7 @@ void ATFInterpreter::interpret()
             }
             else if (level.top() == LEVEL_X || level.top() == LEVEL_Y || level.top() == LEVEL_ATTR)
             {
-                switch (((*it).at(0)).latin1())
+                switch (((*it).tqat(0)).latin1())
                 {
                 case VAR_1:
                 {
@@ -310,7 +310,7 @@ void ATFInterpreter::interpret()
                 } break;
                 case VAR_PW:
                 {
-                    pw = 1; pw = ((*it).at(4)).latin1() - 48;
+                    pw = 1; pw = ((*it).tqat(4)).latin1() - 48;
                     attrib.pwDiv = (*it);
                 } break;
                 case '}':
@@ -363,10 +363,10 @@ TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s)
 
     for (unsigned int i=1; i<s.length(); ++i)
     {
-        if(s.at(i)==' ')
+        if(s.tqat(i)==' ')
             continue;
         signPtr = new Sign;
-        switch (s.at(i).latin1())
+        switch (s.tqat(i).latin1())
         {
         case VAR_W: signPtr->type = ST_WIDTH; break;
         case VAR_H: signPtr->type = ST_HEIGHT; break;
@@ -431,20 +431,20 @@ TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s)
             signPtr->type = ST_NUMBER;
             if (s.length() - 1 > i)
             {
-                switch (s.at(i+1).latin1())
+                switch (s.tqat(i+1).latin1())
                 {
                 case NUM_0: case NUM_1: case NUM_2: case NUM_3: case NUM_4:
                 case NUM_5: case NUM_6: case NUM_7: case NUM_8: case NUM_9:
                 {
-                    signPtr->num = (s.at(i).latin1() - 48) * 10 + s.at(i+1).latin1() - 48;
+                    signPtr->num = (s.tqat(i).latin1() - 48) * 10 + s.tqat(i+1).latin1() - 48;
                     i++;
                 } break;
                 default:
-                    signPtr->num = s.at(i).latin1() - 48; break;
+                    signPtr->num = s.tqat(i).latin1() - 48; break;
                 }
             }
             else
-                signPtr->num = s.at(i).latin1() - 48;
+                signPtr->num = s.tqat(i).latin1() - 48;
         } break;
         }
         list.append(signPtr);