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

33 files changed, 162 insertions, 162 deletions

diff --git a/khelpcenter/COPYING b/khelpcenter/COPYING
index 9d29098e2..0b84a43fd 100644
--- a/khelpcenter/COPYING
+++ b/khelpcenter/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which tqcontains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions:
     stating that you changed the files and the date of any change.
 
     b) You must cause any work that you distribute or publish, that in
-    whole or in part tqcontains or is derived from the Program or any
+    whole or in part contains or is derived from the Program or any
     part thereof, to be licensed as a whole at no charge to all third
     parties under the terms of this License.
 
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN
index 17496f234..003423f5a 100644
--- a/khelpcenter/DESIGN
+++ b/khelpcenter/DESIGN
@@ -78,7 +78,7 @@ KHC::ContentsTab object and a KHC::SearchTab object.
 
 # Alright, after some talk on IRC this structure evolved:
 #
-# - Tasks - tqcontains short, three to four paragraph documents about how to
+# - Tasks - contains short, three to four paragraph documents about how to
 #	        solve an everyday task, examples:
 #		Browsing the web
 #		Send and receive email
@@ -185,15 +185,15 @@ regexp' or 'Search case sensitive'.
 
 # I think this means that we have to create a 'DataCollection' class which
 # gets inherited by all classes which are "searchable". DataCollections should
-# also be able to tqcontains multiple child DataCollection, so that we have e.g.
+# also be able to contains multiple child DataCollection, so that we have e.g.
 # one DataCollection per application manual, and one "Manuals" collection
-# which tqcontains all the application manual collections.
+# which contains all the application manual collections.
 # We'd probably also need a DataCollection for the info pages and man pages.
 # And later, in the far future, we might extent this concept to web searches,
 # so that e.g. Google represents a DataCollection which we can query.
 # I'm not yet decided how to do that properly, perhaps using multiple
 # inheritance, so that each TOCBuilder is a DataCollection - naw, we'd rather
-# have a "TableOfContents" class which tqcontains a TOCBuilder, and is a
+# have a "TableOfContents" class which contains a TOCBuilder, and is a
 # datacollection? Hm, not sure.
 # In any case DataCollections should some sort of plugins, so that we can add
 # e.g. new web search interfaces lateron.
@@ -218,7 +218,7 @@ regexp' or 'Search case sensitive'.
 # from the enhanced browsing thing and treat those as plugin .desktop files.
 # We could show them in a listview on the Search tab, each found search engine
 # being represented by a checkable listview item. So, we just let the user
-# enter a term, tqreplace the \{@} placeholder in the URIs specified in the
+# enter a term, replace the \{@} placeholder in the URIs specified in the
 # selected .desktop files with that term, send out a request via KIO and show
 # the results in our KHTMLPart (after all KHC::View is a KHTMLPart already). A
 # problem with this: How to display the multiple HTML pages returned by the
@@ -250,7 +250,7 @@ regexp' or 'Search case sensitive'.
 # A problem with this would be that we cannot tell how a particular search
 # engine treats boolean expressions (e.g. some search engines use 'foo AND bar',
 # others use '+foo +bar', a third variation is '"foo bar"'). We thus cannot
-# tqreplace the placeholder in the URI but first have to translate the syntax
+# replace the placeholder in the URI but first have to translate the syntax
 # entered by the user into a syntax which is appropriate for each single news
 # engine. Right now I don't know how we could do this with just a .desktop/.xslt
 # pair. We could always use fullblown C++ plugins which hold code which is able
diff --git a/khelpcenter/Help.desktop b/khelpcenter/Help.desktop
index 4b73bf67c..26f21f011 100644
--- a/khelpcenter/Help.desktop
+++ b/khelpcenter/Help.desktop
@@ -53,14 +53,14 @@ Name[nn]=Hjelp
 Name[nso]=Thuso
 Name[oc]=Ajuda
 Name[pa]=ਸਹਾਇਤਾ
-Name[pl]=Potqmoc
+Name[pl]=Pomoc
 Name[pt]=Ajuda
 Name[pt_BR]=Ajuda
 Name[ro]=Ajutor
 Name[ru]=Справка
 Name[rw]=Ifashayobora
 Name[se]=Veahkki
-Name[sk]=Potqmocník
+Name[sk]=Pomocník
 Name[sl]=Pomoč
 Name[sr]=Помоћ
 Name[sr@Latn]=Pomoć
diff --git a/khelpcenter/README.metadata b/khelpcenter/README.metadata
index 2f3f37757..733bb5ef2 100644
--- a/khelpcenter/README.metadata
+++ b/khelpcenter/README.metadata
@@ -3,12 +3,12 @@ KHelpCenter documentation meta data structure
 
 KHelpCenter uses meta data files which describe the documentation available in
 the system. Each document is represented by a meta data file and shown as an
-entry in the KHelpCenter navigation tree view. The meta data tqcontains
+entry in the KHelpCenter navigation tree view. The meta data contains
 information about title and short description of the document, the location of
 the document and some more information like how to search the document and
 translations of title and description. Document hierarchy is represented as
 hierarchy of the meta data files. Directories are also described by a meta data
-file which tqcontains the same information as a document meta data file.
+file which contains the same information as a document meta data file.
 
 Format of the meta data files
 -----------------------------
@@ -46,7 +46,7 @@ X-DOC-Identifier            string    Unique identifier for document, if this
                                       file is used as identifier
 X-DOC-Indexer               command   Command used for creating a search index
                                       for the document.
-                                      The following symbols are tqreplaced by the
+                                      The following symbols are replaced by the
                                       corresponding values:
                                       %f - Filename
 X-DOC-IndexTestFile         filename  Name of file whose existence indicates
@@ -55,7 +55,7 @@ X-DOC-Search                command   Command used for searching, the output
                                       of the command should be HTML which is
                                       shown in KHelpCenter.
                                       The following symbols in the command are
-                                      tqreplaced by the corresponding values:
+                                      replaced by the corresponding values:
                                       %k - Words to be searched for
                                       %n - Maximum number of results
                                       %m - Method for combining search words,
diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index 96747696b..716c4d99e 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -219,7 +219,7 @@ bool DocEntry::readFromFile( const TQString &fileName )
     mIdentifier = fi.baseName( true );
   }
   mIndexer = file.readEntry( "X-DOC-Indexer" );
-  mIndexer.tqreplace( "%f", fileName );
+  mIndexer.replace( "%f", fileName );
   mIndexTestFile = file.readEntry( "X-DOC-IndexTestFile" );
   mSearchEnabledDefault = file.readBoolEntry( "X-DOC-SearchEnabledDefault",
                                               false );
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index 862e2211b..4d6dd6fad 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -77,7 +77,7 @@ DocEntry *DocMetaInfo::addDocEntry( const TQString &fileName )
       mHtmlSearch->setupDocEntry( entry );
     }
     TQString indexer = entry->indexer();
-    indexer.tqreplace( "%f", fileName );
+    indexer.replace( "%f", fileName );
     entry->setIndexer( indexer );
     addDocEntry( entry );
     return entry;
@@ -108,7 +108,7 @@ TQString DocMetaInfo::languageName( const TQString &langcode )
   if ( langcode == "en" ) return i18n("English");
 
   TQString cfgfile = locate( "locale",
-      TQString::tqfromLatin1( "%1/entry.desktop" ).arg( langcode ) );
+      TQString::fromLatin1( "%1/entry.desktop" ).arg( langcode ) );
 
   kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl;
   
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index d652b68a9..7aa25aa36 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -58,21 +58,21 @@ void FontDialog::setupFontSizesBox()
 {
 	TQGroupBox *gb = new TQGroupBox( i18n( "Sizes" ), mainWidget() );
 
-	TQGridLayout *tqlayout = new TQGridLayout( gb );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() * 2 );
+	TQGridLayout *layout = new TQGridLayout( gb );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() * 2 );
 
 	TQLabel *lMinFontSize = new TQLabel( i18n( "M&inimum font size:" ), gb );
-	tqlayout->addWidget( lMinFontSize, 0, 0 );
+	layout->addWidget( lMinFontSize, 0, 0 );
 	m_minFontSize = new KIntNumInput( gb );
-	tqlayout->addWidget( m_minFontSize, 0, 1 );
+	layout->addWidget( m_minFontSize, 0, 1 );
 	m_minFontSize->setRange( 1, 20 );
 	lMinFontSize->setBuddy( m_minFontSize );
 
 	TQLabel *lMedFontSize = new TQLabel( i18n( "M&edium font size:" ), gb );
-	tqlayout->addWidget( lMedFontSize, 1, 0 );
+	layout->addWidget( lMedFontSize, 1, 0 );
 	m_medFontSize = new KIntNumInput( gb );
-	tqlayout->addWidget( m_medFontSize, 1, 1 );
+	layout->addWidget( m_medFontSize, 1, 1 );
 	m_medFontSize->setRange( 4, 28 );
 	lMedFontSize->setBuddy( m_medFontSize );
 }
@@ -81,44 +81,44 @@ void FontDialog::setupFontTypesBox()
 {
 	TQGroupBox *gb = new TQGroupBox( i18n( "Fonts" ), mainWidget() );
 
-	TQGridLayout *tqlayout = new TQGridLayout( gb );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() * 2 );
+	TQGridLayout *layout = new TQGridLayout( gb );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() * 2 );
 
 	TQLabel *lStandardFont = new TQLabel( i18n( "S&tandard font:" ), gb );
-	tqlayout->addWidget( lStandardFont, 0, 0 );
+	layout->addWidget( lStandardFont, 0, 0 );
 	m_standardFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_standardFontCombo, 0, 1 );
+	layout->addWidget( m_standardFontCombo, 0, 1 );
 	lStandardFont->setBuddy( m_standardFontCombo );
 
 	TQLabel *lFixedFont = new TQLabel( i18n( "F&ixed font:" ), gb );
-	tqlayout->addWidget( lFixedFont, 1, 0 );
+	layout->addWidget( lFixedFont, 1, 0 );
 	m_fixedFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_fixedFontCombo, 1, 1 );
+	layout->addWidget( m_fixedFontCombo, 1, 1 );
 	lFixedFont->setBuddy( m_fixedFontCombo );
 
 	TQLabel *lSerifFont = new TQLabel( i18n( "S&erif font:" ), gb );
-	tqlayout->addWidget( lSerifFont, 2, 0 );
+	layout->addWidget( lSerifFont, 2, 0 );
 	m_serifFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_serifFontCombo, 2, 1 );
+	layout->addWidget( m_serifFontCombo, 2, 1 );
 	lSerifFont->setBuddy( m_serifFontCombo );
 
 	TQLabel *lSansSerifFont = new TQLabel( i18n( "S&ans serif font:" ), gb );
-	tqlayout->addWidget( lSansSerifFont, 3, 0 );
+	layout->addWidget( lSansSerifFont, 3, 0 );
 	m_sansSerifFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_sansSerifFontCombo, 3, 1 );
+	layout->addWidget( m_sansSerifFontCombo, 3, 1 );
 	lSansSerifFont->setBuddy( m_sansSerifFontCombo );
 
 	TQLabel *lItalicFont = new TQLabel( i18n( "&Italic font:" ), gb );
-	tqlayout->addWidget( lItalicFont, 4, 0 );
+	layout->addWidget( lItalicFont, 4, 0 );
 	m_italicFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_italicFontCombo, 4, 1 );
+	layout->addWidget( m_italicFontCombo, 4, 1 );
 	lItalicFont->setBuddy( m_italicFontCombo );
 
 	TQLabel *lFantasyFont = new TQLabel( i18n( "&Fantasy font:" ), gb );
-	tqlayout->addWidget( lFantasyFont, 5, 0 );
+	layout->addWidget( lFantasyFont, 5, 0 );
 	m_fantasyFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_fantasyFontCombo, 5, 1 );
+	layout->addWidget( m_fantasyFontCombo, 5, 1 );
 	lFantasyFont->setBuddy( m_fantasyFontCombo );
 }
 
@@ -126,23 +126,23 @@ void FontDialog::setupFontEncodingBox()
 {
 	TQGroupBox *gb = new TQGroupBox( i18n( "Encoding" ), mainWidget() );
 
-	TQGridLayout *tqlayout = new TQGridLayout( gb );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() * 2 );
+	TQGridLayout *layout = new TQGridLayout( gb );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() * 2 );
 
 	TQLabel *lDefaultEncoding = new TQLabel( i18n( "&Default encoding:" ), gb );
-	tqlayout->addWidget( lDefaultEncoding, 0, 0 );
+	layout->addWidget( lDefaultEncoding, 0, 0 );
 	m_defaultEncoding = new KComboBox( false, gb );
-	tqlayout->addWidget( m_defaultEncoding, 0, 1 );
+	layout->addWidget( m_defaultEncoding, 0, 1 );
 	TQStringList encodings = KGlobal::charsets()->availableEncodingNames();
 	encodings.prepend( i18n( "Use Language Encoding" ) );
 	m_defaultEncoding->insertStringList( encodings );
 	lDefaultEncoding->setBuddy( m_defaultEncoding );
 
 	TQLabel *lFontSizeAdjustement = new TQLabel( i18n( "&Font size adjustment:" ), gb );
-	tqlayout->addWidget( lFontSizeAdjustement, 1, 0 );
+	layout->addWidget( lFontSizeAdjustement, 1, 0 );
 	m_fontSizeAdjustement = new TQSpinBox( -5, 5, 1, gb );
-	tqlayout->addWidget( m_fontSizeAdjustement, 1, 1 );
+	layout->addWidget( m_fontSizeAdjustement, 1, 1 );
 	lFontSizeAdjustement->setBuddy( m_fontSizeAdjustement );
 }
 
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index 6c3411fd7..b9f394289 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -120,7 +120,7 @@ bool Formatter::readTemplates()
   bool success = true;
   TQStringList::ConstIterator it2;
   for( it2 = requiredSymbols.begin(); it2 != requiredSymbols.end(); ++it2 ) {
-    if ( !mSymbols.tqcontains( *it2 ) ) {
+    if ( !mSymbols.contains( *it2 ) ) {
       success = false;
       kdError() << "Symbol '" << *it2 << "' is missing from main template file."
                 << endl;
@@ -137,7 +137,7 @@ TQString Formatter::header( const TQString &title )
   TQString s;
   if ( mHasTemplate ) {
     s = mSymbols[ "HEADER" ];
-    s.tqreplace( "--TITLE:--", title );
+    s.replace( "--TITLE:--", title );
   } else {
     s = "<html><head><title>" + title + "</title></head>\n<body>\n";
   }
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 7aebdbea7..dc596372e 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -49,7 +49,7 @@ class SectionItem : public KListViewItem
 		{
 				KListViewItem::setOpen(open);
 				
-				setPixmap( 0, SmallIcon( TQString::tqfromLatin1( open ? "contents" : "contents2" ) ) );
+				setPixmap( 0, SmallIcon( TQString::fromLatin1( open ? "contents" : "contents2" ) ) );
 
 		}
 };
@@ -92,7 +92,7 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent )
 
 	m_cacheFile = locateLocal( "cache", "help/glossary.xml" );
 
-	m_sourceFile = View::View::langLookup( TQString::tqfromLatin1( "khelpcenter/glossary/index.docbook" ) );
+	m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) );
 
 	m_config = kapp->config();
 	m_config->setGroup( "Glossary" );
@@ -102,7 +102,7 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent )
 void Glossary::show()
 {
 	if ( !m_initialized ) {
-		if ( cachetqStatus() == NeedRebuild )
+		if ( cacheStatus() == NeedRebuild )
 			rebuildGlossaryCache();
 		else
 			buildGlossaryTree();
@@ -122,7 +122,7 @@ const GlossaryEntry &Glossary::entry( const TQString &id ) const
 	return *m_glossEntries[ id ];
 }
 
-Glossary::CachetqStatus Glossary::cachetqStatus() const
+Glossary::CacheStatus Glossary::cacheStatus() const
 {
 	if ( !TQFile::exists( m_cacheFile ) ||
 	     m_config->readPathEntry( "CachedGlossary" ) != m_sourceFile ||
@@ -150,10 +150,10 @@ void Glossary::rebuildGlossaryCache()
 	connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
 	         this, TQT_SLOT( meinprocExited( KProcess * ) ) );
 
-	*meinproc << locate( "exe", TQString::tqfromLatin1( "meinproc" ) );
-	*meinproc << TQString::tqfromLatin1( "--output" ) << m_cacheFile;
-	*meinproc << TQString::tqfromLatin1( "--stylesheet" )
-	          << locate( "data", TQString::tqfromLatin1( "khelpcenter/glossary.xslt" ) );
+	*meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) );
+	*meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile;
+	*meinproc << TQString::fromLatin1( "--stylesheet" )
+	          << locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) );
 	*meinproc << m_sourceFile;
 
 	meinproc->start( KProcess::NotifyOnExit );
@@ -189,21 +189,21 @@ void Glossary::buildGlossaryTree()
 	if ( !doc.setContent( &cacheFile ) )
 		return;
 
-	TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::tqfromLatin1( "section" ) );
+	TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::fromLatin1( "section" ) );
 	for ( unsigned int i = 0; i < sectionNodes.count(); i++ ) {
 		TQDomElement sectionElement = sectionNodes.item( i ).toElement();
-		TQString title = sectionElement.attribute( TQString::tqfromLatin1( "title" ) );
+		TQString title = sectionElement.attribute( TQString::fromLatin1( "title" ) );
 		SectionItem *topicSection = new SectionItem( m_byTopicItem, title );
 
-		TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::tqfromLatin1( "entry" ) );
+		TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::fromLatin1( "entry" ) );
 		for ( unsigned int j = 0; j < entryNodes.count(); j++ ) {
 			TQDomElement entryElement = entryNodes.item( j ).toElement();
 			
-			TQString entryId = entryElement.attribute( TQString::tqfromLatin1( "id" ) );
+			TQString entryId = entryElement.attribute( TQString::fromLatin1( "id" ) );
 			if ( entryId.isNull() )
 				continue;
 				
-			TQDomElement termElement = childElement( entryElement, TQString::tqfromLatin1( "term" ) );
+			TQDomElement termElement = childElement( entryElement, TQString::fromLatin1( "term" ) );
 			TQString term = termElement.text().simplifyWhiteSpace();
 
 			EntryItem *entry = new EntryItem(topicSection, term, entryId );
@@ -221,19 +221,19 @@ void Glossary::buildGlossaryTree()
 
 			new EntryItem( alphabSection, term, entryId );
 
-			TQDomElement definitionElement = childElement( entryElement, TQString::tqfromLatin1( "definition" ) );
+			TQDomElement definitionElement = childElement( entryElement, TQString::fromLatin1( "definition" ) );
 			TQString definition = definitionElement.text().simplifyWhiteSpace();
 
 			GlossaryEntryXRef::List seeAlso;
 
-			TQDomElement referencesElement = childElement( entryElement, TQString::tqfromLatin1( "references" ) );
-			TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::tqfromLatin1( "reference" ) );
+			TQDomElement referencesElement = childElement( entryElement, TQString::fromLatin1( "references" ) );
+			TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::fromLatin1( "reference" ) );
 			if ( referenceNodes.count() > 0 )
 				for ( unsigned int k = 0; k < referenceNodes.count(); k++ ) {
 					TQDomElement referenceElement = referenceNodes.item( k ).toElement();
 
-					TQString term = referenceElement.attribute( TQString::tqfromLatin1( "term" ) );
-					TQString id = referenceElement.attribute( TQString::tqfromLatin1( "id" ) );
+					TQString term = referenceElement.attribute( TQString::fromLatin1( "term" ) );
+					TQString id = referenceElement.attribute( TQString::fromLatin1( "id" ) );
 					
 					seeAlso += GlossaryEntryXRef( term, id );
 				}
@@ -279,10 +279,10 @@ TQString Glossary::entryToHtml( const GlossaryEntry &entry )
         GlossaryEntryXRef::List::ConstIterator it = seeAlsos.begin();
         GlossaryEntryXRef::List::ConstIterator end = seeAlsos.end();
         for (; it != end; ++it) {
-            seeAlso += TQString::tqfromLatin1("<a href=\"glossentry:");
+            seeAlso += TQString::fromLatin1("<a href=\"glossentry:");
             seeAlso += (*it).id();
-            seeAlso += TQString::tqfromLatin1("\">") + (*it).term();
-            seeAlso += TQString::tqfromLatin1("</a>, ");
+            seeAlso += TQString::fromLatin1("\">") + (*it).term();
+            seeAlso += TQString::fromLatin1("</a>, ");
         }
         seeAlso = seeAlso.left(seeAlso.length() - 2);
     }
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index 409670796..79ed7fb93 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -121,9 +121,9 @@ class Glossary : public KListView
 		void treeItemSelected( TQListViewItem *item );
 
 	private:
-		enum CachetqStatus { NeedRebuild, CacheOk };
+		enum CacheStatus { NeedRebuild, CacheOk };
 
-		CachetqStatus cachetqStatus() const;
+		CacheStatus cacheStatus() const;
 		int glossaryCTime() const;
 		void rebuildGlossaryCache();
 		void buildGlossaryTree();
@@ -134,7 +134,7 @@ class Glossary : public KListView
 		TQListViewItem *m_alphabItem;
 		TQString m_sourceFile;
 		TQString m_cacheFile;
-		CachetqStatus m_status;
+		CacheStatus m_status;
 		TQDict<GlossaryEntry> m_glossEntries;
     TQDict<EntryItem> m_idDict;
     bool m_initialized;
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index d03e899b5..9a90831f7 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -257,7 +257,7 @@ void History::fillForwardMenu()
 void History::fillGoMenu()
 {
   KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() );
-  TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) );
+  TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
   if ( !goMenu || m_goMenuIndex == -1 )
     return;
 
@@ -290,7 +290,7 @@ void History::fillGoMenu()
 void History::goMenuActivated( int id )
 {
   KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() );
-  TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) );
+  TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
   if ( !goMenu )
     return;
 
@@ -324,7 +324,7 @@ void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForw
   {
     TQString text = it.current()->title;
     text = KStringHandler::csqueeze(text, 50); //CT: squeeze
-    text.tqreplace( "&", "&&" );
+    text.replace( "&", "&&" );
     if ( checkCurrentItem && it.current() == current )
     {
       int id = popup->insertItem( text ); // no pixmap if checked
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
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index 8581b25c8..ea6dff669 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -51,15 +51,15 @@ HtmlSearchConfig::HtmlSearchConfig(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&)));
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 65ce72c80..aadce700a 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -101,7 +101,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent )
   topLayout->setSpacing( spacingHint() );
 
   mLabel = new TQLabel( this );
-  mLabel->tqsetAlignment( AlignHCenter );
+  mLabel->setAlignment( AlignHCenter );
   topLayout->addWidget( mLabel );
 
   mProgressBar = new TQProgressBar( this );
@@ -215,7 +215,7 @@ void IndexProgressDialog::hideDetails()
   mLogLabel->hide();
   mLogView->hide();
   mDetailsButton->setText( i18n("Details >>") );
-  tqlayout()->activate();
+  layout()->activate();
   adjustSize();
 }
 
@@ -276,7 +276,7 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent )
   mListView = new KListView( parent );
   mListView->setFullWidth( true );
   mListView->addColumn( i18n("Search Scope") );
-  mListView->addColumn( i18n("tqStatus") );
+  mListView->addColumn( i18n("Status") );
   mListView->setColumnAlignment( 1, AlignCenter );
   topLayout->addWidget( mListView );
   connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
@@ -337,10 +337,10 @@ void KCMHelpCenter::load()
     }
   }
 
-  updatetqStatus();
+  updateStatus();
 }
 
-void KCMHelpCenter::updatetqStatus()
+void KCMHelpCenter::updateStatus()
 {
   TQListViewItemIterator it( mListView );
   while ( it.current() != 0 ) {
@@ -417,9 +417,9 @@ bool KCMHelpCenter::buildIndex()
               .arg( entry->documentType() ) );
             hasError = true;
           } else {
-            indexer.tqreplace( TQRegExp( "%i" ), entry->identifier() );
-            indexer.tqreplace( TQRegExp( "%d" ), Prefs::indexDirectory() );
-            indexer.tqreplace( TQRegExp( "%p" ), entry->url() );
+            indexer.replace( TQRegExp( "%i" ), entry->identifier() );
+            indexer.replace( TQRegExp( "%d" ), Prefs::indexDirectory() );
+            indexer.replace( TQRegExp( "%p" ), entry->url() );
             kdDebug() << "INDEXER: " << indexer << endl;
             *ts << indexer << endl;
 
@@ -574,7 +574,7 @@ void KCMHelpCenter::slotIndexProgress()
 
   kdDebug() << "KCMHelpCenter::slotIndexProgress()" << endl;
 
-  updatetqStatus();
+  updateStatus();
 
   advanceProgress();
 }
diff --git a/khelpcenter/kcmhelpcenter.desktop b/khelpcenter/kcmhelpcenter.desktop
index 8712c56a1..54ae1c7e3 100644
--- a/khelpcenter/kcmhelpcenter.desktop
+++ b/khelpcenter/kcmhelpcenter.desktop
@@ -60,14 +60,14 @@ Name[nl]=Documentatie-index
 Name[nn]=Hjelpindeks
 Name[nso]=Palo ya Thuso
 Name[pa]=ਸਹਾਇਤਾ ਤਤਕਰਾ
-Name[pl]=Indeks potqmocy
+Name[pl]=Indeks pomocy
 Name[pt]=Índice da Ajuda
 Name[pt_BR]=Índice de Ajuda
 Name[ro]=Index ajutor
 Name[ru]=Индекс справки
 Name[rw]=Umubarendanga w'Ifashayobora
 Name[se]=Veahkkeindeaksa
-Name[sk]=Index potqmocníka
+Name[sk]=Index pomocníka
 Name[sl]=Seznam pomoči
 Name[sr]=Индекс помоћи
 Name[sr@Latn]=Indeks pomoći
@@ -136,14 +136,14 @@ Comment[nl]=Zoekindex van het documentatiecentrum instellen en genereren
 Comment[nn]=Oppsett og generering av søkjeindeks for hjelpesenteret
 Comment[nso]=Thlagiso le peakanyo ya palo ya bangwadi le ya nyako ya bogare bja thuso
 Comment[pa]=ਸਹਾਇਤਾ ਕੇਂਦਰ ਖੋਜ ਤਤਕਰਾ ਸੰਰਚਨਾ ਅਤੇ ਨਿਰਮਾਣ
-Comment[pl]=Konfiguracja i generowanie indeksu potqmocy
+Comment[pl]=Konfiguracja i generowanie indeksu pomocy
 Comment[pt]=Configuração e geração do índice de pesquisa do centro de ajuda
 Comment[pt_BR]=Configuração e geração do índice de busca do centro de ajuda
 Comment[ro]=Generează și configurează indexul de căutare pentru Centrul de Ajutor
 Comment[ru]=Настройка индексов справочной системы KDE
 Comment[rw]=Iboneza n'irema umubarendanga w'ishakisha ifashayobora hagati
 Comment[se]=Veahkkeguovddáža ohcanindeavssa heiveheapmi ja ráhkadeapmi
-Comment[sk]=Nastavenie a generovanie indexu pre potqmocníka
+Comment[sk]=Nastavenie a generovanie indexu pre pomocníka
 Comment[sl]=Nastavitve in ustvarjanje iskalnega indeksa za Središče za pomoč
 Comment[sr]=Подешавање и генерисање индекса за претрагу Центра за помоћ
 Comment[sr@Latn]=Podešavanje i generisanje indeksa za pretragu Centra za pomoć
@@ -208,13 +208,13 @@ Keywords[nl]=khelpcenter,help,index,search,hulp,zoeken,documentatie,handboek
 Keywords[nn]=KHelpCenter,hjelp,indeks,søk
 Keywords[nso]=kbogare bja thuso,thuso,palo ya bangwadi,nyako
 Keywords[pa]=ਸਹਾਇਤਾ ਕੇਂਦਰ,ਸਹਾਇਤਾ,ਤਤਕਰਾ,ਖੋਜ
-Keywords[pl]=centrum potqmocy,potqmoc,indeks,szukanie
+Keywords[pl]=centrum pomocy,pomoc,indeks,szukanie
 Keywords[pt]=khelpcenter,ajuda,índice,procura
 Keywords[pt_BR]=centro de ajuda,ajuda,índice,busca
 Keywords[ro]=centrul de ajutor,khelpcenter,ajutor,index,căutare
 Keywords[rw]=k-ifashayoborahagati,ifashayobora,umubarendanga,ishakisha 
 Keywords[se]=KHelpCenter,veahkki,indeaksa,indeksa,ohcan
-Keywords[sk]=khelpcenter,help,index,potqmocník,hľadanie
+Keywords[sk]=khelpcenter,help,index,pomocník,hľadanie
 Keywords[sl]=khelpcenter,pomoč,indeks,iskanje
 Keywords[sr]=khelpcenter,помоћ,садржај,претрага
 Keywords[sr@Latn]=khelpcenter,pomoć,sadržaj,pretraga
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index 3c3443ed3..8bf2f3b6c 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -138,7 +138,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
 
   protected:
     void setupMainWidget( TQWidget *parent );
-    void updatetqStatus();
+    void updateStatus();
     void startIndexProcess();
 
     void deleteProcess();
diff --git a/khelpcenter/khelpcenter.desktop b/khelpcenter/khelpcenter.desktop
index f14461039..5dad26cfe 100644
--- a/khelpcenter/khelpcenter.desktop
+++ b/khelpcenter/khelpcenter.desktop
@@ -24,7 +24,7 @@ Name[nds]=Trinity-Hülpzentrum
 Name[ne]=केडीई मद्दत केन्द्र
 Name[nso]=KBogare bja Thuso
 Name[pa]=ਕੇਸਹਾਇਤਾਕੇਂਦਰ
-Name[pl]=Centrum Potqmocy
+Name[pl]=Centrum Pomocy
 Name[pt_BR]=Centro de Ajuda
 Name[ro]=Centrul de ajutor Trinity
 Name[ru]=Центр справки
@@ -95,14 +95,14 @@ Comment[nn]=Trinity Hjelpesenter
 Comment[nso]=Bogare bja Thuso ya Trinity
 Comment[oc]=Lo centre d'ajuda Trinity
 Comment[pa]=ਕੇਡੀਈ ਸਹਾਇਤਾ ਕੇਂਦਰ
-Comment[pl]=Centrum Potqmocy Trinity
+Comment[pl]=Centrum Pomocy Trinity
 Comment[pt]=O Centro de Ajuda do Trinity
 Comment[pt_BR]=Centro de Ajuda do Trinity
 Comment[ro]=Centrul de ajutor al Trinity
 Comment[ru]=Центр справки Trinity
 Comment[rw]=Trinity Ifashayobora Hagati
 Comment[se]=Trinity veahkkeguovddáš
-Comment[sk]=Trinity Centrum potqmoci
+Comment[sk]=Trinity Centrum pomoci
 Comment[sl]=Središče pomoči za Trinity
 Comment[sr]=Trinity центар за помоћ
 Comment[sr@Latn]=Trinity centar za pomoć
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 7b9f9c27f..633bf0085 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -310,7 +310,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args )
          proto == "ghelp" )
         own = true;
     else if ( url.isLocalFile() ) {
-        KMimeMagicResult *res = KMimeMagic::self()->tqfindFileType( url.path() );
+        KMimeMagicResult *res = KMimeMagic::self()->findFileType( url.path() );
         if ( res->isValid() && res->accuracy() > 40
              && res->mimeType() == "text/html" )
             own = true;
@@ -325,7 +325,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args )
 
     mDoc->browserExtension()->setURLArgs( args );
 
-    if ( proto == TQString::tqfromLatin1("glossentry") ) {
+    if ( proto == TQString::fromLatin1("glossentry") ) {
         TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() );
         slotGlossSelected( mNavigator->glossEntry( decodedEntryId ) );
         mNavigator->slotSelectGlossEntry( decodedEntryId );
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 2285cd069..ad308cfc6 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -262,8 +262,8 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem
 
 void Navigator::insertAppletDocs( NavigatorItem *topItem )
 {
-  TQDir appletDir( locate( "data", TQString::tqfromLatin1( "kicker/applets/" ) ) );
-  appletDir.setNameFilter( TQString::tqfromLatin1( "*.desktop" ) );
+  TQDir appletDir( locate( "data", TQString::fromLatin1( "kicker/applets/" ) ) );
+  appletDir.setNameFilter( TQString::fromLatin1( "*.desktop" ) );
 
   TQStringList files = appletDir.entryList( TQDir::Files | TQDir::Readable );
   TQStringList::ConstIterator it = files.begin();
@@ -409,7 +409,7 @@ void Navigator::slotItemSelected( TQListViewItem *currentItem )
         if ( !doc.isNull() ) {
           int pos = doc.find( ".html" );
           if ( pos >= 0 ) {
-            doc.tqreplace( pos, 5, ".docbook" );
+            doc.replace( pos, 5, ".docbook" );
           }
           kdDebug( 1400 ) << "slotItemSelected(): doc = " << doc << endl;
 
@@ -563,7 +563,7 @@ void Navigator::slotSearch()
 void Navigator::slotShowSearchResult( const TQString &url )
 {
   TQString u = url;
-  u.tqreplace( "%k", mSearchEdit->text() );
+  u.replace( "%k", mSearchEdit->text() );
 
   emit itemSelected( u );
 }
diff --git a/khelpcenter/plugins/kioslaves.desktop b/khelpcenter/plugins/kioslaves.desktop
index 5b4586200..452ecd502 100644
--- a/khelpcenter/plugins/kioslaves.desktop
+++ b/khelpcenter/plugins/kioslaves.desktop
@@ -2,7 +2,7 @@
 
 Name=Kioslaves
 Name[bg]=Система за вход-изход
-Name[cs]=Potqmocné protokoly KDE
+Name[cs]=Pomocné protokoly KDE
 Name[csb]=Pluginsë wéńdzeniô/wińdzeniô
 Name[da]=Kioslaver
 Name[de]=Ein-/Ausgabemodule
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index 4ee28d21d..20a4b0851 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -180,7 +180,7 @@ void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent,
           if ( url.left( 5 ) == "file:" ) url = url.mid( 5 );
           url.prepend( "ghelp:" );
 #if 0
-          url.tqreplace( TQRegExp( ".xml$" ), ".html" );
+          url.replace( TQRegExp( ".xml$" ), ".html" );
 #endif
         } else if ( mimeType == "text/sgml" ) {
           // GNOME docs use this type. We don't have a real viewer for this.
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index 12117712d..b779afc8e 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -325,16 +325,16 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
     if ( lang.lower() == "c" || lang.lower() == "posix" )
 	  lang = "en";
 
-    // if the string tqcontains '&' tqreplace with a '+' and set search method to and
+    // if the string contains '&' replace with a '+' and set search method to and
     if (mWords.find("&") != -1) {
-      mWords.tqreplace("&", " ");
+      mWords.replace("&", " ");
       method = "and";
     }
 
-    // tqreplace whitespace with a '+'
+    // replace whitespace with a '+'
     mWords = mWords.stripWhiteSpace();
     mWords = mWords.simplifyWhiteSpace();
-    mWords.tqreplace(TQRegExp("\\s"), "+");
+    mWords.replace(TQRegExp("\\s"), "+");
 
     commonSearchProgram = substituteSearchQuery( commonSearchProgram );
 
@@ -379,7 +379,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
     delete mProc;
 
     // modify the search result
-    mSearchResult = mSearchResult.tqreplace("http://localhost/", "file:/");
+    mSearchResult = mSearchResult.replace("http://localhost/", "file:/");
     mSearchResult = mSearchResult.mid( mSearchResult.find( '<' ) );
 
     mView->beginSearchResult();
@@ -395,11 +395,11 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
 TQString SearchEngine::substituteSearchQuery( const TQString &query )
 {
   TQString result = query;
-  result.tqreplace( "%k", mWords );
-  result.tqreplace( "%n", TQString::number( mMatches ) );
-  result.tqreplace( "%m", mMethod );
-  result.tqreplace( "%l", mLang );
-  result.tqreplace( "%s", mScope );
+  result.replace( "%k", mWords );
+  result.replace( "%n", TQString::number( mMatches ) );
+  result.replace( "%m", mMethod );
+  result.replace( "%l", mLang );
+  result.replace( "%s", mScope );
 
   return result;
 }
@@ -409,15 +409,15 @@ TQString SearchEngine::substituteSearchQuery( const TQString &query,
   Operation operation, const TQString &lang )
 {
   TQString result = query;
-  result.tqreplace( "%i", identifier );
-  result.tqreplace( "%w", words.join( "+" ) );
-  result.tqreplace( "%m", TQString::number( maxResults ) );
+  result.replace( "%i", identifier );
+  result.replace( "%w", words.join( "+" ) );
+  result.replace( "%m", TQString::number( maxResults ) );
   TQString o;
   if ( operation == Or ) o = "or";
   else o = "and";
-  result.tqreplace( "%o", o );
-  result.tqreplace( "%d", Prefs::indexDirectory() );
-  result.tqreplace( "%l", lang );
+  result.replace( "%o", o );
+  result.replace( "%d", Prefs::indexDirectory() );
+  result.replace( "%l", lang );
 
   return result;
 }
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index 465c2bc80..9c34d7399 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -62,9 +62,9 @@ TQStringList SearchHandler::documentTypes() const
 TQString SearchHandler::indexCommand( const TQString &identifier )
 {
   TQString cmd = mIndexCommand;
-  cmd.tqreplace( "%i", identifier );
-  cmd.tqreplace( "%d", Prefs::indexDirectory() );
-  cmd.tqreplace( "%l", mLang );
+  cmd.replace( "%i", identifier );
+  cmd.replace( "%d", Prefs::indexDirectory() );
+  cmd.replace( "%l", mLang );
   return cmd;
 }
 
diff --git a/khelpcenter/searchhandlers/README.searchhandlers b/khelpcenter/searchhandlers/README.searchhandlers
index f888217ac..cbbfbbbd7 100644
--- a/khelpcenter/searchhandlers/README.searchhandlers
+++ b/khelpcenter/searchhandlers/README.searchhandlers
@@ -6,7 +6,7 @@ handlers. Each searchable document provides provides a document type in its meta
 data and if a corresponding handler is found, it can be searched.
 
 Search handlers are described by a desktop file which is put in the khelpcenter
-app directory in a "searchhandlers" directory. The desktop file tqcontains the
+app directory in a "searchhandlers" directory. The desktop file contains the
 information about which document types the handler covers, how to do a search
 query and how to create a search index.
 
@@ -21,7 +21,7 @@ Search Query
 
 KHelpcenter reads the command to execute for submitting a search query from the
 search handler's desktop file ("SearchCommand"). The search command can contain
-some symbols which are tqreplaced by KHelpcenter with the data for the concrete
+some symbols which are replaced by KHelpcenter with the data for the concrete
 search request:
 
 %i  Identifier of document (usually the name of the document's desktop file)
@@ -44,7 +44,7 @@ Building a Search Index
 
 KHelpcenter reads the command to build a search index from the search handler's
 desktop file ("IndexCommand"). The indexing command can contain some symbols
-which are tqreplaced by KHelpcenter with the data for the concrete index creation
+which are replaced by KHelpcenter with the data for the concrete index creation
 call:
 
 %i  Identifier of document (usually the name of the document's desktop file)
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index 852dc09a1..7bda95b8c 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -88,17 +88,17 @@ void TOC::build( const TQString &file )
 		}
 	}
 
-	TQString cacheFile = fileName.tqreplace( TQDir::separator(), "__" );
+	TQString cacheFile = fileName.replace( TQDir::separator(), "__" );
 	m_cacheFile = locateLocal( "cache", "help/" + cacheFile );
 	m_sourceFile = file;
 
-	if ( cachetqStatus() == NeedRebuild )
+	if ( cacheStatus() == NeedRebuild )
 		buildCache();
 	else
 		fillTree();
 }
 
-TOC::CachetqStatus TOC::cachetqStatus() const
+TOC::CacheStatus TOC::cacheStatus() const
 {
 	if ( !TQFile::exists( m_cacheFile ) ||
 	     sourceFileCTime() != cachedCTime() )
@@ -188,9 +188,9 @@ void TOC::fillTree()
 	TQDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" );
 	for ( unsigned int chapterCount = 0; chapterCount < chapters.count(); chapterCount++ ) {
 		TQDomElement chapElem = chapters.item( chapterCount ).toElement();
-		TQDomElement chapTitleElem = childElement( chapElem, TQString::tqfromLatin1( "title" ) );
+		TQDomElement chapTitleElem = childElement( chapElem, TQString::fromLatin1( "title" ) );
 		TQString chapTitle = chapTitleElem.text().simplifyWhiteSpace();
-		TQDomElement chapRefElem = childElement( chapElem, TQString::tqfromLatin1( "anchor" ) );
+		TQDomElement chapRefElem = childElement( chapElem, TQString::fromLatin1( "anchor" ) );
 		TQString chapRef = chapRefElem.text().stripWhiteSpace();
 
 		chapItem = new TOCChapterItem( this, m_parentItem, chapItem, chapTitle, chapRef );
@@ -199,9 +199,9 @@ void TOC::fillTree()
 		TQDomNodeList sections = chapElem.elementsByTagName( "section" );
 		for ( unsigned int sectCount = 0; sectCount < sections.count(); sectCount++ ) {
 			TQDomElement sectElem = sections.item( sectCount ).toElement();
-			TQDomElement sectTitleElem = childElement( sectElem, TQString::tqfromLatin1( "title" ) );
+			TQDomElement sectTitleElem = childElement( sectElem, TQString::fromLatin1( "title" ) );
 			TQString sectTitle = sectTitleElem.text().simplifyWhiteSpace();
-			TQDomElement sectRefElem = childElement( sectElem, TQString::tqfromLatin1( "anchor" ) );
+			TQDomElement sectRefElem = childElement( sectElem, TQString::fromLatin1( "anchor" ) );
 			TQString sectRef = sectRefElem.text().stripWhiteSpace();
 
 			sectItem = new TOCSectionItem( this, chapItem, sectItem, sectTitle, sectRef );
diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h
index 321a97253..6d01fd2ba 100644
--- a/khelpcenter/toc.h
+++ b/khelpcenter/toc.h
@@ -50,9 +50,9 @@ class TOC : public QObject
 		void meinprocExited( KProcess *meinproc );
 
 	private:
-		enum CachetqStatus { NeedRebuild, CacheOk };
+		enum CacheStatus { NeedRebuild, CacheOk };
 
-		CachetqStatus cachetqStatus() const;
+		CacheStatus cacheStatus() const;
 		int sourceFileCTime() const;
 		int cachedCTime() const;
 		TQDomElement childElement( const TQDomElement &e, const TQString &name );
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 381584d6a..64e6238ed 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -20,9 +20,9 @@
 
 using namespace KHC;
 
-View::View( TQWidget *tqparentWidget, const char *widgetName,
+View::View( TQWidget *parentWidget, const char *widgetName,
                   TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col )
-    : KHTMLPart( tqparentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
+    : KHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
 {
     setJScriptEnabled(false);
     setJavaEnabled(false);
diff --git a/khelpcenter/view.h b/khelpcenter/view.h
index 1c5a2bf66..3af2a15b8 100644
--- a/khelpcenter/view.h
+++ b/khelpcenter/view.h
@@ -20,7 +20,7 @@ class View : public KHTMLPart
 {
     Q_OBJECT
   public:
-    View( TQWidget *tqparentWidget, const char *widgetName,
+    View( TQWidget *parentWidget, const char *widgetName,
           TQObject *parent, const char *name, KHTMLPart::GUIProfile prof,
           KActionCollection *col );