Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

6 files changed, 22 insertions, 22 deletions

diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index ff5effffe..c47300190 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.tqcontains( file ) ) {
+            if ( !_files.contains( file ) ) {
                 _files.append(file);
                 progress->setFilesScanned(++_filesScanned);
             }
@@ -117,7 +117,7 @@ bool HTMLSearch::createConfig(const TQString& _lang)
         return false;
     images = images.left(images.length() - 8);
 
-    // This is an example tqreplacement for the default bad_words file
+    // This is an example replacement for the default bad_words file
     // distributed with ht://Dig. It was compiled by Marjolein Katsma
     // <HSH@taxon.demon.nl>.
     TQString bad_words = i18n( "List of words to exclude from index",
@@ -467,8 +467,8 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
   delete _proc;
 
   // modify the search result
-  _searchResult = _searchResult.tqreplace("http://localhost/", "file:/");
-  _searchResult = _searchResult.tqreplace("Content-type: text/html", TQString::null);
+  _searchResult = _searchResult.replace("http://localhost/", "file:/");
+  _searchResult = _searchResult.replace("Content-type: text/html", TQString::null);
 
   // dump the search result
   TQFile f(result);
diff --git a/khelpcenter/htmlsearch/htmlsearch.desktop b/khelpcenter/htmlsearch/htmlsearch.desktop
index 866aa649a..1879ae742 100644
--- a/khelpcenter/htmlsearch/htmlsearch.desktop
+++ b/khelpcenter/htmlsearch/htmlsearch.desktop
@@ -211,13 +211,13 @@ Keywords[nl]=help,html,zoeken,index,htdig,htsearch,htmerge,scope,taal
 Keywords[nn]=hjelp,HTML,søk,indeks,htdig,htmerge,område,språk
 Keywords[nso]=Thuso,HTML,Nyako,Palo ya Bangwadi,htdig,htnyako,htmerge,Scope,Leleme
 Keywords[pa]=ਸਹਾਇਤਾ,HTML,Index,htdig,htsearch,htmerge,Scope,ਭਾਸ਼ਾ,ਖੋਜ
-Keywords[pl]=potqmoc,HTML,szukaj,indeks,htdig,htsearch,htmerge,zakres,język
+Keywords[pl]=pomoc,HTML,szukaj,indeks,htdig,htsearch,htmerge,zakres,język
 Keywords[pt]=ajuda,html,procura,índice,htdig,htsearch,htmerge,âmbito,língua
 Keywords[pt_BR]=Ajuda,HTML,Procurar,Índice,htdig,htsearch,htmerge,escopo,idioma
 Keywords[ro]=ajutor,HTML,căutare,index,htdig,htsearch,htmerge,domeniu,limbaj
 Keywords[rw]=Ifashayobora,HTML,Ishakisha,htgucukura,htgushakisha,htgukomatanya,Igishushanyombonera,Ururimi
 Keywords[se]=veahkki,HTML,ohcan,indeaksa,indeksa,htdig,htmerge,gaska,giella
-Keywords[sk]=Potqmoc,HTML,Hľadať,Katalóg,Index,htdig,htsearch,htmerge,rozsah,jazyk,Potqmocník
+Keywords[sk]=Pomoc,HTML,Hľadať,Katalóg,Index,htdig,htsearch,htmerge,rozsah,jazyk,Pomocník
 Keywords[sl]=Pomoč,HTML,iskanje,indeks,htdig,htsearch,htmerge,doseg,jezik
 Keywords[sr]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language,помоћ,претрага,индекс,језик,опсег
 Keywords[sr@Latn]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language,pomoć,pretraga,indeks,jezik,opseg
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 64a301be7..9dfc5e350 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->tqsetAlignment(TQLabel::WordBreak);
-  l->setMinimumSize(l->tqsizeHint());
+  l->setAlignment(TQLabel::WordBreak);
+  l->setMinimumSize(l->sizeHint());
   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->tqsetAlignment(TQLabel::AlignHCenter);
+  url->setAlignment(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->tqsizeHint());
+  runButton->setFixedSize(runButton->sizeHint());
   vbox->addWidget(runButton, AlignRight);
   connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
 
@@ -179,14 +179,14 @@ void KHTMLSearchConfig::loadLanguages()
 
   // add all languages to the list
   TQStringList langs = KGlobal::dirs()->findAllResources("locale",
-							TQString::tqfromLatin1("*/entry.desktop"));
+							TQString::fromLatin1("*/entry.desktop"));
   langs.sort();
 
   for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
     {
       KSimpleConfig entry(*it);
-      entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-      TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), KGlobal::locale()->translate("without name"));
+      entry.setGroup(TQString::fromLatin1("KCM Locale"));
+      TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
 
       TQString path = *it;
       int index = path.findRev('/');
diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp
index 6f4b01c42..308109d12 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::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")");
-  TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png")));
+  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 TQString& name, int i)
 {
   if (i < 0 || i >= count()) return;
-  TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")");
+  TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
   changeItem(output, i);
 }
diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp
index 900077c54..6bb74c860 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 );
-  tqrepaint();
+  repaint();
 }
 
 void KTagComboBox::internalHighlight( int index )
@@ -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( tqcolorGroup().highlightedText() );
+    p.setPen( colorGroup().highlightedText() );
 #endif
   p.drawText(clip, AlignCenter | SingleLine, popup->text( current ));
 
@@ -204,9 +204,9 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
   }
 }
 
-bool KTagComboBox::tqcontainsTag( const TQString &str ) const
+bool KTagComboBox::containsTag( const TQString &str ) const
 {
-  return tags->tqcontains(str) > 0;
+  return tags->contains(str) > 0;
 }
 
 TQString KTagComboBox::currentTag() const
@@ -233,7 +233,7 @@ void KTagComboBox::setCurrentItem(int i)
 {
   if (i < 0 || i >= count()) return;
   current = i;
-  tqrepaint();
+  repaint();
 }
 
 void KTagComboBox::setCurrentItem(const TQString &code)
diff --git a/khelpcenter/htmlsearch/ktagcombobox.h b/khelpcenter/htmlsearch/ktagcombobox.h
index f184b14d7..df58120ce 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.h
+++ b/khelpcenter/htmlsearch/ktagcombobox.h
@@ -56,7 +56,7 @@ public:
    */
   TQString currentTag() const;
   TQString tag ( int i ) const;
-  bool tqcontainsTag (const TQString &str ) const;
+  bool containsTag (const TQString &str ) const;
 
   /*
    * Set the current item