Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

10 files changed, 232 insertions, 232 deletions

diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 02d09d142..c47300190 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -1,5 +1,5 @@
-#include <qregexp.h>
-#include <qdir.h>
+#include <tqregexp.h>
+#include <tqdir.h>
 #include <assert.h>
 
 #include <kapplication.h>
@@ -15,31 +15,31 @@
 
 
 HTMLSearch::HTMLSearch()
-  : QObject(), _proc(0)
+  : TQObject(), _proc(0)
 {
 }
 
 
-QString HTMLSearch::dataPath(const QString& _lang)
+TQString HTMLSearch::dataPath(const TQString& _lang)
 {
-    return kapp->dirs()->saveLocation("data", QString("khelpcenter/%1").arg(_lang));
+    return kapp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
 }
 
 
-void HTMLSearch::scanDir(const QString& dir)
+void HTMLSearch::scanDir(const TQString& dir)
 {
     assert( dir.at( dir.length() - 1 ) == '/' );
 
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
 
     if ( KStandardDirs::exists( dir + "index.docbook" ) ) {
         _files.append(dir + "index.docbook");
         progress->setFilesScanned(++_filesScanned);
     } else {
-        QDir d(dir, "*.html", QDir::Name|QDir::IgnoreCase, QDir::Files | QDir::Readable);
-        QStringList const &list = d.entryList();
-        QString adir = d.canonicalPath () + "/";
-        QString file;
+        TQDir d(dir, "*.html", TQDir::Name|TQDir::IgnoreCase, TQDir::Files | TQDir::Readable);
+        TQStringList const &list = d.entryList();
+        TQString adir = d.canonicalPath () + "/";
+        TQString file;
         for (it=list.begin(); it != list.end(); ++it)
         {
             file = adir + *it;
@@ -50,8 +50,8 @@ void HTMLSearch::scanDir(const QString& dir)
         }
     }
 
-    QDir d2(dir, QString::null, QDir::Name|QDir::IgnoreCase, QDir::Dirs);
-    QStringList const &dlist = d2.entryList();
+    TQDir d2(dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs);
+    TQStringList const &dlist = d2.entryList();
     for (it=dlist.begin(); it != dlist.end(); ++it)
         if (*it != "." && *it != "..")
         {
@@ -61,9 +61,9 @@ void HTMLSearch::scanDir(const QString& dir)
 }
 
 
-bool HTMLSearch::saveFilesList(const QString& _lang)
+bool HTMLSearch::saveFilesList(const TQString& _lang)
 {
-    QStringList dirs;
+    TQStringList dirs;
 
     // throw away old files list
     _files.clear();
@@ -80,8 +80,8 @@ bool HTMLSearch::saveFilesList(const QString& _lang)
     // TODO: Man and Info!!
 
     // add local urls
-    QStringList add = config->readListEntry("Paths");
-    QStringList::Iterator it;
+    TQStringList add = config->readListEntry("Paths");
+    TQStringList::Iterator it;
     for (it = add.begin(); it != add.end(); ++it) {
         if ( ( *it ).at( ( *it ).length() - 1 ) != '/' )
             ( *it ) += '/';
@@ -99,20 +99,20 @@ bool HTMLSearch::saveFilesList(const QString& _lang)
 }
 
 
-bool HTMLSearch::createConfig(const QString& _lang)
+bool HTMLSearch::createConfig(const TQString& _lang)
 {
-    QString fname = dataPath(_lang) + "/htdig.conf";
+    TQString fname = dataPath(_lang) + "/htdig.conf";
 
     // locate the common dir
-    QString wrapper = locate("data", QString("khelpcenter/%1/wrapper.html").arg(_lang));
+    TQString wrapper = locate("data", TQString("khelpcenter/%1/wrapper.html").arg(_lang));
     if (wrapper.isEmpty())
-        wrapper = locate("data", QString("khelpcenter/en/wrapper.html"));
+        wrapper = locate("data", TQString("khelpcenter/en/wrapper.html"));
     if (wrapper.isEmpty())
         return false;
     wrapper = wrapper.left(wrapper.length() - 12);
 
     // locate the image dir
-    QString images = locate("data", "khelpcenter/pics/star.png");
+    TQString images = locate("data", "khelpcenter/pics/star.png");
     if (images.isEmpty())
         return false;
     images = images.left(images.length() - 8);
@@ -120,7 +120,7 @@ bool HTMLSearch::createConfig(const QString& _lang)
     // This is an example replacement for the default bad_words file
     // distributed with ht://Dig. It was compiled by Marjolein Katsma
     // <[email protected]>.
-    QString bad_words = i18n( "List of words to exclude from index",
+    TQString bad_words = i18n( "List of words to exclude from index",
                               "above:about:according:across:actually:\n"
                               "adj:after:afterwards:again:against:all:\n"
                               "almost:alone:along:already:also:although:\n"
@@ -175,14 +175,14 @@ bool HTMLSearch::createConfig(const QString& _lang)
                               "would:wouldnt:yes:yet:you:youd:youll:your:\n"
                               "youre:yours:yourself:yourselves:youve" );
 
-    QFile f;
+    TQFile f;
     f.setName( dataPath(_lang) + "/bad_words" );
     if (f.open(IO_WriteOnly))
     {
-        QTextStream ts( &f );
-        QStringList words = QStringList::split ( QRegExp ( "[\n:]" ),
+        TQTextStream ts( &f );
+        TQStringList words = TQStringList::split ( TQRegExp ( "[\n:]" ),
                                                  bad_words, false);
-        for ( QStringList::ConstIterator it = words.begin();
+        for ( TQStringList::ConstIterator it = words.begin();
               it != words.end(); ++it )
             ts << *it << endl;
         f.close();
@@ -193,7 +193,7 @@ bool HTMLSearch::createConfig(const QString& _lang)
     {
         kdDebug() << "Writing config for " << _lang << " to " << fname << endl;
 
-        QTextStream ts(&f);
+        TQTextStream ts(&f);
 
         ts << "database_dir:\t\t" << dataPath(_lang) << endl;
         ts << "start_url:\t\t`" << dataPath(_lang) << "/files`" << endl;
@@ -221,7 +221,7 @@ bool HTMLSearch::createConfig(const QString& _lang)
 
 #define CHUNK_SIZE 15
 
-bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
+bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
 {
     if (_lang == "C")
         _lang = "en";
@@ -243,7 +243,7 @@ bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
     // run htdig ------------------------------------------------------
     KConfig *config = new KConfig("khelpcenterrc", true);
     KConfigGroupSaver saver(config, "htdig");
-    QString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
+    TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
 
     if (exe.isEmpty())
     {
@@ -258,7 +258,7 @@ bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
     progress->setFilesToDig(_filesToDig);
     _filesDigged = 0;
 
-    QDir d; d.mkdir(dataPath(_lang));
+    TQDir d; d.mkdir(dataPath(_lang));
 
     while (!done)
     {
@@ -276,19 +276,19 @@ bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
 
         kdDebug() << "Running htdig" << endl;
 
-        connect(_proc, SIGNAL(receivedStdout(KProcess *,char*,int)),
-                this, SLOT(htdigStdout(KProcess *,char*,int)));
+        connect(_proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
+                this, TQT_SLOT(htdigStdout(KProcess *,char*,int)));
 
-        connect(_proc, SIGNAL(processExited(KProcess *)),
-                this, SLOT(htdigExited(KProcess *)));
+        connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
+                this, TQT_SLOT(htdigExited(KProcess *)));
 
         _htdigRunning = true;
 
         // write out file
-        QFile f(dataPath(_lang)+"/files");
+        TQFile f(dataPath(_lang)+"/files");
         if (f.open(IO_WriteOnly))
 	{
-            QTextStream ts(&f);
+            TQTextStream ts(&f);
 
             for (int i=0; i<CHUNK_SIZE; ++i, ++count)
                 if (count < _filesToDig) {
@@ -340,8 +340,8 @@ bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
 
     kdDebug() << "Running htmerge" << endl;
 
-    connect(_proc, SIGNAL(processExited(KProcess *)),
-            this, SLOT(htmergeExited(KProcess *)));
+    connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
+            this, TQT_SLOT(htmergeExited(KProcess *)));
 
     _htmergeRunning = true;
 
@@ -372,7 +372,7 @@ bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
 
 void HTMLSearch::htdigStdout(KProcess *, char *buffer, int len)
 {
-    QString line = QString(buffer).left(len);
+    TQString line = TQString(buffer).left(len);
 
     int cnt=0, index=-1;
     while ( (index = line.find("file://", index+1)) > 0)
@@ -407,7 +407,7 @@ void HTMLSearch::htmergeExited(KProcess *)
 
 void HTMLSearch::htsearchStdout(KProcess *, char *buffer, int len)
 {
-  _searchResult += QString::fromLocal8Bit(buffer,len);
+  _searchResult += TQString::fromLocal8Bit(buffer,len);
 }
 
 
@@ -419,35 +419,35 @@ void HTMLSearch::htsearchExited(KProcess *)
 }
 
 
-QString HTMLSearch::search(QString _lang, QString words, QString method, int matches,
-			   QString format, QString sort)
+TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int matches,
+			   TQString format, TQString sort)
 {
   if (_lang == "C")
     _lang = "en";
 
   createConfig(_lang);
 
-  QString result = dataPath(_lang)+"/result.html";
+  TQString result = dataPath(_lang)+"/result.html";
 
   // run htsearch ----------------------------------------------------
   KConfig *config = new KConfig("khelpcenterrc", true);
   KConfigGroupSaver saver(config, "htdig");
-  QString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
+  TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
   if (exe.isEmpty())
   {
       delete config;
-    return QString::null;
+    return TQString::null;
   }
   _proc = new KProcess();
   *_proc << exe << "-c" << dataPath(_lang)+"/htdig.conf" <<
-    QString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5").arg(words).arg(method).arg(matches).arg(format).arg(sort);
+    TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5").arg(words).arg(method).arg(matches).arg(format).arg(sort);
 
   kdDebug() << "Running htsearch" << endl;
 
-  connect(_proc, SIGNAL(receivedStdout(KProcess *,char*,int)),
-	  this, SLOT(htsearchStdout(KProcess *,char*,int)));
-  connect(_proc, SIGNAL(processExited(KProcess *)),
-	  this, SLOT(htsearchExited(KProcess *)));
+  connect(_proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
+	  this, TQT_SLOT(htsearchStdout(KProcess *,char*,int)));
+  connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
+	  this, TQT_SLOT(htsearchExited(KProcess *)));
 
   _htsearchRunning = true;
   _searchResult = "";
@@ -461,20 +461,20 @@ QString HTMLSearch::search(QString _lang, QString words, QString method, int mat
       kdDebug() << "Error running htsearch... returning now" << endl;
       delete _proc;
       delete config;
-      return QString::null;
+      return TQString::null;
     }
 
   delete _proc;
 
   // modify the search result
   _searchResult = _searchResult.replace("http://localhost/", "file:/");
-  _searchResult = _searchResult.replace("Content-type: text/html", QString::null);
+  _searchResult = _searchResult.replace("Content-type: text/html", TQString::null);
 
   // dump the search result
-  QFile f(result);
+  TQFile f(result);
   if (f.open(IO_WriteOnly))
     {
-      QTextStream ts(&f);
+      TQTextStream ts(&f);
 
       ts << _searchResult << endl;
 
@@ -483,5 +483,5 @@ QString HTMLSearch::search(QString _lang, QString words, QString method, int mat
       return result;
     }
   delete config;
-  return QString::null;
+  return TQString::null;
 }
diff --git a/khelpcenter/htmlsearch/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h
index f5568218c..2f4031782 100644
--- a/khelpcenter/htmlsearch/htmlsearch.h
+++ b/khelpcenter/htmlsearch/htmlsearch.h
@@ -2,8 +2,8 @@
 #define __HTMLSEARCH_H__
 
 
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 
 
 class QWidget;
@@ -24,10 +24,10 @@ public:
 
   HTMLSearch();
 
-  bool generateIndex(QString lang, QWidget *parent=0);
+  bool generateIndex(TQString lang, TQWidget *parent=0);
 
-  QString search(QString lang, QString words, QString method="and", int matches=10,
-		 QString format="builtin-long", QString sort="score");
+  TQString search(TQString lang, TQString words, TQString method="and", int matches=10,
+		 TQString format="builtin-long", TQString sort="score");
 
 
 protected slots:
@@ -41,21 +41,21 @@ protected slots:
 
 protected:
 
-  QString dataPath(const QString& lang);
+  TQString dataPath(const TQString& lang);
 
-  bool saveFilesList(const QString& lang);
-  void scanDir(const QString& dir);
+  bool saveFilesList(const TQString& lang);
+  void scanDir(const TQString& dir);
 
-  bool createConfig(const QString& lang);
+  bool createConfig(const TQString& lang);
 
 
 private:
 
-  QStringList   _files;
+  TQStringList   _files;
   KProcess      *_proc;
   int           _filesToDig, _filesDigged, _filesScanned;
   volatile bool _htdigRunning, _htmergeRunning, _htsearchRunning;
-  QString       _searchResult;
+  TQString       _searchResult;
   ProgressDialog *progress;
 
 };
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 20ab149b4..9dfc5e350 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -18,13 +18,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <qlayout.h>
+#include <tqlayout.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurllabel.h>
 #include <kapplication.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
 #include <kfiledialog.h>
 #include <kprocess.h>
 #include "klangcombo.h"
@@ -34,119 +34,119 @@
 #include "kcmhtmlsearch.moc"
 
 
-KHTMLSearchConfig::KHTMLSearchConfig(QWidget *parent, const char *name)
+KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name), indexProc(0)
 {
-  QVBoxLayout *vbox = new QVBoxLayout(this, 5);
+  TQVBoxLayout *vbox = new TQVBoxLayout(this, 5);
 
 
-  QGroupBox *gb = new QGroupBox(i18n("ht://dig"), this);
+  TQGroupBox *gb = new TQGroupBox(i18n("ht://dig"), this);
   vbox->addWidget(gb);
 
-  QGridLayout *grid = new QGridLayout(gb, 3,2, 6,6);
+  TQGridLayout *grid = new TQGridLayout(gb, 3,2, 6,6);
 
   grid->addRowSpacing(0, gb->fontMetrics().lineSpacing());
 
-  QLabel *l = new QLabel(i18n("The fulltext search feature makes use of the "
+  TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the "
                   "ht://dig HTML search engine. "
                   "You can get ht://dig at the"), gb);
-  l->setAlignment(QLabel::WordBreak);
+  l->setAlignment(TQLabel::WordBreak);
   l->setMinimumSize(l->sizeHint());
   grid->addMultiCellWidget(l, 1, 1, 0, 1);
-  QWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
+  TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
 
   KURLLabel *url = new KURLLabel(gb);
   url->setURL("http://www.htdig.org");
   url->setText(i18n("ht://dig home page"));
-  url->setAlignment(QLabel::AlignHCenter);
+  url->setAlignment(TQLabel::AlignHCenter);
   grid->addMultiCellWidget(url, 2,2, 0, 1);
-  connect(url, SIGNAL(leftClickedURL(const QString&)),
-      this, SLOT(urlClicked(const QString&)));
+  connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
+      this, TQT_SLOT(urlClicked(const TQString&)));
 
-  gb = new QGroupBox(i18n("Program Locations"), this);
+  gb = new TQGroupBox(i18n("Program Locations"), this);
 
   vbox->addWidget(gb);
-  grid = new QGridLayout(gb, 4,2, 6,6);
+  grid = new TQGridLayout(gb, 4,2, 6,6);
   grid->addRowSpacing(0, gb->fontMetrics().lineSpacing());
 
   htdigBin = new KURLRequester(gb);
-  l = new QLabel(htdigBin, i18n("ht&dig"), gb);
+  l = new TQLabel(htdigBin, i18n("ht&dig"), gb);
   l->setBuddy( htdigBin );
   grid->addWidget(l, 1,0);
   grid->addWidget(htdigBin, 1,1);
-  connect(htdigBin->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(configChanged()));
-  QString wtstr = i18n( "Enter the path to your htdig program here, e.g. /usr/local/bin/htdig" );
-  QWhatsThis::add( htdigBin, wtstr );
-  QWhatsThis::add( l, wtstr );
+  connect(htdigBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+  TQString wtstr = i18n( "Enter the path to your htdig program here, e.g. /usr/local/bin/htdig" );
+  TQWhatsThis::add( htdigBin, wtstr );
+  TQWhatsThis::add( l, wtstr );
 
   htsearchBin = new KURLRequester(gb);
-  l = new QLabel(htsearchBin, i18n("ht&search"), gb);
+  l = new TQLabel(htsearchBin, i18n("ht&search"), gb);
   l->setBuddy( htsearchBin );
   grid->addWidget(l, 2,0);
   grid->addWidget(htsearchBin, 2,1);
-  connect(htsearchBin->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(configChanged()));
+  connect(htsearchBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
   wtstr = i18n( "Enter the path to your htsearch program here, e.g. /usr/local/bin/htsearch" );
-  QWhatsThis::add( htsearchBin, wtstr );
-  QWhatsThis::add( l, wtstr );
+  TQWhatsThis::add( htsearchBin, wtstr );
+  TQWhatsThis::add( l, wtstr );
 
   htmergeBin = new KURLRequester(gb);
-  l = new QLabel(htmergeBin, i18n("ht&merge"), gb);
+  l = new TQLabel(htmergeBin, i18n("ht&merge"), gb);
   l->setBuddy( htmergeBin );
   grid->addWidget(l, 3,0);
   grid->addWidget(htmergeBin, 3,1);
-  connect(htmergeBin->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(configChanged()));
+  connect(htmergeBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
   wtstr = i18n( "Enter the path to your htmerge program here, e.g. /usr/local/bin/htmerge" );
-  QWhatsThis::add( htmergeBin, wtstr );
-  QWhatsThis::add( l, wtstr );
+  TQWhatsThis::add( htmergeBin, wtstr );
+  TQWhatsThis::add( l, wtstr );
 
-  QHBoxLayout *hbox = new QHBoxLayout(vbox);
+  TQHBoxLayout *hbox = new TQHBoxLayout(vbox);
 
-  gb = new QGroupBox(i18n("Scope"), this);
+  gb = new TQGroupBox(i18n("Scope"), this);
   hbox->addWidget(gb);
-  QWhatsThis::add( gb, i18n( "Here you can select which parts of the documentation should be included in the fulltext search index. Available options are the KDE Help pages, the installed man pages, and the installed info pages. You can select any number of these." ) );
+  TQWhatsThis::add( gb, i18n( "Here you can select which parts of the documentation should be included in the fulltext search index. Available options are the KDE Help pages, the installed man pages, and the installed info pages. You can select any number of these." ) );
 
-  QVBoxLayout *vvbox = new QVBoxLayout(gb, 6,2);
+  TQVBoxLayout *vvbox = new TQVBoxLayout(gb, 6,2);
   vvbox->addSpacing(gb->fontMetrics().lineSpacing());
 
-  indexKDE = new QCheckBox(i18n("&KDE help"), gb);
+  indexKDE = new TQCheckBox(i18n("&KDE help"), gb);
   vvbox->addWidget(indexKDE);
-  connect(indexKDE, SIGNAL(clicked()), this, SLOT(configChanged()));
+  connect(indexKDE, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
 
-  indexMan = new QCheckBox(i18n("&Man pages"), gb);
+  indexMan = new TQCheckBox(i18n("&Man pages"), gb);
   vvbox->addWidget(indexMan);
   indexMan->setEnabled(false),
-  connect(indexMan, SIGNAL(clicked()), this, SLOT(configChanged()));
+  connect(indexMan, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
 
-  indexInfo = new QCheckBox(i18n("&Info pages"), gb);
+  indexInfo = new TQCheckBox(i18n("&Info pages"), gb);
   vvbox->addWidget(indexInfo);
   indexInfo->setEnabled(false);
-  connect(indexInfo, SIGNAL(clicked()), this, SLOT(configChanged()));
+  connect(indexInfo, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
 
-  gb = new QGroupBox(i18n("Additional Search Paths"), this);
+  gb = new TQGroupBox(i18n("Additional Search Paths"), this);
   hbox->addWidget(gb);
-  QWhatsThis::add( gb, i18n( "Here you can add additional paths to search for documentation. To add a path, click on the <em>Add...</em> button and select the folder from where additional documentation should be searched. You can remove folders by clicking on the <em>Delete</em> button." ) );
+  TQWhatsThis::add( gb, i18n( "Here you can add additional paths to search for documentation. To add a path, click on the <em>Add...</em> button and select the folder from where additional documentation should be searched. You can remove folders by clicking on the <em>Delete</em> button." ) );
 
-  grid = new QGridLayout(gb, 4,3, 6,2);
+  grid = new TQGridLayout(gb, 4,3, 6,2);
   grid->addRowSpacing(0, gb->fontMetrics().lineSpacing());
 
-  addButton = new QPushButton(i18n("Add..."), gb);
+  addButton = new TQPushButton(i18n("Add..."), gb);
   grid->addWidget(addButton, 1,0);
 
-  delButton = new QPushButton(i18n("Delete"), gb);
+  delButton = new TQPushButton(i18n("Delete"), gb);
   grid->addWidget(delButton, 2,0);
 
   searchPaths = new KListBox(gb);
   grid->addMultiCellWidget(searchPaths, 1,3, 1,1);
   grid->setRowStretch(2,2);
 
-  gb = new QGroupBox(i18n("Language Settings"), this);
+  gb = new TQGroupBox(i18n("Language Settings"), this);
   vbox->addWidget(gb);
-  QWhatsThis::add(gb, i18n("Here you can select the language you want to create the index for."));
+  TQWhatsThis::add(gb, i18n("Here you can select the language you want to create the index for."));
   language = new KLanguageCombo(gb);
-  l = new QLabel(language, i18n("&Language"), gb);
-  vvbox = new QVBoxLayout(gb, 6,2);
+  l = new TQLabel(language, i18n("&Language"), gb);
+  vvbox = new TQVBoxLayout(gb, 6,2);
   vvbox->addSpacing(gb->fontMetrics().lineSpacing());
-  hbox = new QHBoxLayout(vvbox, 6);
+  hbox = new TQHBoxLayout(vvbox, 6);
   hbox->addWidget(l);
   hbox->addWidget(language,1);
   hbox->addStretch(1);
@@ -155,16 +155,16 @@ KHTMLSearchConfig::KHTMLSearchConfig(QWidget *parent, const char *name)
 
   vbox->addStretch(1);
 
-  runButton = new QPushButton(i18n("Generate Index..."), this);
-  QWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) );
+  runButton = new TQPushButton(i18n("Generate Index..."), this);
+  TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) );
   runButton->setFixedSize(runButton->sizeHint());
   vbox->addWidget(runButton, AlignRight);
-  connect(runButton, SIGNAL(clicked()), this, SLOT(generateIndex()));
+  connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
 
-  connect(addButton, SIGNAL(clicked()), this, SLOT(addClicked()));
-  connect(delButton, SIGNAL(clicked()), this, SLOT(delClicked()));
-  connect(searchPaths, SIGNAL(highlighted(const QString &)),
-      this, SLOT(pathSelected(const QString &)));
+  connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked()));
+  connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delClicked()));
+  connect(searchPaths, TQT_SIGNAL(highlighted(const TQString &)),
+      this, TQT_SLOT(pathSelected(const TQString &)));
 
   checkButtons();
 
@@ -178,17 +178,17 @@ void KHTMLSearchConfig::loadLanguages()
   language->clear();
 
   // add all languages to the list
-  QStringList langs = KGlobal::dirs()->findAllResources("locale",
-							QString::fromLatin1("*/entry.desktop"));
+  TQStringList langs = KGlobal::dirs()->findAllResources("locale",
+							TQString::fromLatin1("*/entry.desktop"));
   langs.sort();
 
-  for (QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
+  for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
     {
       KSimpleConfig entry(*it);
-      entry.setGroup(QString::fromLatin1("KCM Locale"));
-      QString name = entry.readEntry(QString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
+      entry.setGroup(TQString::fromLatin1("KCM Locale"));
+      TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
 
-      QString path = *it;
+      TQString path = *it;
       int index = path.findRev('/');
       path = path.left(index);
       index = path.findRev('/');
@@ -198,13 +198,13 @@ void KHTMLSearchConfig::loadLanguages()
 }
 
 
-QString KHTMLSearchConfig::quickHelp() const
+TQString KHTMLSearchConfig::quickHelp() const
 {
     return i18n( "<h1>Help Index</h1> This configuration module lets you configure the ht://dig engine which can be used for fulltext search in the KDE documentation as well as other system documentation like man and info pages." );
 }
 
 
-void KHTMLSearchConfig::pathSelected(const QString &)
+void KHTMLSearchConfig::pathSelected(const TQString &)
 {
   checkButtons();
 }
@@ -219,7 +219,7 @@ void KHTMLSearchConfig::checkButtons()
 
 void KHTMLSearchConfig::addClicked()
 {
-  QString dir = KFileDialog::getExistingDirectory();
+  TQString dir = KFileDialog::getExistingDirectory();
 
   if (!dir.isEmpty())
     {
@@ -265,14 +265,14 @@ void KHTMLSearchConfig::load()
   indexMan->setChecked(config->readBoolEntry("Man", false));
   indexInfo->setChecked(config->readBoolEntry("Info", false));
 
-  QStringList l = config->readPathListEntry("Paths");
+  TQStringList l = config->readPathListEntry("Paths");
   searchPaths->clear();
-  QStringList::Iterator it;
+  TQStringList::Iterator it;
   for (it=l.begin(); it != l.end(); ++it)
     searchPaths->insertItem(*it);
 
   config->setGroup("Locale");
-  QString lang = config->readEntry("Search Language", KGlobal::locale()->language());
+  TQString lang = config->readEntry("Search Language", KGlobal::locale()->language());
   language->setCurrentItem(lang);
 
   emit changed(false);
@@ -293,7 +293,7 @@ void KHTMLSearchConfig::save()
   config->writeEntry("Man", indexMan->isChecked());
   config->writeEntry("Info", indexInfo->isChecked());
 
-  QStringList l;
+  TQStringList l;
   for (uint i=0; i<searchPaths->count(); ++i)
     l.append(searchPaths->text(i));
   config->writePathEntry("Paths", l);
@@ -326,7 +326,7 @@ void KHTMLSearchConfig::defaults()
 }
 
 
-void KHTMLSearchConfig::urlClicked(const QString &url)
+void KHTMLSearchConfig::urlClicked(const TQString &url)
 {
   kapp->invokeBrowser(url);
 }
@@ -336,7 +336,7 @@ void KHTMLSearchConfig::generateIndex()
 {
   save();
 
-  QString exe = kapp->dirs()->findExe("khtmlindex");
+  TQString exe = kapp->dirs()->findExe("khtmlindex");
   if (exe.isEmpty())
     return;
 
@@ -345,8 +345,8 @@ void KHTMLSearchConfig::generateIndex()
   indexProc = new KProcess;
   *indexProc << exe << "--lang" << language->currentTag();
 
-  connect(indexProc, SIGNAL(processExited(KProcess *)),
-      this, SLOT(indexTerminated(KProcess *)));
+  connect(indexProc, TQT_SIGNAL(processExited(KProcess *)),
+      this, TQT_SLOT(indexTerminated(KProcess *)));
 
   runButton->setEnabled(false);
 
@@ -362,7 +362,7 @@ void KHTMLSearchConfig::indexTerminated(KProcess *)
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_htmlsearch(QWidget *parent, const char *name)
+  KDE_EXPORT KCModule *create_htmlsearch(TQWidget *parent, const char *name)
   {
     KGlobal::locale()->insertCatalogue("kcmhtmlsearch");
     return new KHTMLSearchConfig(parent, name);
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 630f5aeda..bf6e91bbc 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -39,14 +39,14 @@ class KHTMLSearchConfig : public KCModule
 
 public:
 
-  KHTMLSearchConfig(QWidget *parent = 0L, const char *name = 0L);
+  KHTMLSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
   virtual ~KHTMLSearchConfig();
   
   void load();
   void save();
   void defaults();
 
-  QString quickHelp() const;
+  TQString quickHelp() const;
   
   int buttons();
 
@@ -56,8 +56,8 @@ protected slots:
   void configChanged();
   void addClicked(); 
   void delClicked();
-  void pathSelected(const QString &);
-  void urlClicked(const QString&);
+  void pathSelected(const TQString &);
+  void urlClicked(const TQString&);
   void generateIndex();
 
   void indexTerminated(KProcess *proc);
@@ -69,8 +69,8 @@ private:
   void loadLanguages();
 
   KURLRequester *htdigBin, *htsearchBin, *htmergeBin;
-  QCheckBox *indexKDE, *indexMan, *indexInfo;
-  QPushButton *addButton, *delButton, *runButton;
+  TQCheckBox *indexKDE, *indexMan, *indexInfo;
+  TQPushButton *addButton, *delButton, *runButton;
   KListBox *searchPaths;
   KLanguageCombo *language;
 
diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp
index 0b41ea1e9..308109d12 100644
--- a/khelpcenter/htmlsearch/klangcombo.cpp
+++ b/khelpcenter/htmlsearch/klangcombo.cpp
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <qiconset.h>
+#include <tqiconset.h>
 
 #include <kstandarddirs.h>
 
@@ -32,21 +32,21 @@ KLanguageCombo::~KLanguageCombo ()
 {
 }
 
-KLanguageCombo::KLanguageCombo (QWidget * parent, const char *name)
+KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name)
   : KTagComboBox(parent, name)
 {
 }
 
-void KLanguageCombo::insertLanguage(const QString& path, const QString& name, const QString& sub, const QString &submenu, int index)
+void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index)
 {
-  QString output = name + QString::fromLatin1(" (") + path + QString::fromLatin1(")");
-  QPixmap flag(locate("locale", sub + path + QString::fromLatin1("/flag.png")));
-  insertItem(QIconSet(flag), output, path, submenu, index);
+  TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
+  TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png")));
+  insertItem(TQIconSet(flag), output, path, submenu, index);
 }
 
-void KLanguageCombo::changeLanguage(const QString& name, int i)
+void KLanguageCombo::changeLanguage(const TQString& name, int i)
 {
   if (i < 0 || i >= count()) return;
-  QString output = name + QString::fromLatin1(" (") + tag(i) + QString::fromLatin1(")");
+  TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
   changeItem(output, i);
 }
diff --git a/khelpcenter/htmlsearch/klangcombo.h b/khelpcenter/htmlsearch/klangcombo.h
index 1c556ae64..4ca6e2f3b 100644
--- a/khelpcenter/htmlsearch/klangcombo.h
+++ b/khelpcenter/htmlsearch/klangcombo.h
@@ -37,11 +37,11 @@ class KLanguageCombo : public KTagComboBox
   Q_OBJECT
 
 public:
-  KLanguageCombo(QWidget *parent=0, const char *name=0);
+  KLanguageCombo(TQWidget *parent=0, const char *name=0);
   ~KLanguageCombo();
 
-  void insertLanguage(const QString& path, const QString& name, const QString& sub = QString::null, const QString &submenu = QString::null, int index = -1);
-  void changeLanguage(const QString& name, int i);
+  void insertLanguage(const TQString& path, const TQString& name, const TQString& sub = TQString::null, const TQString &submenu = TQString::null, int index = -1);
+  void changeLanguage(const TQString& name, int i);
 };
 
 #endif
diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp
index eea4c149f..871f5c9cf 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.cpp
+++ b/khelpcenter/htmlsearch/ktagcombobox.cpp
@@ -22,8 +22,8 @@
  */
 
 #define INCLUDE_MENUITEM_DEF 1
-#include <qpainter.h>
-#include <qpopupmenu.h>
+#include <tqpainter.h>
+#include <tqpopupmenu.h>
 
 #include <kdebug.h>
 
@@ -36,8 +36,8 @@ KTagComboBox::~KTagComboBox ()
   delete tags;
 }
 
-KTagComboBox::KTagComboBox (QWidget * parent, const char *name)
-  : QComboBox(parent, name),
+KTagComboBox::KTagComboBox (TQWidget * parent, const char *name)
+  : TQComboBox(parent, name),
 	popup(0),
 	old_popup(0)
 {
@@ -48,10 +48,10 @@ KTagComboBox::KTagComboBox (QWidget * parent, const char *name)
 
 void KTagComboBox::popupMenu()
 {
-   popup->popup( mapToGlobal( QPoint(0,0) ), current );
+   popup->popup( mapToGlobal( TQPoint(0,0) ), current );
 }
 
-void KTagComboBox::keyPressEvent( QKeyEvent *e )
+void KTagComboBox::keyPressEvent( TQKeyEvent *e )
 {
     int c;
 
@@ -73,7 +73,7 @@ void KTagComboBox::keyPressEvent( QKeyEvent *e )
     emit activated( c );
 }
 
-void KTagComboBox::mousePressEvent( QMouseEvent * )
+void KTagComboBox::mousePressEvent( TQMouseEvent * )
 {
   popupMenu();
 }
@@ -97,11 +97,11 @@ void KTagComboBox::clear()
 
   delete old_popup;
   old_popup = popup;
-  popup = new QPopupMenu(this);
-  connect( popup, SIGNAL(activated(int)),
-                        SLOT(internalActivate(int)) );
-  connect( popup, SIGNAL(highlighted(int)),
-                        SLOT(internalHighlight(int)) );
+  popup = new TQPopupMenu(this);
+  connect( popup, TQT_SIGNAL(activated(int)),
+                        TQT_SLOT(internalActivate(int)) );
+  connect( popup, TQT_SIGNAL(highlighted(int)),
+                        TQT_SLOT(internalHighlight(int)) );
 }
 
 int KTagComboBox::count() const
@@ -109,7 +109,7 @@ int KTagComboBox::count() const
   return tags->count();
 }
 
-static inline void checkInsertPos(QPopupMenu *popup, const QString & str, int &index)
+static inline void checkInsertPos(TQPopupMenu *popup, const TQString & str, int &index)
 {
   if (index == -2) index = popup->count();
   if (index != -1) return;
@@ -131,14 +131,14 @@ static inline void checkInsertPos(QPopupMenu *popup, const QString & str, int &i
   index = a; // it doesn't really matter ... a == b here.
 }
 
-static inline QPopupMenu *checkInsertIndex(QPopupMenu *popup, const QStringList *tags, const QString &submenu)
+static inline TQPopupMenu *checkInsertIndex(TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu)
 {
   int pos = tags->findIndex(submenu);
 
-  QPopupMenu *pi = 0;
+  TQPopupMenu *pi = 0;
   if (pos != -1)
   {
-    QMenuItem *p = popup->findItem(pos);
+    TQMenuItem *p = popup->findItem(pos);
     pi = p?p->popup():0;
   }
   if (!pi) pi = popup;
@@ -146,50 +146,50 @@ static inline QPopupMenu *checkInsertIndex(QPopupMenu *popup, const QStringList
   return pi;
 }
 
-void KTagComboBox::insertItem(const QIconSet& icon, const QString &text, const QString &tag, const QString &submenu, int index )
+void KTagComboBox::insertItem(const TQIconSet& icon, const TQString &text, const TQString &tag, const TQString &submenu, int index )
 {
-  QPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
+  TQPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
   checkInsertPos(pi, text, index);
   pi->insertItem(icon, text, count(), index);
   tags->append(tag);
 }
 
-void KTagComboBox::insertItem(const QString &text, const QString &tag, const QString &submenu, int index )
+void KTagComboBox::insertItem(const TQString &text, const TQString &tag, const TQString &submenu, int index )
 {
-  QPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
+  TQPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
   checkInsertPos(pi, text, index);
   pi->insertItem(text, count(), index);
   tags->append(tag);
 }
 
-void KTagComboBox::insertSeparator(const QString &submenu, int index)
+void KTagComboBox::insertSeparator(const TQString &submenu, int index)
 {
-  QPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
+  TQPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
   pi->insertSeparator(index);
-  tags->append(QString::null);
+  tags->append(TQString::null);
 }
 
-void KTagComboBox::insertSubmenu(const QString &text, const QString &tag, const QString &submenu, int index)
+void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, const TQString &submenu, int index)
 {
-  QPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
-  QPopupMenu *p = new QPopupMenu(pi);
+  TQPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
+  TQPopupMenu *p = new TQPopupMenu(pi);
   checkInsertPos(pi, text, index);
   pi->insertItem(text, p, count(), index);
   tags->append(tag);
-  connect( p, SIGNAL(activated(int)),
-                        SLOT(internalActivate(int)) );
-  connect( p, SIGNAL(highlighted(int)),
-                        SLOT(internalHighlight(int)) );
+  connect( p, TQT_SIGNAL(activated(int)),
+                        TQT_SLOT(internalActivate(int)) );
+  connect( p, TQT_SIGNAL(highlighted(int)),
+                        TQT_SLOT(internalHighlight(int)) );
 }
 
-void KTagComboBox::paintEvent( QPaintEvent * ev)
+void KTagComboBox::paintEvent( TQPaintEvent * ev)
 {
-  QComboBox::paintEvent(ev);
+  TQComboBox::paintEvent(ev);
 
-  QPainter p (this);
+  TQPainter p (this);
 
   // Text
-  QRect clip(2, 2, width() - 4, height() - 4);
+  TQRect clip(2, 2, width() - 4, height() - 4);
 #if 0
   if ( hasFocus() && style().guiStyle() != MotifStyle )
     p.setPen( colorGroup().highlightedText() );
@@ -197,29 +197,29 @@ void KTagComboBox::paintEvent( QPaintEvent * ev)
   p.drawText(clip, AlignCenter | SingleLine, popup->text( current ));
 
   // Icon
-  QIconSet *icon = popup->iconSet( this->current );
+  TQIconSet *icon = popup->iconSet( this->current );
   if (icon) {
-    QPixmap pm = icon->pixmap();
+    TQPixmap pm = icon->pixmap();
     p.drawPixmap( 4, (height()-pm.height())/2, pm );
   }
 }
 
-bool KTagComboBox::containsTag( const QString &str ) const
+bool KTagComboBox::containsTag( const TQString &str ) const
 {
   return tags->contains(str) > 0;
 }
 
-QString KTagComboBox::currentTag() const
+TQString KTagComboBox::currentTag() const
 {
   return *tags->at(currentItem());
 }
 
-QString KTagComboBox::tag(int i) const
+TQString KTagComboBox::tag(int i) const
 {
   if (i < 0 || i >= count())
   {
     kdDebug() << "KTagComboBox::tag(), unknown tag " << i << endl;
-    return QString::null;
+    return TQString::null;
   }
   return *tags->at(i);
 }
@@ -236,7 +236,7 @@ void KTagComboBox::setCurrentItem(int i)
   repaint();
 }
 
-void KTagComboBox::setCurrentItem(const QString &code)
+void KTagComboBox::setCurrentItem(const TQString &code)
 {
   int i = tags->findIndex(code);
   if (code.isNull())
@@ -245,8 +245,8 @@ void KTagComboBox::setCurrentItem(const QString &code)
     setCurrentItem(i);
 }
 
-void KTagComboBox::setFont( const QFont &font )
+void KTagComboBox::setFont( const TQFont &font )
 {
-  QComboBox::setFont( font );
+  TQComboBox::setFont( font );
   popup->setFont( font );
 }
diff --git a/khelpcenter/htmlsearch/ktagcombobox.h b/khelpcenter/htmlsearch/ktagcombobox.h
index 28aad2dc8..a246e2140 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.h
+++ b/khelpcenter/htmlsearch/ktagcombobox.h
@@ -25,13 +25,13 @@
 #ifndef __KTAGCOMBOBOX_H__
 #define __KTAGCOMBOBOX_H__
 
-#include <qcombobox.h>
+#include <tqcombobox.h>
 
 class QPopupMenu;
 
 /*
  * This class should be just like qcombobox, but it should be possible
- * to have have a QIconSet for each entry, and each entry should have a tag.
+ * to have have a TQIconSet for each entry, and each entry should have a tag.
  *
  * It has also support for sub menues.
  */
@@ -40,13 +40,13 @@ class KTagComboBox : public QComboBox
   Q_OBJECT
 
 public:
-  KTagComboBox(QWidget *parent=0, const char *name=0);
+  KTagComboBox(TQWidget *parent=0, const char *name=0);
   ~KTagComboBox();
 
-  void insertItem(const QIconSet& icon, const QString &text, const QString &tag, const QString &submenu = QString::null, int index=-1 );
-  void insertItem(const QString &text, const QString &tag, const QString &submenu = QString::null, int index=-1 );
-  void insertSeparator(const QString &submenu = QString::null, int index=-1 );
-  void insertSubmenu(const QString &text, const QString &tag, const QString &submenu = QString::null, int index=-1);
+  void insertItem(const TQIconSet& icon, const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1 );
+  void insertItem(const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1 );
+  void insertSeparator(const TQString &submenu = TQString::null, int index=-1 );
+  void insertSubmenu(const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1);
 
   int count() const;
   void clear();
@@ -54,19 +54,19 @@ public:
   /*
    * Tag of the selected item
    */
-  QString currentTag() const;
-  QString tag ( int i ) const;
-  bool containsTag (const QString &str ) const;
+  TQString currentTag() const;
+  TQString tag ( int i ) const;
+  bool containsTag (const TQString &str ) const;
 
   /*
    * Set the current item
    */
   int currentItem() const;
   void setCurrentItem(int i);
-  void setCurrentItem(const QString &code);
+  void setCurrentItem(const TQString &code);
 
   // widget stuff
-  virtual void setFont( const QFont & );
+  virtual void setFont( const TQFont & );
 
 signals:
   void activated( int index );
@@ -77,15 +77,15 @@ private slots:
   void internalHighlight( int );
 
 protected:
-  void paintEvent( QPaintEvent * );
-  void mousePressEvent( QMouseEvent * );
-  void keyPressEvent( QKeyEvent *e );
+  void paintEvent( TQPaintEvent * );
+  void mousePressEvent( TQMouseEvent * );
+  void keyPressEvent( TQKeyEvent *e );
   void popupMenu();
 
 private:
   // work space for the new class
-  QStringList *tags;  
-  QPopupMenu *popup, *old_popup;
+  TQStringList *tags;  
+  TQPopupMenu *popup, *old_popup;
   int current;
 };
 
diff --git a/khelpcenter/htmlsearch/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp
index 497c90324..e7eafedb1 100644
--- a/khelpcenter/htmlsearch/progressdialog.cpp
+++ b/khelpcenter/htmlsearch/progressdialog.cpp
@@ -1,5 +1,5 @@
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 
 
 #include <klocale.h>
@@ -10,35 +10,35 @@
 #include "progressdialog.moc"
 
 
-ProgressDialog::ProgressDialog(QWidget *parent, const char *name)
+ProgressDialog::ProgressDialog(TQWidget *parent, const char *name)
   : KDialogBase(KDialogBase::Plain, i18n("Generating Index"), Cancel, Cancel,
 		parent, name, false)
 {
-  QGridLayout *grid = new QGridLayout(plainPage(), 5,3, spacingHint());
+  TQGridLayout *grid = new TQGridLayout(plainPage(), 5,3, spacingHint());
   
-  QLabel *l = new QLabel(i18n("Scanning for files"), plainPage());
+  TQLabel *l = new TQLabel(i18n("Scanning for files"), plainPage());
   grid->addMultiCellWidget(l, 0,0, 1,2);
   
-  filesScanned = new QLabel(plainPage());
+  filesScanned = new TQLabel(plainPage());
   grid->addWidget(filesScanned, 1,2);
   setFilesScanned(0);
 
-  check1 = new QLabel(plainPage());
+  check1 = new TQLabel(plainPage());
   grid->addWidget(check1, 0,0);
 
-  l = new QLabel(i18n("Extracting search terms"), plainPage());
+  l = new TQLabel(i18n("Extracting search terms"), plainPage());
   grid->addMultiCellWidget(l, 2,2, 1,2);
   
   bar = new KProgress(plainPage());
   grid->addWidget(bar, 3,2);
 
-  check2 = new QLabel(plainPage());
+  check2 = new TQLabel(plainPage());
   grid->addWidget(check2, 2,0);
 
-  l = new QLabel(i18n("Generating index..."), plainPage());
+  l = new TQLabel(i18n("Generating index..."), plainPage());
   grid->addMultiCellWidget(l, 4,4, 1,2);
 
-  check3 = new QLabel(plainPage());
+  check3 = new TQLabel(plainPage());
   grid->addWidget(check3, 4,0);
 
   setState(0);
@@ -67,8 +67,8 @@ void ProgressDialog::setFilesDigged(int n)
 
 void ProgressDialog::setState(int n)
 {
-  QPixmap unchecked = QPixmap(locate("data", "khelpcenter/pics/unchecked.xpm"));
-  QPixmap checked = QPixmap(locate("data", "khelpcenter/pics/checked.xpm"));
+  TQPixmap unchecked = TQPixmap(locate("data", "khelpcenter/pics/unchecked.xpm"));
+  TQPixmap checked = TQPixmap(locate("data", "khelpcenter/pics/checked.xpm"));
 
   check1->setPixmap( n > 0 ? checked : unchecked);  
   check2->setPixmap( n > 1 ? checked : unchecked);  
diff --git a/khelpcenter/htmlsearch/progressdialog.h b/khelpcenter/htmlsearch/progressdialog.h
index 9c18f2d01..4152e7537 100644
--- a/khelpcenter/htmlsearch/progressdialog.h
+++ b/khelpcenter/htmlsearch/progressdialog.h
@@ -16,7 +16,7 @@ class ProgressDialog : public KDialogBase
 
 public:
 
-  ProgressDialog(QWidget *parent=0, const char *name=0);
+  ProgressDialog(TQWidget *parent=0, const char *name=0);
 
   void setFilesScanned(int s);
   void setFilesToDig(int d);
@@ -26,7 +26,7 @@ public:
 
 private:
 
-  QLabel    *filesScanned, *check1, *check2, *check3;
+  TQLabel    *filesScanned, *check1, *check2, *check3;
   KProgress *bar;
 
 };