Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


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

4 files changed, 23 insertions, 23 deletions

diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index c47300190..c9feaa61f 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -43,7 +43,7 @@ void HTMLSearch::scanDir(const TQString& dir)
         for (it=list.begin(); it != list.end(); ++it)
         {
             file = adir + *it;
-            if ( !_files.contains( file ) ) {
+            if ( !_files.tqcontains( file ) ) {
                 _files.append(file);
                 progress->setFilesScanned(++_filesScanned);
             }
@@ -375,13 +375,13 @@ void HTMLSearch::htdigStdout(KProcess *, char *buffer, int len)
     TQString line = TQString(buffer).left(len);
 
     int cnt=0, index=-1;
-    while ( (index = line.find("file://", index+1)) > 0)
+    while ( (index = line.tqfind("file://", 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;
 
@@ -467,8 +467,8 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
   delete _proc;
 
   // modify the search result
-  _searchResult = _searchResult.replace("http://localhost/", "file:/");
-  _searchResult = _searchResult.replace("Content-type: text/html", TQString::null);
+  _searchResult = _searchResult.tqreplace("http://localhost/", "file:/");
+  _searchResult = _searchResult.tqreplace("Content-type: text/html", TQString::null);
 
   // dump the search result
   TQFile f(result);
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 9dfc5e350..c2b1cd883 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -50,15 +50,15 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
   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(TQLabel::WordBreak);
-  l->setMinimumSize(l->sizeHint());
+  l->tqsetAlignment(TQLabel::WordBreak);
+  l->setMinimumSize(l->tqsizeHint());
   grid->addMultiCellWidget(l, 1, 1, 0, 1);
   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(TQLabel::AlignHCenter);
+  url->tqsetAlignment(TQLabel::AlignHCenter);
   grid->addMultiCellWidget(url, 2,2, 0, 1);
   connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
       this, TQT_SLOT(urlClicked(const TQString&)));
@@ -157,7 +157,7 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
 
   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());
+  runButton->setFixedSize(runButton->tqsizeHint());
   vbox->addWidget(runButton, AlignRight);
   connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
 
@@ -179,19 +179,19 @@ void KHTMLSearchConfig::loadLanguages()
 
   // add all languages to the list
   TQStringList langs = KGlobal::dirs()->findAllResources("locale",
-							TQString::fromLatin1("*/entry.desktop"));
+							TQString::tqfromLatin1("*/entry.desktop"));
   langs.sort();
 
   for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
     {
       KSimpleConfig entry(*it);
-      entry.setGroup(TQString::fromLatin1("KCM Locale"));
-      TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
+      entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
+      TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), KGlobal::locale()->translate("without name"));
 
       TQString path = *it;
-      int index = path.findRev('/');
+      int index = path.tqfindRev('/');
       path = path.left(index);
-      index = path.findRev('/');
+      index = path.tqfindRev('/');
       path = path.mid(index+1);
       language->insertLanguage(path, name);
     }
diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp
index 308109d12..6f4b01c42 100644
--- a/khelpcenter/htmlsearch/klangcombo.cpp
+++ b/khelpcenter/htmlsearch/klangcombo.cpp
@@ -39,14 +39,14 @@ KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name)
 
 void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index)
 {
-  TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
-  TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png")));
+  TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")");
+  TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png")));
   insertItem(TQIconSet(flag), output, path, submenu, index);
 }
 
 void KLanguageCombo::changeLanguage(const TQString& name, int i)
 {
   if (i < 0 || i >= count()) return;
-  TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
+  TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")");
   changeItem(output, i);
 }
diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp
index 6bb74c860..3cb642b5f 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.cpp
+++ b/khelpcenter/htmlsearch/ktagcombobox.cpp
@@ -83,7 +83,7 @@ void KTagComboBox::internalActivate( int index )
   if (current == index) return;
   current = index;
   emit activated( index );
-  repaint();
+  tqrepaint();
 }
 
 void KTagComboBox::internalHighlight( int index )
@@ -133,7 +133,7 @@ static inline void checkInsertPos(TQPopupMenu *popup, const TQString & str, int
 
 static inline TQPopupMenu *checkInsertIndex(TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu)
 {
-  int pos = tags->findIndex(submenu);
+  int pos = tags->tqfindIndex(submenu);
 
   TQPopupMenu *pi = 0;
   if (pos != -1)
@@ -192,7 +192,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
   TQRect clip(2, 2, width() - 4, height() - 4);
 #if 0
   if ( hasFocus() && style().guiStyle() != MotifStyle )
-    p.setPen( colorGroup().highlightedText() );
+    p.setPen( tqcolorGroup().highlightedText() );
 #endif
   p.drawText(clip, AlignCenter | SingleLine, popup->text( current ));
 
@@ -206,7 +206,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
 
 bool KTagComboBox::containsTag( const TQString &str ) const
 {
-  return tags->contains(str) > 0;
+  return tags-.tqcontains(str) > 0;
 }
 
 TQString KTagComboBox::currentTag() const
@@ -233,12 +233,12 @@ void KTagComboBox::setCurrentItem(int i)
 {
   if (i < 0 || i >= count()) return;
   current = i;
-  repaint();
+  tqrepaint();
 }
 
 void KTagComboBox::setCurrentItem(const TQString &code)
 {
-  int i = tags->findIndex(code);
+  int i = tags->tqfindIndex(code);
   if (code.isNull())
     i = 0;
   if (i != -1)