Rename a number of old tq methods that are no longer tq specific

22 files changed, 82 insertions, 82 deletions

diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index 5b741bdf5..716c4d99e 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -278,7 +278,7 @@ void DocEntry::addChild( DocEntry *entry )
            entry->weight() < mChildren[ i + 1 ]->weight() ) {
         entry->setNextSibling( mChildren[ i + 1 ] );
         mChildren[ i ]->setNextSibling( entry );
-        mChildren.insert( mChildren.tqat( i + 1 ), entry );
+        mChildren.insert( mChildren.at( i + 1 ), entry );
         break;
       }
     }
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index 3880ce2bc..2ff496074 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -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 7aa25aa36..ea9fbc144 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -30,7 +30,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 
 using namespace KHC;
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index b9f394289..b1d4066e1 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -27,7 +27,7 @@
 #include <kstandarddirs.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 using namespace KHC;
 
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 46a9ce65b..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" );
@@ -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/history.cpp b/khelpcenter/history.cpp
index 62a434dd2..da07c3c0e 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -93,7 +93,7 @@ void History::createEntry()
   Entry * current = m_entries.current();
   if (current)
   {
-    m_entries.tqat( m_entries.count() - 1 ); // go to last one
+    m_entries.at( m_entries.count() - 1 ); // go to last one
     for ( ; m_entries.current() != current ; )
     {
       if ( !m_entries.removeLast() ) { // and remove from the end (faster and easier)
@@ -101,7 +101,7 @@ void History::createEntry()
         return;
       }
       else
-        m_entries.tqat( m_entries.count() - 1 );
+        m_entries.at( m_entries.count() - 1 );
     }
     // Now current is the current again.
 
@@ -111,7 +111,7 @@ void History::createEntry()
 
   // Append a new entry
   m_entries.append( new Entry ); // made current
-  Q_ASSERT( m_entries.tqat() == (int) m_entries.count() - 1 );
+  Q_ASSERT( m_entries.at() == (int) m_entries.count() - 1 );
 }
 
 void History::updateCurrentEntry( View *view )
@@ -199,9 +199,9 @@ void History::goHistory( int steps )
   Entry *current = m_entries.current();
   if ( current && !current->view ) m_entries.remove();
 
-  int newPos = m_entries.tqat() + steps;
+  int newPos = m_entries.at() + steps;
 
-  current = m_entries.tqat( newPos );
+  current = m_entries.at( newPos );
   if ( !current ) {
     kdError() << "No History entry at position " << newPos << endl;
     return;
@@ -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;
 
@@ -276,21 +276,21 @@ void History::fillGoMenu()
     // Second case: big history, in one or both directions
   {
     // Assume both directions first (in this case we place the current URL in the middle)
-    m_goMenuHistoryStartPos = m_entries.tqat() + 4;
+    m_goMenuHistoryStartPos = m_entries.at() + 4;
 
     // Forward not big enough ?
-    if ( m_entries.tqat() > (int)m_entries.count() - 4 )
+    if ( m_entries.at() > (int)m_entries.count() - 4 )
       m_goMenuHistoryStartPos = m_entries.count() - 1;
   }
   Q_ASSERT( m_goMenuHistoryStartPos >= 0 && (uint)m_goMenuHistoryStartPos < m_entries.count() );
-  m_goMenuHistoryCurrentPos = m_entries.tqat(); // for slotActivated
+  m_goMenuHistoryCurrentPos = m_entries.at(); // for slotActivated
   fillHistoryPopup( goMenu, false, false, true, m_goMenuHistoryStartPos );
 }
 
 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;
 
@@ -314,7 +314,7 @@ void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForw
   TQPtrListIterator<Entry> it( m_entries );
   if (onlyBack || onlyForward)
   {
-    it += m_entries.tqat(); // Jump to current item
+    it += m_entries.at(); // Jump to current item
     if ( !onlyForward ) --it; else ++it; // And move off it
   } else if ( startPos )
     it += startPos; // Jump to specified start pos
@@ -339,12 +339,12 @@ void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForw
 
 bool History::canGoBack() const
 {
-  return m_entries.tqat() > 0;
+  return m_entries.at() > 0;
 }
 
 bool History::canGoForward() const
 {
-  return m_entries.tqat() != static_cast<int>( m_entries.count() ) - 1;
+  return m_entries.at() != static_cast<int>( m_entries.count() ) - 1;
 }
 
 #include "history.moc"
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 5f93c39fd..c47300190 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -28,7 +28,7 @@ TQString HTMLSearch::dataPath(const TQString& _lang)
 
 void HTMLSearch::scanDir(const TQString& dir)
 {
-    assert( dir.tqat( dir.length() - 1 ) == '/' );
+    assert( dir.at( dir.length() - 1 ) == '/' );
 
     TQStringList::ConstIterator it;
 
@@ -83,7 +83,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang)
     TQStringList add = config->readListEntry("Paths");
     TQStringList::Iterator it;
     for (it = add.begin(); it != add.end(); ++it) {
-        if ( ( *it ).tqat( ( *it ).length() - 1 ) != '/' )
+        if ( ( *it ).at( ( *it ).length() - 1 ) != '/' )
             ( *it ) += '/';
         dirs.append(*it);
     }
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 64a301be7..3803329a2 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurllabel.h>
@@ -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 cf259fa46..b3c70915c 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 ));
 
@@ -211,7 +211,7 @@ bool KTagComboBox::containsTag( const TQString &str ) const
 
 TQString KTagComboBox::currentTag() const
 {
-  return *tags->tqat(currentItem());
+  return *tags->at(currentItem());
 }
 
 TQString KTagComboBox::tag(int i) const
@@ -221,7 +221,7 @@ TQString KTagComboBox::tag(int i) const
     kdDebug() << "KTagComboBox::tag(), unknown tag " << i << endl;
     return TQString::null;
   }
-  return *tags->tqat(i);
+  return *tags->at(i);
 }
 
 int KTagComboBox::currentItem() 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/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp
index e7eafedb1..57c839459 100644
--- a/khelpcenter/htmlsearch/progressdialog.cpp
+++ b/khelpcenter/htmlsearch/progressdialog.cpp
@@ -1,4 +1,4 @@
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index 8581b25c8..e1aba72b2 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
@@ -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/infotree.cpp b/khelpcenter/infotree.cpp
index 64c5645b9..49699678e 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -33,7 +33,7 @@
 #include <kurl.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <stdlib.h>  // for getenv()
 
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 28e9e5523..56b9ad104 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -41,7 +41,7 @@
 #include <kmessagebox.h>
 #include <klistview.h>
 #include <klineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqdir.h>
 #include <tqtabwidget.h>
@@ -49,7 +49,7 @@
 #include <tqfile.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqregexp.h>
 
 #include <unistd.h>
@@ -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 );
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 8da4e8f34..9ec0c1a0f 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index e70065bfc..ad0d3d5b7 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -43,8 +43,8 @@
 #include <kdialogbase.h>
 
 #include <tqsplitter.h>
-#include <tqtextedit.h>
-#include <tqlayout.h>
+#include <textedit.h>
+#include <layout.h>
 
 #include <stdlib.h>
 #include <assert.h>
@@ -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 07def94b2..4164d0d51 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -30,9 +30,9 @@
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
@@ -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();
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index c432d3a6a..3c089b33d 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -27,7 +27,7 @@
 #include <kurl.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqptrlist.h>
 #include <tqtabwidget.h>
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index b779afc8e..80c506cfb 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -1,6 +1,6 @@
 #include "stdlib.h"
 
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index bae623133..823d23eaf 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <ksimpleconfig.h>
 #include <kapplication.h>
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index cdc7d92d9..7bda95b8c 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -164,7 +164,7 @@ void TOC::meinprocExited( KProcess *meinproc )
 	TQDomComment timestamp = doc.createComment( TQString::number( sourceFileCTime() ) );
 	doc.documentElement().appendChild( timestamp );
 
-	f.tqat( 0 );
+	f.at( 0 );
 	TQTextStream stream( &f );
 	stream.setEncoding( TQTextStream::UnicodeUTF8 );
 	stream << doc.toString();
@@ -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/view.cpp b/khelpcenter/view.cpp
index 68e7b3310..512ad6f45 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -16,7 +16,7 @@
 #include <kstandarddirs.h>
 
 #include <tqfileinfo.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 using namespace KHC;
 
@@ -62,7 +62,7 @@ View::~View()
 
 void View::copySelectedText()
 {
-  kapp->tqclipboard()->setText( selectedText() );
+  kapp->clipboard()->setText( selectedText() );
 }
 
 bool View::openURL( const KURL &url )
@@ -276,7 +276,7 @@ void View::showMenu( const TQString& url, const TQPoint& pos)
 
 void View::slotCopyLink()
 {
-  TQApplication::tqclipboard()->setText(mCopyURL);
+  TQApplication::clipboard()->setText(mCopyURL);
 }
 
 bool View::prevPage(bool checkOnly)