TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


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

2 files changed, 9 insertions, 8 deletions

diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index 63e21888..d0146d0e 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -39,9 +39,9 @@
 
 #define INDEXER
 
-ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name)
+ProgressDialog::ProgressDialog(bool index, TQWidget *tqparent, const char *name)
     :KDialogBase(KDialogBase::Plain, i18n("Generating Search Index"), Cancel | Ok, Close,
-    parent, name, false)
+    tqparent, name, false)
 {
     proc = 0;
 
@@ -122,7 +122,7 @@ void ProgressDialog::done(int r)
 
 void ProgressDialog::setFilesScanned(int n)
 {
-    filesLabel->setText(i18n("Files processed: %1").arg(n));
+    filesLabel->setText(i18n("Files processed: %1").tqarg(n));
 }
 
 void ProgressDialog::setFilesToDig(int n)
@@ -162,7 +162,7 @@ void ProgressDialog::addDir(const TQString &dir)
         setFilesScanned(++filesScanned);
     }
 
-    TQDir d2(dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs);
+    TQDir d2(dir, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs);
     TQStringList dlist = d2.entryList();
 
     for ( it=dlist.begin(); it != dlist.end(); ++it )
@@ -214,7 +214,7 @@ bool ProgressDialog::createConfig()
     if (language == "C")
         language = "en";
 
-    TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language));
+    TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").tqarg(language));
     if (wrapper.isEmpty())
         wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html"));
     if (wrapper.isEmpty())
@@ -323,12 +323,12 @@ void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len)
     TQString line = TQString(buffer).left(len);
 
     int cnt=0, index=-1;
-    while ( (index = line.find("http://", index+1)) > 0)
+    while ( (index = line.tqfind("http://", index+1)) > 0)
         cnt++;
     filesDigged += cnt;
 
     cnt=0, index=-1;
-    while ( (index = line.find("not changed", index+1)) > 0)
+    while ( (index = line.tqfind("not changed", index+1)) > 0)
         cnt++;
     filesDigged -= cnt;
 
diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h
index 3383b2df..06746ad5 100644
--- a/parts/documentation/tools/htdig/htdigindex.h
+++ b/parts/documentation/tools/htdig/htdigindex.h
@@ -25,8 +25,9 @@ class KProgress;
 class ProgressDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ProgressDialog(bool index, TQWidget *parent=0, const char *name=0);
+    ProgressDialog(bool index, TQWidget *tqparent=0, const char *name=0);
     ~ProgressDialog();
 
     void addDir(const TQString &dir);