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

6 files changed, 44 insertions, 44 deletions

diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp
index 172da37f..74ad2b30 100644
--- a/parts/doxygen/config.cpp
+++ b/parts/doxygen/config.cpp
@@ -550,7 +550,7 @@ char *yytext;
 #include <tqfileinfo.h>
 #include <tqfile.h>
 #include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <tqptrstack.h>
   
@@ -3773,12 +3773,12 @@ void Config::create()
               );
   cs->setWidgetType(ConfigString::File);
   cs = addString(  "LAYOUT_FILE",
-                   "The LAYOUT_FILE tag can be used to specify a tqlayout file which will be parsed by \n"
-		   "doxygen. The tqlayout file controls the global structure of the generated output files \n"
-		   "in an output format independent way. The create the tqlayout file that represents \n"
+                   "The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by \n"
+		   "doxygen. The layout file controls the global structure of the generated output files \n"
+		   "in an output format independent way. The create the layout file that represents \n"
 		   "doxygen's defaults, run doxygen with the -l option. You can optionally specify a \n"
 		   "file name after the option, if omitted DoxygenLayout.xml will be used as the name \n"
-		   "of the tqlayout file.\n"
+		   "of the layout file.\n"
 	      );
   cs->setWidgetType(ConfigString::File);
   addObsolete("DETAILS_AT_TOP");
@@ -4857,7 +4857,7 @@ void Config::create()
   cs = addString(   "DOT_FONTNAME",
                     "By default doxygen will write a font called FreeSans.ttf to the output \n"
 		    "directory and reference it in all dot files that doxygen generates. This \n"
-		    "font does not include all possible tqunicode characters however, so when you need \n"
+		    "font does not include all possible unicode characters however, so when you need \n"
 		    "these (or just want a differently looking font) you can specify the font name \n"
 		    "using DOT_FONTNAME. You need need to make sure dot is able to find the font, \n"
 		    "which can be done by putting it in a standard location or by setting the \n"
@@ -5005,7 +5005,7 @@ void Config::create()
                     "nodes that will be shown in the graph. If the number of nodes in a graph \n"
                     "becomes larger than this value, doxygen will truncate the graph, which is \n"
                     "visualized by representing a node as a red box. Note that doxygen if the \n"
-		    "number of direct tqchildren of the root node in a graph is already larger than \n"
+		    "number of direct children of the root node in a graph is already larger than \n"
 		    "DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note \n"
                     "that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. \n",
                     0,10000, 50
@@ -5102,8 +5102,8 @@ static TQCString configFileToString(const char *name)
       }
       totalSize+=size+2;
       contents.resize(totalSize);
-      contents.tqat(totalSize-2)='\n'; // to help the scanner
-      contents.tqat(totalSize-1)='\0';
+      contents.at(totalSize-2)='\n'; // to help the scanner
+      contents.at(totalSize-1)='\0';
       return contents;
     }
   }
diff --git a/parts/doxygen/config.h b/parts/doxygen/config.h
index 3d47d5c6..adedd17c 100644
--- a/parts/doxygen/config.h
+++ b/parts/doxygen/config.h
@@ -5,7 +5,7 @@
 #include <tqfile.h>
 #include <tqdict.h>
 #include <tqptrlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 /*! \brief Abstract base class for any configuration option.
  *
@@ -30,7 +30,7 @@ class ConfigOption
     enum 
     { 
      /*! Maximum length of an option in the config file. Used for 
-      *  tqalignment purposes.
+      *  alignment purposes.
       */
       MAX_OPTION_LENGTH = 23  
     };
diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp
index c70f5df6..72a7b5f2 100644
--- a/parts/doxygen/doxygenconfigwidget.cpp
+++ b/parts/doxygen/doxygenconfigwidget.cpp
@@ -16,7 +16,7 @@
 #include <tqscrollview.h>
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -171,10 +171,10 @@ DoxygenConfigWidget::~DoxygenConfigWidget()
 }
 
 
-TQSize DoxygenConfigWidget::tqsizeHint() const
+TQSize DoxygenConfigWidget::sizeHint() const
 {
     // without this the whole dialog becomes much too large
-    return TQSize(TQTabWidget::tqsizeHint().width(), 1);
+    return TQSize(TQTabWidget::sizeHint().width(), 1);
 }
 
 
diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h
index 7c4a31e6..f4a6db38 100644
--- a/parts/doxygen/doxygenconfigwidget.h
+++ b/parts/doxygen/doxygenconfigwidget.h
@@ -38,7 +38,7 @@ private slots:
     void changed();
 
 private:
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     void loadFile();
     void saveFile();
     void init();
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index c1a6469b..b8953d52 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -41,7 +41,7 @@
 
 #include <tqvbox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqpopupmenu.h>
 #include <tqfileinfo.h>
 
@@ -448,7 +448,7 @@ void DoxygenPart::slotRunPreview( )
         if (poDir != 0)
             *poDir->valueRef() = dirVal;
 
-        KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").tqarg(file.name()));
+        KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").arg(file.name()));
         return;
     }
 
diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp
index 31a1d4ed..907d5cd2 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -12,7 +12,7 @@
  ***************************************************************************/
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <klineedit.h>
 #include <tqpushbutton.h>
@@ -113,13 +113,13 @@ const char **update_xpm = (const char **)update_xpm_data;
 InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag)
     : TQWidget(parent), state(flag), key(k)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+    TQHBoxLayout *layout = new TQHBoxLayout(this);
     cb = new TQCheckBox(text,this);
 
     init();
 
-    tqlayout->addWidget(cb);
-    tqlayout->addStretch(1);
+    layout->addWidget(cb);
+    layout->addStretch(1);
     
     connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool)));
 }
@@ -154,16 +154,16 @@ void InputBool::setEnabled(bool b)
 InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal)
     : TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
+    TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
     
     sp = new TQSpinBox(minVal, maxVal, 1, this);
     lab = new TQLabel(sp, label+":", this);
     
     init();
   
-    tqlayout->addWidget(lab);
-    tqlayout->addWidget(sp);
-    tqlayout->addStretch(1);
+    layout->addWidget(lab);
+    layout->addWidget(sp);
+    layout->addStretch(1);
 
     connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
 }
@@ -203,25 +203,25 @@ InputString::InputString(const TQString & label,
     le = 0; br = 0; com = 0;
     
     if (m == StringFixed) {
-        TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
+        TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
         com = new TQComboBox(this); 
 	lab = new TQLabel(com,label+":", this);
-	tqlayout->addWidget(lab);
-        tqlayout->addWidget(com);
-        tqlayout->addStretch(1);
+	layout->addWidget(lab);
+        layout->addWidget(com);
+        layout->addStretch(1);
     } else {
-        TQGridLayout *tqlayout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
+        TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
         le = new KLineEdit(this);
 	lab = new TQLabel(le,label+":", this);
-	tqlayout->addWidget(lab, 0, 0);
+	layout->addWidget(lab, 0, 0);
         le->setText(s);
-        tqlayout->addWidget(le, 0, 1);
+        layout->addWidget(le, 0, 1);
         
         if (m == StringFile || m == StringDir) {
             br = new TQPushButton(this);
             br->setPixmap(SmallIcon(m==StringFile? "document" : "folder"));
             TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder"));
-            tqlayout->addWidget(br, 0, 2);
+            layout->addWidget(br, 0, 2);
         }
     }
     
@@ -327,29 +327,29 @@ InputStrList::InputStrList(const TQString & label,
                            TQWidget *parent, TQStrList &sl, ListMode lm)
     : TQWidget(parent), strList(sl)
 {
-    TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5);
+    TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5);
     
     TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */
-    TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5);
+    TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5);
     le  = new KLineEdit(dw);
     lab = new TQLabel(le,label+":", this );
-    tqlayout->addWidget(lab, 0, 0);
-    boxtqlayout->addWidget(le, 1);
+    layout->addWidget(lab, 0, 0);
+    boxlayout->addWidget(le, 1);
 
     add = new TQPushButton(dw);
     add->setPixmap(TQPixmap( add_xpm ));
     TQToolTip::add(add, i18n("Add item"));
-    boxtqlayout->addWidget(add);
+    boxlayout->addWidget(add);
     
     del = new TQPushButton(dw);
     del->setPixmap(TQPixmap( del_xpm ));
     TQToolTip::add(del, i18n("Delete selected item"));
-    boxtqlayout->addWidget(del);
+    boxlayout->addWidget(del);
 
     upd = new TQPushButton(dw); 
     upd->setPixmap(TQPixmap( update_xpm ));
     TQToolTip::add(upd, i18n("Update selected item"));
-    boxtqlayout->addWidget(upd);
+    boxlayout->addWidget(upd);
     
     lb  = new TQListBox(this);
     lb->setMinimumSize(400, 100);
@@ -364,17 +364,17 @@ InputStrList::InputStrList(const TQString & label,
             brFile = new TQPushButton(dw);
             brFile->setPixmap(SmallIcon("document"));
             TQToolTip::add(brFile, i18n("Browse to a file"));
-            boxtqlayout->addWidget(brFile);
+            boxlayout->addWidget(brFile);
         } 
         if (lm & ListDir) {
             brDir = new TQPushButton(dw);
             brDir->setPixmap(SmallIcon("folder"));
             TQToolTip::add(brDir, i18n("Browse to a folder"));
-            boxtqlayout->addWidget(brDir);
+            boxlayout->addWidget(brDir);
         }
     }
-    tqlayout->addWidget(dw, 0, 1);
-    tqlayout->addWidget(lb, 1, 1);
+    layout->addWidget(dw, 0, 1);
+    layout->addWidget(lb, 1, 1);
     
     connect( le,   TQT_SIGNAL(returnPressed()), 
              this, TQT_SLOT(addString()) );