Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

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

89 files changed, 621 insertions, 619 deletions

diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am
index f146b486..45d0d964 100644
--- a/akregator/src/Makefile.am
+++ b/akregator/src/Makefile.am
@@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \
 	kspeech.stub
 
 libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
-libakregatorpart_la_LIBADD = libakregatorprivate.la 
+libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libkdepim -lkdepim
 
 # this is where the desktop file will go
 partdesktopdir = $(kde_servicesdir)
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index c22e8418..18523993 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -148,7 +148,7 @@ void ActionManagerImpl::slotUpdateTagActions(bool enabled, const TQStringList& t
 
         for (TQValueList<TagAction*>::ConstIterator it = actions.begin(); it != actions.end(); ++it)
         {
-            (*it)->setChecked(tagIds.contains((*it)->tag().id()));
+            (*it)->setChecked(tagIds.tqcontains((*it)->tag().id()));
         }
     }
 }
@@ -197,7 +197,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag)
     if (!Settings::showTaggingGUI())
         return;
 
-    if (!d->tagActions.contains(tag.id()))
+    if (!d->tagActions.tqcontains(tag.id()))
     {
         d->tagActions[tag.id()] = new TagAction(tag, d->view, TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
         d->tagMenu->insert(d->tagActions[tag.id()]);
diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui
index 6b55d5fb..09c10fa4 100644
--- a/akregator/src/addfeedwidgetbase.ui
+++ b/akregator/src/addfeedwidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AddFeedWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -24,7 +24,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout16</cstring>
+                <cstring>tqlayout16</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -65,7 +65,7 @@
                 </spacer>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout15</cstring>
+                        <cstring>tqlayout15</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -75,7 +75,7 @@
                             <property name="name">
                                 <cstring>urlEdit</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -128,7 +128,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -137,7 +137,7 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>ksqueezedtextlabel.h</includehint>
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 449b871e..aafb17be 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -116,7 +116,7 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
     }
 };
 
-Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
+Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
                               TQObject *parent, const char *name, const TQStringList& )
     : DCOPObject("AkregatorIface")
        , MyBasePart(parent, name)
@@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
     {
         m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
 
-        KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
+        KMessageBox::error(tqparentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
     }
 
     Filters::ArticleFilterList list;
@@ -187,14 +187,14 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
     m_actionManager = new ActionManagerImpl(this);
     ActionManager::setInstance(m_actionManager);
 
-    m_view = new Akregator::View(this, parentWidget, m_actionManager, "akregator_view");
+    m_view = new Akregator::View(this, tqparentWidget, m_actionManager, "akregator_view");
     m_actionManager->initView(m_view);
     m_actionManager->setTagSet(Kernel::self()->tagSet());
 
     m_extension = new BrowserExtension(this, "ak_extension");
 
     connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&)));
-    connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
+    connect(m_view, TQT_SIGNAL(seStatusBarText(const TQString&)), this, TQT_SIGNAL(seStatusBarText(const TQString&)));
     connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int)));
     connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&)));
     connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*)));
@@ -428,7 +428,7 @@ bool Part::openFile()
 
             if (file.size() > 0) // don't backup empty files 
             {
-                TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::currentDateTime().toTime_t());
+                TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
         
                 copyFile(backup);
         
@@ -444,7 +444,7 @@ bool Part::openFile()
     {
         if (file.size() > 0) // don't backup empty files 
         {
-            TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::currentDateTime().toTime_t());
+            TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
             copyFile(backup);
 
             KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
@@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part)
         {
           if (m_mergedPart) {
             factory()->removeClient(m_mergedPart);
-            if (childClients()->containsRef(m_mergedPart))
+            if (childClients()->tqcontainsRef(m_mergedPart))
               removeChildClient(m_mergedPart);
           }
           if (part)
@@ -538,7 +538,7 @@ TQWidget* Part::getMainWindow()
 {
     // this is a dirty fix to get the main window used for the tray icon
     
-    TQWidgetList *l = kapp->topLevelWidgets();
+    TQWidgetList *l = kapp->tqtopLevelWidgets();
     TQWidgetListIt it( *l );
     TQWidget *wid;
 
@@ -823,7 +823,7 @@ KParts::Part* Part::hitTest(TQWidget *widget, const TQPoint &globalPos)
         if (!widget) {
             break;
         }
-        widget = widget->parentWidget();
+        widget = widget->tqparentWidget();
     }
     if (m_view && m_view->currentFrame() && child) {
         return m_view->currentFrame()->part();
@@ -979,8 +979,8 @@ bool Part::tryToLock(const TQString& backendName)
                         "You should disable the archive for now "
                         "unless you are sure that %2 is not already running.</qt>")
                         .arg( programName, programName, backendName );
-              // TQString::arg( st ) only replaces the first occurrence of %1
-              // with st while TQString::arg( s1, s2 ) replacess all occurrences
+              // TQString::arg( st ) only tqreplaces the first occurrence of %1
+              // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
               // of %1 with s1 and all occurrences of %2 with s2. So don't
               // even think about changing the above to .arg( programName ).
             else
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 3b0ec30e..487b001d 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -80,7 +80,7 @@ namespace Akregator
            typedef MyBasePart inherited;
 
             /** Default constructor.*/
-            Part(TQWidget *parentWidget, const char *widgetName,
+            Part(TQWidget *tqparentWidget, const char *widgetName,
                           TQObject *parent, const char *name, const TQStringList&);
 
 	        /** Destructor. */
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 8776ec12..59457286 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
 
     if (!Settings::resetQuickFilterOnNodeChange())
     {
-        m_searchBar->slotSetStatus(Settings::statusFilter());
+        m_searchBar->slotSeStatus(Settings::statusFilter());
         m_searchBar->slotSetText(Settings::textFilter());
     }
 
@@ -411,10 +411,10 @@ void View::slotOnShutdown()
 void View::saveSettings()
 {
     const TQValueList<int> spl1 = m_horizontalSplitter->sizes();
-    if ( spl1.contains( 0 ) == 0 )
+    if ( spl1.tqcontains( 0 ) == 0 )
         Settings::setSplitter1Sizes( spl1 );
     const TQValueList<int> spl2 = m_articleSplitter->sizes();
-    if ( spl2.contains( 0 ) == 0 )
+    if ( spl2.tqcontains( 0 ) == 0 )
         Settings::setSplitter2Sizes( spl2 );
     Settings::setViewMode( m_viewMode );
     Settings::writeConfig();
@@ -457,7 +457,7 @@ void View::setTabIcon(const TQPixmap& icon)
 
 void View::connectFrame(Frame *f)
 {
-    connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(slotStatusText(const TQString&)));
+    connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(sloStatusText(const TQString&)));
     connect(f, TQT_SIGNAL(captionChanged (const TQString &)), this, TQT_SLOT(slotCaptionChanged (const TQString &)));
     connect(f, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(slotLoadingProgress(int)) );
     connect(f, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted()));
@@ -465,10 +465,10 @@ void View::connectFrame(Frame *f)
     connect(f, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCanceled(const TQString&)));
 }
 
-void View::slotStatusText(const TQString &c)
+void View::sloStatusText(const TQString &c)
 {
     if (sender() == m_currentFrame)
-        emit setStatusBarText(c);
+        emit seStatusBarText(c);
 }
 
 void View::slotCaptionChanged(const TQString &c)
@@ -570,7 +570,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
             // create a tag for every tag ID in the archive that is not part of the tagset
             // this is a fallback in case the tagset was corrupted,
             // so the tagging information from archive does not get lost.
-            if (!tagSet->containsID(*it))
+            if (!tagSet->tqcontainsID(*it))
             {
                 Tag tag(*it, *it);
                 tagSet->insert(tag);
@@ -690,7 +690,7 @@ void View::slotFrameChanged(Frame *f)
 
     emit setWindowCaption(f->caption());
     emit setProgress(f->progress());
-    emit setStatusBarText(f->statusText());
+    emit seStatusBarText(f->statusText());
 
     if (f->part() == m_part)
         m_part->mergePart(m_articleViewer);
@@ -1070,14 +1070,14 @@ void View::slotFetchingStarted()
 {
     m_mainFrame->setState(Frame::Started);
     m_actionManager->action("feed_stop")->setEnabled(true);
-    m_mainFrame->setStatusText(i18n("Fetching Feeds..."));
+    m_mainFrame->seStatusText(i18n("Fetching Feeds..."));
 }
 
 void View::slotFetchingStopped()
 {
     m_mainFrame->setState(Frame::Completed);
     m_actionManager->action("feed_stop")->setEnabled(false);
-    m_mainFrame->setStatusText(TQString::null);
+    m_mainFrame->seStatusText(TQString::null);
 }
 
 void View::slotFeedFetched(Feed *feed)
@@ -1152,7 +1152,7 @@ void View::slotNewTag()
 
 void View::slotTagCreated(const Tag& tag)
 {
-    if (m_tagNodeList && !m_tagNodeList->containsTagId(tag.id()))
+    if (m_tagNodeList && !m_tagNodeList->tqcontainsTagId(tag.id()))
     {
         TagNode* tagNode = new TagNode(tag, m_feedList->rootNode());
         m_tagNodeList->rootNode()->appendChild(tagNode);
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
             if (delay > 0)
                 m_markReadTimer->start( delay*1000, true );
             else
-                a.setStatus(Article::Read);
+                a.seStatus(Article::Read);
         }
     }
 
@@ -1329,7 +1329,7 @@ void View::slotArticleDelete()
         for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
         {
             Feed* feed = (*it).feed();
-            if (!feeds.contains(feed))
+            if (!feeds.tqcontains(feed))
                 feeds.append(feed);
             feed->setNotificationMode(false);
             (*it).setDeleted();
@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).setStatus(Article::Read);
+        (*it).seStatus(Article::Read);
 }
 
 void View::slotTextToSpeechRequest()
@@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).setStatus(Article::Unread);
+        (*it).seStatus(Article::Unread);
 }
 
 void View::slotSetSelectedArticleNew()
@@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).setStatus(Article::New);
+        (*it).seStatus(Article::New);
 }
 
 void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
     if (article.isNull())
         return;
 
-    article.setStatus(Article::Read);
+    article.seStatus(Article::Read);
 }
 
 void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -1437,11 +1437,11 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
     if (kifi)
     {
         KFileItem *k=(KFileItem*)kifi;
-        m_mainFrame->setStatusText(k->url().prettyURL());//getStatusBarInfo());
+        m_mainFrame->seStatusText(k->url().prettyURL());//geStatusBarInfo());
     }
     else
     {
-        m_mainFrame->setStatusText(TQString::null);
+        m_mainFrame->seStatusText(TQString::null);
     }
 }
 
@@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
         m_searchBar->slotSetText(config->readEntry("searchLine"));
         int statusfilter = config->readNumEntry("searchCombo", -1);
         if (statusfilter != -1)
-            m_searchBar->slotSetStatus(statusfilter);
+            m_searchBar->slotSeStatus(statusfilter);
     }
 
     int selectedID = config->readNumEntry("selectedNodeID", -1);
@@ -1529,7 +1529,7 @@ void View::updateTagActions()
         TQStringList atags = (*it).tags();
         for (TQStringList::ConstIterator it2 = atags.begin(); it2 != atags.end(); ++it2)
         {
-            if (!tags.contains(*it2))
+            if (!tags.tqcontains(*it2))
                 tags += *it2;
         }
     }
diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h
index cb3e032c..4b9dcd13 100644
--- a/akregator/src/akregator_view.h
+++ b/akregator/src/akregator_view.h
@@ -83,7 +83,7 @@ namespace Akregator {
         public:
 
             /** constructor
-            @param part the Akregator::Part which contains this widget
+            @param part the Akregator::Part which tqcontains this widget
             @param parent parent widget
             @param Actionmanager for this view
             @param name the name of the widget (@ref TQWidget )
@@ -104,7 +104,7 @@ namespace Akregator {
             bool importFeeds(const TQDomDocument& doc);
 
             /** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current
-            feed list is replaced by the parsed one
+            feed list is tqreplaced by the parsed one
              @param doc TQDomDocument generated from OPML
              @param parent The parent group the new nodes */
             bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0);
@@ -133,7 +133,7 @@ namespace Akregator {
             void signalUnreadCountChanged(int);
 
             void setWindowCaption(const TQString&);
-            void setStatusBarText(const TQString&);
+            void seStatusBarText(const TQString&);
             void setProgress(int);
             void signalStarted(KIO::Job*);
             void signalCompleted();
@@ -195,7 +195,7 @@ namespace Akregator {
             void slotMouseOverInfo(const KFileItem *kifi);
 
             /** sets the status bar text to a given string */
-	        void slotStatusText(const TQString &);
+	        void sloStatusText(const TQString &);
 
             void slotStarted();
             void slotCanceled(const TQString &);
diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp
index 75d3f787..09f631a0 100644
--- a/akregator/src/article.cpp
+++ b/akregator/src/article.cpp
@@ -102,14 +102,14 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
 
     d->guid = article.guid();
     
-    if (!d->archive->contains(d->guid))
+    if (!d->archive->tqcontains(d->guid))
     {
         d->archive->addEntry(d->guid);
 
         if (article.meta("deleted") == "true") 
         { // if article is in deleted state, we just add the status and omit the rest
             d->status = Private::Read | Private::Deleted;
-            d->archive->setStatus(d->guid, d->status);
+            d->archive->seStatus(d->guid, d->status);
         }
         else
         { // article is not deleted, let's add it to the archive
@@ -123,7 +123,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
             d->archive->setCommentsLink(d->guid, article.commentsLink().url());
             d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink());
             d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true");
-            d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime();
+            d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime();
             d->archive->setPubDate(d->guid, d->pubDate.toTime_t());
             d->archive->setAuthor(d->guid, article.author());
                         
@@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
                 int statusInt = status.toInt();
                 if (statusInt == New)
                     statusInt = Unread;
-                setStatus(statusInt);
+                seStatus(statusInt);
             }
             setKeep(article.meta("keep") == "true");
         }
@@ -210,9 +210,9 @@ void Article::setDeleted()
     if (isDeleted())
         return;
   
-    setStatus(Read);
+    seStatus(Read);
     d->status = Private::Deleted | Private::Read;
-    d->archive->setStatus(d->guid, d->status);
+    d->archive->seStatus(d->guid, d->status);
     d->archive->setDeleted(d->guid);
 
     if (d->feed)
@@ -299,7 +299,7 @@ int Article::status() const
         return Unread;
 }
 
-void Article::setStatus(int stat)
+void Article::seStatus(int stat)
 {
     // use status() rather than statusBits() here to filter out status flags that we are not
     // interested in
@@ -319,7 +319,7 @@ void Article::setStatus(int stat)
                 d->status = ( d->status | Private::New) & ~Private::Read;
                 break;
         }
-        d->archive->setStatus(d->guid, d->status);
+        d->archive->seStatus(d->guid, d->status);
         if (d->feed)
             d->feed->setArticleChanged(*this, oldStatus);
      }
@@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
 void Article::setKeep(bool keep)
 {
     d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
-    d->archive->setStatus(d->guid, d->status);
+    d->archive->seStatus(d->guid, d->status);
     if (d->feed)
         d->feed->setArticleChanged(*this);
 }
@@ -425,7 +425,7 @@ void Article::removeTag(const TQString& tag)
 
 bool Article::hasTag(const TQString& tag) const
 {
-    return d->archive->tags(d->guid).contains(tag);
+    return d->archive->tags(d->guid).tqcontains(tag);
 }
 
 TQStringList Article::tags() const
@@ -457,7 +457,7 @@ TQString Article::buildTitle(const TQString& description)
     if (i != -1)
         s = s.left(i+1);
     TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false);
-    TQString tagName, toReplace, replaceWith;
+    TQString tagName, toReplace, tqreplaceWith;
     while (rx.search(s) != -1 )
     {
         tagName=rx.cap(2);
@@ -466,11 +466,11 @@ TQString Article::buildTitle(const TQString& description)
         else if (tagName.startsWith("br") || tagName.startsWith("BR"))
         {
             toReplace=rx.cap(1);
-            replaceWith=" ";
+            tqreplaceWith=" ";
         }
         else
             toReplace=rx.cap(1);  // strip just tag
-        s=s.replace(s.find(toReplace),toReplace.length(),replaceWith); // do the deed
+        s=s.tqreplace(s.find(toReplace),toReplace.length(),tqreplaceWith); // do the deed
     }
     if (s.length()> 90)
         s=s.left(90)+"...";
diff --git a/akregator/src/article.h b/akregator/src/article.h
index e9dae588..4b4d480e 100644
--- a/akregator/src/article.h
+++ b/akregator/src/article.h
@@ -80,7 +80,7 @@ namespace Akregator
             bool isNull() const;
             
             int status() const;
-            void setStatus(int s);
+            void seStatus(int s);
 
             void offsetPubDate(int secs);
 
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index a8bf8a36..065a421a 100644
--- a/akregator/src/articlefilter.cpp
+++ b/akregator/src/articlefilter.cpp
@@ -43,35 +43,35 @@ TQString Criterion::subjectToString(Subject subj)
     switch (subj)
     {
         case Title:
-            return TQString::fromLatin1("Title");
+            return TQString::tqfromLatin1("Title");
         case Link:
-            return TQString::fromLatin1("Link");
+            return TQString::tqfromLatin1("Link");
         case Author:
-            return TQString::fromLatin1("Author");
+            return TQString::tqfromLatin1("Author");
         case Description:
-            return TQString::fromLatin1("Description");
+            return TQString::tqfromLatin1("Description");
         case Status:
-            return TQString::fromLatin1("Status");
+            return TQString::tqfromLatin1("Status");
         case KeepFlag:
-            return TQString::fromLatin1("KeepFlag");
+            return TQString::tqfromLatin1("KeepFlag");
         default: // should never happen (TM)
-            return TQString::fromLatin1("Description");
+            return TQString::tqfromLatin1("Description");
     }
 }
 
 Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
 {
-    if (subjStr == TQString::fromLatin1("Title"))
+    if (subjStr == TQString::tqfromLatin1("Title"))
         return Title;
-    else if (subjStr == TQString::fromLatin1("Link"))
+    else if (subjStr == TQString::tqfromLatin1("Link"))
         return Link;
-    else if (subjStr == TQString::fromLatin1("Description"))
+    else if (subjStr == TQString::tqfromLatin1("Description"))
         return Description;
-    else if (subjStr == TQString::fromLatin1("Author"))
+    else if (subjStr == TQString::tqfromLatin1("Author"))
         return Author;
-    else if (subjStr == TQString::fromLatin1("Status"))
+    else if (subjStr == TQString::tqfromLatin1("Status"))
         return Status;
-    else if (subjStr == TQString::fromLatin1("KeepFlag"))
+    else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
         return KeepFlag;
 
     // hopefully never reached
@@ -83,27 +83,27 @@ TQString Criterion::predicateToString(Predicate pred)
     switch (pred)
     {
         case Contains:
-            return TQString::fromLatin1("Contains");
+            return TQString::tqfromLatin1("Contains");
         case Equals:
-            return TQString::fromLatin1("Equals");
+            return TQString::tqfromLatin1("Equals");
         case Matches:
-            return TQString::fromLatin1("Matches");
+            return TQString::tqfromLatin1("Matches");
         case Negation:
-            return TQString::fromLatin1("Negation");
+            return TQString::tqfromLatin1("Negation");
         default:// hopefully never reached
-            return TQString::fromLatin1("Contains");
+            return TQString::tqfromLatin1("Contains");
     }
 }
 
 Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr)
 {
-    if (predStr == TQString::fromLatin1("Contains"))
+    if (predStr == TQString::tqfromLatin1("Contains"))
         return Contains;
-    else if (predStr == TQString::fromLatin1("Equals"))
+    else if (predStr == TQString::tqfromLatin1("Equals"))
         return Equals;
-    else if (predStr == TQString::fromLatin1("Matches"))
+    else if (predStr == TQString::tqfromLatin1("Matches"))
         return Matches;
-    else if (predStr == TQString::fromLatin1("Negation"))
+    else if (predStr == TQString::tqfromLatin1("Negation"))
         return Negation;
     
     // hopefully never reached
@@ -124,24 +124,24 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj
 
 void Criterion::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));
+    config->writeEntry(TQString::tqfromLatin1("subject"), subjectToString(m_subject));
 
-    config->writeEntry(TQString::fromLatin1("predicate"), predicateToString(m_predicate));
+    config->writeEntry(TQString::tqfromLatin1("predicate"), predicateToString(m_predicate));
 
-    config->writeEntry(TQString::fromLatin1("objectType"), TQString(m_object.typeName()));
+    config->writeEntry(TQString::tqfromLatin1("objectType"), TQString(m_object.typeName()));
 
-    config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
+    config->writeEntry(TQString::tqfromLatin1("objectValue"), m_object);
 }
 
 void Criterion::readConfig(KConfig* config)
 {
-    m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject")));
-    m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate")));
-    TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::fromLatin1("objType")).ascii());
+    m_subject = stringToSubject(config->readEntry(TQString::tqfromLatin1("subject")));
+    m_predicate = stringToPredicate(config->readEntry(TQString::tqfromLatin1("predicate")));
+    TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::tqfromLatin1("objType")).ascii());
 
     if (type != TQVariant::Invalid)
     {
-        m_object = config->readPropertyEntry(TQString::fromLatin1("objectValue"), type);
+        m_object = config->readPropertyEntry(TQString::tqfromLatin1("objectValue"), type);
     }
 }
 
@@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const
 
 void ArticleMatcher::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
+    config->writeEntry(TQString::tqfromLatin1("matcherAssociation"), associationToString(m_association));
     
-    config->writeEntry(TQString::fromLatin1("matcherCriteriaCount"), m_criteria.count());
+    config->writeEntry(TQString::tqfromLatin1("matcherCriteriaCount"), m_criteria.count());
 
     int index = 0;
 
     for (TQValueList<Criterion>::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it)
     {
-        config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(index));
+        config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(index));
         (*it).writeConfig(config);
         ++index;
     }
@@ -286,14 +286,14 @@ void ArticleMatcher::writeConfig(KConfig* config) const
 void ArticleMatcher::readConfig(KConfig* config)
 {
     m_criteria.clear();
-    m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));
+    m_association = stringToAssociation(config->readEntry(TQString::tqfromLatin1("matcherAssociation")));
 
-    int count =  config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0);
+    int count =  config->readNumEntry(TQString::tqfromLatin1("matcherCriteriaCount"), 0);
     
     for (int i = 0; i < count; ++i)
     {
         Criterion c;
-        config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(i));
+        config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(i));
         c.readConfig(config);
         m_criteria.append(c);
     }
@@ -343,9 +343,9 @@ bool ArticleMatcher::allCriteriaMatch( const Article &a ) const
 
 ArticleMatcher::Association ArticleMatcher::stringToAssociation(const TQString& assocStr)
 {
-    if (assocStr == TQString::fromLatin1("LogicalAnd"))
+    if (assocStr == TQString::tqfromLatin1("LogicalAnd"))
         return LogicalAnd;
-    else if (assocStr == TQString::fromLatin1("LogicalOr"))
+    else if (assocStr == TQString::tqfromLatin1("LogicalOr"))
         return LogicalOr;
     else
         return None;
@@ -356,11 +356,11 @@ TQString ArticleMatcher::associationToString(Association association)
     switch (association)
     {
         case LogicalAnd:
-            return TQString::fromLatin1("LogicalAnd");
+            return TQString::tqfromLatin1("LogicalAnd");
         case LogicalOr:
-            return TQString::fromLatin1("LogicalOr");
+            return TQString::tqfromLatin1("LogicalOr");
         default:
-            return TQString::fromLatin1("None");
+            return TQString::tqfromLatin1("None");
     }
 }
 
@@ -408,13 +408,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)
 
 void TagMatcher::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
-    config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
+    config->writeEntry(TQString::tqfromLatin1("matcherType"), TQString::tqfromLatin1("TagMatcher"));
+    config->writeEntry(TQString::tqfromLatin1("matcherParams"), d->tagID);
 }
 
 void TagMatcher::readConfig(KConfig* config)
 {
-    d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
+    d->tagID = config->readEntry(TQString::tqfromLatin1("matcherParams"));
 }
 
 bool TagMatcher::operator==(const AbstractMatcher& other) const
@@ -442,41 +442,41 @@ void DeleteAction::exec(Article& article)
         article.setDeleted();
 }
 
-SetStatusAction::SetStatusAction(int status) : m_status(status)
+SeStatusAction::SeStatusAction(int status) : m_status(status)
 {
 }
         
-void SetStatusAction::exec(Article& article)
+void SeStatusAction::exec(Article& article)
 {
     if (!article.isNull())
-        article.setStatus(m_status);
+        article.seStatus(m_status);
 }
 
-int SetStatusAction::status() const
+int SeStatusAction::status() const
 {
     return m_status;
 }
 
-void SetStatusAction::setStatus(int status)
+void SeStatusAction::seStatus(int status)
 {
     m_status = status;
 }
 
-void SetStatusAction::writeConfig(KConfig* config) const
+void SeStatusAction::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction"));
-    config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
+    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("SeStatusAction"));
+    config->writeEntry(TQString::tqfromLatin1("actionParams"), m_status);
 }
 
-void SetStatusAction::readConfig(KConfig* config)
+void SeStatusAction::readConfig(KConfig* config)
 {
-    m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
+    m_status = config->readNumEntry(TQString::tqfromLatin1("actionParams"), Article::Read);
 }
 
-bool SetStatusAction::operator==(const AbstractAction& other)
+bool SeStatusAction::operator==(const AbstractAction& other)
 {
     AbstractAction* ptr = const_cast<AbstractAction*>(&other);
-    SetStatusAction* o = dynamic_cast<SetStatusAction*>(ptr);
+    SeStatusAction* o = dynamic_cast<SeStatusAction*>(ptr);
     if (!o)
         return false;
     else
@@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const
 
 void ArticleFilterList::writeConfig(KConfig* config) const
 {
-    config->setGroup(TQString::fromLatin1("Filters"));
-    config->writeEntry(TQString::fromLatin1("count"), count());
+    config->setGroup(TQString::tqfromLatin1("Filters"));
+    config->writeEntry(TQString::tqfromLatin1("count"), count());
     int index = 0;
     for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it)
     {
-        config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(index));
+        config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(index));
         (*it).writeConfig(config);
         ++index;
     }
@@ -595,11 +595,11 @@ void ArticleFilterList::writeConfig(KConfig* config) const
 void ArticleFilterList::readConfig(KConfig* config)
 {
     clear();
-    config->setGroup(TQString::fromLatin1("Filters"));
-    int count = config->readNumEntry(TQString::fromLatin1("count"), 0);
+    config->setGroup(TQString::tqfromLatin1("Filters"));
+    int count = config->readNumEntry(TQString::tqfromLatin1("count"), 0);
     for (int i = 0; i < count; ++i)
     {
-        config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(i));
+        config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(i));
         ArticleFilter filter;
         filter.readConfig(config);
         append(filter);
@@ -609,13 +609,13 @@ void ArticleFilterList::readConfig(KConfig* config)
 
 void AssignTagAction::readConfig(KConfig* config)
 {
-    m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
+    m_tagID = config->readEntry(TQString::tqfromLatin1("actionParams"));
 }
 
 void AssignTagAction::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
-    config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
+    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("AssignTagAction"));
+    config->writeEntry(TQString::tqfromLatin1("actionParams"), m_tagID);
 }
 
 bool AssignTagAction::operator==(const AbstractAction& other)
@@ -644,7 +644,7 @@ void DeleteAction::readConfig(KConfig* /*config*/)
 
 void DeleteAction::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
+    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("DeleteAction"));
 }
 
 bool DeleteAction::operator==(const AbstractAction& other)
@@ -661,28 +661,28 @@ void ArticleFilter::readConfig(KConfig* config)
     delete d->action;
     d->action = 0;
 
-    d->name = config->readEntry(TQString::fromLatin1("name"));
-    d->id = config->readNumEntry(TQString::fromLatin1("id"), 0);
+    d->name = config->readEntry(TQString::tqfromLatin1("name"));
+    d->id = config->readNumEntry(TQString::tqfromLatin1("id"), 0);
 
-    TQString matcherType = config->readEntry(TQString::fromLatin1("matcherType"));
+    TQString matcherType = config->readEntry(TQString::tqfromLatin1("matcherType"));
 
-    if (matcherType == TQString::fromLatin1("TagMatcher"))
+    if (matcherType == TQString::tqfromLatin1("TagMatcher"))
         d->matcher = new TagMatcher();
-    else if (matcherType == TQString::fromLatin1("ArticleMatcher"))
+    else if (matcherType == TQString::tqfromLatin1("ArticleMatcher"))
         d->matcher = new ArticleMatcher();
 
     if (d->matcher)
         d->matcher->readConfig(config);
 
 
-        TQString actionType = config->readEntry(TQString::fromLatin1("actionType"));
+        TQString actionType = config->readEntry(TQString::tqfromLatin1("actionType"));
 
-    if (actionType == TQString::fromLatin1("AssignTagAction"))
+    if (actionType == TQString::tqfromLatin1("AssignTagAction"))
         d->action = new AssignTagAction();
-    else if (actionType == TQString::fromLatin1("DeleteAction"))
+    else if (actionType == TQString::tqfromLatin1("DeleteAction"))
         d->action = new DeleteAction();
-    else if (actionType == TQString::fromLatin1("SetStatusAction"))
-        d->action = new SetStatusAction();
+    else if (actionType == TQString::tqfromLatin1("SeStatusAction"))
+        d->action = new SeStatusAction();
 
     if (d->action)
         d->action->readConfig(config);
@@ -690,8 +690,8 @@ void ArticleFilter::readConfig(KConfig* config)
 
 void ArticleFilter::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("name"), d->name);
-    config->writeEntry(TQString::fromLatin1("id"), d->id);
+    config->writeEntry(TQString::tqfromLatin1("name"), d->name);
+    config->writeEntry(TQString::tqfromLatin1("id"), d->id);
     d->matcher->writeConfig(config);
     d->action->writeConfig(config);
 }
diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h
index 9a9b4a76..dee27da5 100644
--- a/akregator/src/articlefilter.h
+++ b/akregator/src/articlefilter.h
@@ -166,20 +166,20 @@ class DeleteAction : public AbstractAction
         virtual bool operator==(const AbstractAction& other);
 };
 
-class SetStatusAction : public AbstractAction
+class SeStatusAction : public AbstractAction
 {
     public:
-        SetStatusAction(int status=0);
+        SeStatusAction(int status=0);
         
         virtual void exec(Article& article);
         
         int status() const;
-        void setStatus(int status);
+        void seStatus(int status);
 
         virtual void writeConfig(KConfig* config) const;
         virtual void readConfig(KConfig* config);
 
-        virtual SetStatusAction* clone() const { return new SetStatusAction(*this); }
+        virtual SeStatusAction* clone() const { return new SeStatusAction(*this); }
         virtual bool operator==(const AbstractAction& other);
 
     private:
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index 72527822..c9df8963 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -354,7 +354,7 @@ void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const TQValueList<Ar
     
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (!d->articleMap.contains(*it))
+        if (!d->articleMap.tqcontains(*it))
         {
             if (!(*it).isNull() && !(*it).isDeleted())
             {
@@ -385,7 +385,7 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList<
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
         
-        if (!(*it).isNull() && d->articleMap.contains(*it))
+        if (!(*it).isNull() && d->articleMap.tqcontains(*it))
         {
             ArticleItem* ali = d->articleMap[*it];
 
@@ -447,7 +447,7 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList<
     
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (d->articleMap.contains(*it))
+        if (d->articleMap.tqcontains(*it))
         {
             ArticleItem* ali = d->articleMap[*it];
             d->articleMap.remove(*it);
@@ -564,9 +564,9 @@ void ArticleListView::paintInfoBox(const TQString &message)
     const uint x = (viewport()->width() - w - 30) / 2 ;
     const uint y = (viewport()->height() - h - 30) / 2 ;
 
-    p.setBrush( colorGroup().background() );
+    p.setBrush( tqcolorGroup().background() );
     p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
-    t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
+    t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
 }
 
 void ArticleListView::viewportPaintEvent(TQPaintEvent *e)
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index 147f4ab4..d456a415 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -87,7 +87,7 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
         {
             text += TQString("<div class=\"body\">");
             TQString url=node->xmlUrl();
-            TQString file = url.replace("/", "_").replace(":", "_");
+            TQString file = url.tqreplace("/", "_").tqreplace(":", "_");
             KURL u(m_view->m_imageDir);
             u.setFileName(file);
             text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url());
@@ -410,7 +410,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
         text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
         if (article.link().isValid())
             text += "<a href=\""+article.link().url()+"\">";
-        text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
+        text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
         if (article.link().isValid())
             text += "</a>";
         text += "</div>\n";
@@ -505,7 +505,7 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
         text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
         if (link.isValid())
             text += "<a href=\""+link.url()+"\">";
-        text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
+        text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
         if (link.isValid())
             text += "</a>";
         text += "</div>\n";
diff --git a/akregator/src/dragobjects.cpp b/akregator/src/dragobjects.cpp
index 679166e1..02074891 100644
--- a/akregator/src/dragobjects.cpp
+++ b/akregator/src/dragobjects.cpp
@@ -43,7 +43,7 @@ bool ArticleDrag::canDecode(const TQMimeSource* e)
 bool ArticleDrag::decode(const TQMimeSource* e, TQValueList<ArticleDragItem>& articles)
 {
     articles.clear();
-    TQByteArray array = e->encodedData("akregator/articles");
+    TQByteArray array = e->tqencodedData("akregator/articles");
     
     TQDataStream stream(array, IO_ReadOnly);
 
@@ -68,7 +68,7 @@ const char* ArticleDrag::format(int i) const
     return 0;
 }
 
-TQByteArray ArticleDrag::encodedData(const char* mime) const
+TQByteArray ArticleDrag::tqencodedData(const char* mime) const
 {
     TQCString mimetype(mime);
     if (mimetype == "akregator/articles")
@@ -86,7 +86,7 @@ TQByteArray ArticleDrag::encodedData(const char* mime) const
     }
     else
     {
-        return KURLDrag::encodedData(mime);
+        return KURLDrag::tqencodedData(mime);
     }
 }
 
diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h
index cc1be89f..88531d36 100644
--- a/akregator/src/dragobjects.h
+++ b/akregator/src/dragobjects.h
@@ -57,7 +57,7 @@ public:
 
 protected:
 
-    virtual TQByteArray encodedData(const char* mime) const;
+    virtual TQByteArray tqencodedData(const char* mime) const;
     virtual const char* format(int i) const;
 
 private:
diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index f0574c31..edf1a790 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -87,7 +87,7 @@ class Feed::FeedPrivate
         /** caches guids of tagged articles. key: tag, value: list of guids */
         TQMap<TQString, TQStringList> taggedArticles;
 
-        /** list of deleted articles. This contains **/
+        /** list of deleted articles. This tqcontains **/
         TQValueList<Article> deletedArticles;
         
         /** caches guids of deleted articles for notification */
@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
         TQValueList<Article>::Iterator en = tarticles.end();
 
         for (it = tarticles.begin(); it != en; ++it)
-            (*it).setStatus(Article::Read);
+            (*it).seStatus(Article::Read);
         setNotificationMode(true, true);
     }
 }
@@ -412,7 +412,7 @@ void Feed::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
         queue->addFeed(this);
     else
     {
-        uint now = TQDateTime::currentDateTime().toTime_t();
+        uint now = TQDateTime::tqcurrentDateTime().toTime_t();
 
         // workaround for 3.5.x: if the last fetch went wrong, try again after 30 minutes
         // this fixes annoying behaviour of akregator, especially when the host is reachable
@@ -450,7 +450,7 @@ void Feed::appendArticles(const RSS::Document &doc)
 
     for (it = d_articles.begin(); it != en; ++it)
     {
-        if ( !d->articles.contains((*it).guid()) ) // article not in list
+        if ( !d->articles.tqcontains((*it).guid()) ) // article not in list
         {
             Article mya(*it, this);
             mya.offsetPubDate(nudge);
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
             d->addedArticlesNotify.append(mya);
             
             if (!mya.isDeleted() && !markImmediatelyAsRead())
-                mya.setStatus(Article::New);
+                mya.seStatus(Article::New);
             else
-                mya.setStatus(Article::Read);
+                mya.seStatus(Article::Read);
                 
             changed = true;
         }
@@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
             {
                 mya.setKeep(old.keep());
                 int oldstatus = old.status();
-                old.setStatus(Article::Read);
+                old.seStatus(Article::Read);
 
                 d->articles.remove(old.guid());
                 appendArticle(mya);
 
-                mya.setStatus(oldstatus);
+                mya.seStatus(oldstatus);
 
                 d->updatedArticlesNotify.append(mya);
                 changed = true;
@@ -519,7 +519,7 @@ bool Feed::usesExpiryByAge() const
 
 bool Feed::isExpired(const Article& a) const
 {
-    TQDateTime now = TQDateTime::currentDateTime();
+    TQDateTime now = TQDateTime::tqcurrentDateTime();
     int expiryAge = -1;
 // check whether the feed uses the global default and the default is limitArticleAge
     if ( d->archiveMode == globalDefault && Settings::archiveMode() == Settings::EnumArchiveMode::limitArticleAge)
@@ -535,7 +535,7 @@ void Feed::appendArticle(const Article& a)
 {
     if ( (a.keep() && Settings::doNotExpireImportantArticles()) || ( !usesExpiryByAge() || !isExpired(a) ) ) // if not expired
     {
-        if (!d->articles.contains(a.guid()))
+        if (!d->articles.tqcontains(a.guid()))
         {
             d->articles[a.guid()] = a;
             if (!a.isDeleted() && a.status() != Article::Read)
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
     {
         if ((*it).status() == Article::New)
         {
-            (*it).setStatus(Article::Unread);
+            (*it).seStatus(Article::Unread);
         }
     }
 
@@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
         else
         {
             d->fetchError = true;
-            d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t();
+            d->lastErrorFetch = TQDateTime::tqcurrentDateTime().toTime_t();
             emit fetchError(this);
         }
         return;
@@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
 
     appendArticles(doc);
 
-    d->archive->setLastFetch( TQDateTime::currentDateTime().toTime_t());
+    d->archive->setLastFetch( TQDateTime::tqcurrentDateTime().toTime_t());
     emit fetched(this);
 }
 
@@ -726,10 +726,10 @@ void Feed::setUnread(int unread)
 
 void Feed::setArticleDeleted(Article& a)
 {
-    if (!d->deletedArticles.contains(a))
+    if (!d->deletedArticles.tqcontains(a))
         d->deletedArticles.append(a);
 
-    if (!d->removedArticlesNotify.contains(a))
+    if (!d->removedArticlesNotify.tqcontains(a))
         d->removedArticlesNotify.append(a);
 
     articlesModified();
diff --git a/akregator/src/feed.h b/akregator/src/feed.h
index 86c98bd8..d94eecac 100644
--- a/akregator/src/feed.h
+++ b/akregator/src/feed.h
@@ -264,7 +264,7 @@ namespace Akregator
             void setArticleDeleted(Article& a);
 
             /** notifies that article @c mya was changed
-                @param oldStatus if the status was changed, it contains the old status, -1 otherwise
+                @param oldStatus if the status was changed, it tqcontains the old status, -1 otherwise
                 To be called by @ref Article
              */
             void setArticleChanged(Article& a, int oldStatus=-1);
diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp
index 13e65d51..88433706 100644
--- a/akregator/src/feediconmanager.cpp
+++ b/akregator/src/feediconmanager.cpp
@@ -59,7 +59,7 @@ FeedIconManager* FeedIconManager::self()
 
 void FeedIconManager::fetchIcon(Feed* feed)
 {
-    if (!d->registeredFeeds.contains(feed))
+    if (!d->registeredFeeds.tqcontains(feed))
     {
         d->registeredFeeds.append(feed);
         connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*)));
@@ -133,7 +133,7 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node)
 {
     Feed* feed = dynamic_cast<Feed*>(node);
     if (feed)
-        while (d->registeredFeeds.contains(feed))
+        while (d->registeredFeeds.tqcontains(feed))
             d->registeredFeeds.remove(d->registeredFeeds.find(feed));
 }
 
@@ -147,7 +147,7 @@ void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL
     if (!p.isNull()) // we don't set null pixmaps, as feed checks pixmap.isNull() to find out whether the icon was already loaded or not. It would request the icon another time, resulting an infinite loop (until stack overflow that is
     {
         while (( f = d->urlDict.take(hostOrURL) ))
-            if (d->registeredFeeds.contains(f))
+            if (d->registeredFeeds.tqcontains(f))
                 f->setFavicon(p);
     }
     emit signalIconChanged(hostOrURL, iconFile);
diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp
index 4076c623..1195b5dd 100644
--- a/akregator/src/feedlist.cpp
+++ b/akregator/src/feedlist.cpp
@@ -117,7 +117,7 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* parent)
             Feed* feed = Feed::fromOPML(e);
             if (feed)
             {
-                if (!d->urlMap[feed->xmlUrl()].contains(feed))
+                if (!d->urlMap[feed->xmlUrl()].tqcontains(feed))
                     d->urlMap[feed->xmlUrl()].append(feed);
                 parent->appendChild(feed);
             }
@@ -219,7 +219,7 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after)
     if ( list == this )
         return;
 
-    if ( !flatList()->contains(parent) )
+    if ( !flatList()->tqcontains(parent) )
         parent = rootNode();
 
     TQValueList<TreeNode*> children = list->rootNode()->children();
diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h
index 10e49217..c0ba14cc 100644
--- a/akregator/src/feedlist.h
+++ b/akregator/src/feedlist.h
@@ -64,7 +64,7 @@ public:
     /** exports the feed list as OPML. The root node ("All Feeds") is ignored! */
     virtual TQDomDocument toXML() const;
 
-    /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it contains the same feed multiple times, any of the Feed objects is returned. */
+    /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it tqcontains the same feed multiple times, any of the Feed objects is returned. */
     Feed* findByURL(const TQString& feedURL) const;
 
     Article findArticle(const TQString& feedURL, const TQString& guid) const;
diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h
index 5b2f2a50..bbf36207 100644
--- a/akregator/src/feedstorage.h
+++ b/akregator/src/feedstorage.h
@@ -80,7 +80,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
         /** returns the guid of the articles in a given category */
         virtual TQStringList articles(const Category& cat) = 0;
 
-        /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is replaced by the article from the source
+        /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is tqreplaced by the article from the source
         @param source the archive which articles should be appended
         */
         virtual void add(FeedStorage* source) = 0;
@@ -92,7 +92,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
         virtual void clear() = 0;
 
         
-        virtual bool contains(const TQString& guid) = 0;
+        virtual bool tqcontains(const TQString& guid) = 0;
         virtual void addEntry(const TQString& guid) = 0;
         virtual void deleteArticle(const TQString& guid) = 0;
         virtual int comments(const TQString& guid) = 0;
@@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
         virtual uint pubDate(const TQString& guid) = 0;
         virtual void setPubDate(const TQString& guid, uint pubdate) = 0;
         virtual int status(const TQString& guid) = 0;
-        virtual void setStatus(const TQString& guid, int status) = 0;
+        virtual void seStatus(const TQString& guid, int status) = 0;
         virtual TQString title(const TQString& guid) = 0;
         virtual void setTitle(const TQString& guid, const TQString& title) = 0;
         virtual TQString description(const TQString& guid) = 0;
diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp
index 6712d748..b7200b0e 100644
--- a/akregator/src/feedstoragedummyimpl.cpp
+++ b/akregator/src/feedstoragedummyimpl.cpp
@@ -147,21 +147,21 @@ TQStringList FeedStorageDummyImpl::articles(const Category& cat)
 
 void FeedStorageDummyImpl::addEntry(const TQString& guid)
 {
-    if (!d->entries.contains(guid))
+    if (!d->entries.tqcontains(guid))
     {
         d->entries[guid] = FeedStorageDummyImplPrivate::Entry();
         setTotalCount(totalCount()+1);
     }
 }
 
-bool FeedStorageDummyImpl::contains(const TQString& guid)
+bool FeedStorageDummyImpl::tqcontains(const TQString& guid)
 {
-    return d->entries.contains(guid);
+    return d->entries.tqcontains(guid);
 }
 
 void FeedStorageDummyImpl::deleteArticle(const TQString& guid)
 {
-    if (!d->entries.contains(guid))
+    if (!d->entries.tqcontains(guid))
         return;
 
     setDeleted(guid);
@@ -172,33 +172,33 @@ void FeedStorageDummyImpl::deleteArticle(const TQString& guid)
 int FeedStorageDummyImpl::comments(const TQString& guid)
 {
     
-    return contains(guid) ? d->entries[guid].comments : 0;
+    return tqcontains(guid) ? d->entries[guid].comments : 0;
 }
 
 TQString FeedStorageDummyImpl::commentsLink(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].commentsLink : "";
+    return tqcontains(guid) ? d->entries[guid].commentsLink : "";
 }
 
 bool FeedStorageDummyImpl::guidIsHash(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].guidIsHash : false;
+    return tqcontains(guid) ? d->entries[guid].guidIsHash : false;
 }
 
 bool FeedStorageDummyImpl::guidIsPermaLink(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].guidIsPermaLink : false;
+    return tqcontains(guid) ? d->entries[guid].guidIsPermaLink : false;
 }
 
 uint FeedStorageDummyImpl::hash(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].hash : 0;
+    return tqcontains(guid) ? d->entries[guid].hash : 0;
 }
 
 
 void FeedStorageDummyImpl::setDeleted(const TQString& guid)
 {
-    if (!contains(guid))
+    if (!tqcontains(guid))
         return;
 
     FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
@@ -233,99 +233,99 @@ void FeedStorageDummyImpl::setDeleted(const TQString& guid)
 
 TQString FeedStorageDummyImpl::link(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].link : "";
+    return tqcontains(guid) ? d->entries[guid].link : "";
 }
 
 uint FeedStorageDummyImpl::pubDate(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].pubDate : 0;
+    return tqcontains(guid) ? d->entries[guid].pubDate : 0;
 }
 
 int FeedStorageDummyImpl::status(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].status : 0;
+    return tqcontains(guid) ? d->entries[guid].status : 0;
 }
 
-void FeedStorageDummyImpl::setStatus(const TQString& guid, int status)
+void FeedStorageDummyImpl::seStatus(const TQString& guid, int status)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].status = status;
 }
 
 TQString FeedStorageDummyImpl::title(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].title : "";
+    return tqcontains(guid) ? d->entries[guid].title : "";
 }
 
 TQString FeedStorageDummyImpl::description(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].description : "";
+    return tqcontains(guid) ? d->entries[guid].description : "";
 }
 
 
 void FeedStorageDummyImpl::setPubDate(const TQString& guid, uint pubdate)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].pubDate = pubdate;
 }
 
 void FeedStorageDummyImpl::setGuidIsHash(const TQString& guid, bool isHash)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].guidIsHash = isHash;
 }
 
 void FeedStorageDummyImpl::setLink(const TQString& guid, const TQString& link)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].link = link;
 }
 
 void FeedStorageDummyImpl::setHash(const TQString& guid, uint hash)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].hash = hash;
 }
 
 void FeedStorageDummyImpl::setTitle(const TQString& guid, const TQString& title)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].title = title;
 }
 
 void FeedStorageDummyImpl::setDescription(const TQString& guid, const TQString& description)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].description = description;
 }
 
 void FeedStorageDummyImpl::setCommentsLink(const TQString& guid, const TQString& commentsLink)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].commentsLink = commentsLink;
 }
 
 void FeedStorageDummyImpl::setComments(const TQString& guid, int comments)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].comments = comments;
 }
 
 
 void FeedStorageDummyImpl::setGuidIsPermaLink(const TQString& guid, bool isPermaLink)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].guidIsPermaLink = isPermaLink;
 }
 
 void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
     {
         d->entries[guid].tags.append(tag);
-        if (!d->taggedArticles[tag].contains(guid))
+        if (!d->taggedArticles[tag].tqcontains(guid))
             d->taggedArticles[tag].append(guid);
-        if (!d->tags.contains(tag))
+        if (!d->tags.tqcontains(tag))
             d->tags.append(tag);
     }
 
@@ -333,7 +333,7 @@ void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag)
 
 void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat)
 {
-    if (!contains(guid))
+    if (!tqcontains(guid))
         return;
 
     d->entries[guid].categories.append(cat);
@@ -345,19 +345,19 @@ void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat
 
 void FeedStorageDummyImpl::setAuthor(const TQString& guid, const TQString& author)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].author = author;
 }
 
 TQString FeedStorageDummyImpl::author(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].author : TQString();
+    return tqcontains(guid) ? d->entries[guid].author : TQString();
 }
 
 TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid)
 {
   if (!guid.isNull())
-        return contains(guid) ? d->entries[guid].categories : TQValueList<Category>();
+        return tqcontains(guid) ? d->entries[guid].categories : TQValueList<Category>();
     else
         return d->categories;
 }
@@ -365,7 +365,7 @@ TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid)
 
 void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
     {
         d->entries[guid].tags.remove(tag);
         d->taggedArticles[tag].remove(guid);
@@ -377,7 +377,7 @@ void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag)
 TQStringList FeedStorageDummyImpl::tags(const TQString& guid)
 {
     if (!guid.isNull())
-        return contains(guid) ? d->entries[guid].tags : TQStringList();
+        return tqcontains(guid) ? d->entries[guid].tags : TQStringList();
     else
     {
         return d->tags;
@@ -396,7 +396,7 @@ void FeedStorageDummyImpl::add(FeedStorage* source)
 
 void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source)
 {
-    if (!contains(guid))
+    if (!tqcontains(guid))
         addEntry(guid);
 
     setComments(guid, source->comments(guid));
@@ -407,7 +407,7 @@ void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source
     setHash(guid, source->hash(guid));
     setLink(guid, source->link(guid));
     setPubDate(guid, source->pubDate(guid));
-    setStatus(guid, source->status(guid));
+    seStatus(guid, source->status(guid));
     setTitle(guid, source->title(guid));
     TQStringList tags = source->tags(guid);
     
@@ -424,7 +424,7 @@ void FeedStorageDummyImpl::clear()
 
 void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
     {
         FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
         entry.hasEnclosure = true;
@@ -436,7 +436,7 @@ void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& ur
 
 void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
     {
         FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
         entry.hasEnclosure = false;
@@ -448,7 +448,7 @@ void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)
 
 void FeedStorageDummyImpl::enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
     {
         FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
         hasEnclosure = entry.hasEnclosure;
diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h
index 60c70857..d15f45bd 100644
--- a/akregator/src/feedstoragedummyimpl.h
+++ b/akregator/src/feedstoragedummyimpl.h
@@ -50,7 +50,7 @@ class FeedStorageDummyImpl : public FeedStorage
         virtual TQStringList articles(const Category& cat);
 
 
-        virtual bool contains(const TQString& guid);
+        virtual bool tqcontains(const TQString& guid);
         virtual void addEntry(const TQString& guid);
         virtual void deleteArticle(const TQString& guid);
         virtual int comments(const TQString& guid);
@@ -69,7 +69,7 @@ class FeedStorageDummyImpl : public FeedStorage
         virtual uint pubDate(const TQString& guid);
         virtual void setPubDate(const TQString& guid, uint pubdate);
         virtual int status(const TQString& guid);
-        virtual void setStatus(const TQString& guid, int status);
+        virtual void seStatus(const TQString& guid, int status);
         virtual TQString title(const TQString& guid);
         virtual void setTitle(const TQString& guid, const TQString& title);
         virtual TQString description(const TQString& guid);
diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp
index 63c4a4c4..6093cb51 100644
--- a/akregator/src/fetchqueue.cpp
+++ b/akregator/src/fetchqueue.cpp
@@ -72,7 +72,7 @@ void FetchQueue::slotAbort()
 
 void FetchQueue::addFeed(Feed *f)
 {
-    if (!d->queuedFeeds.contains(f) && !d->fetchingFeeds.contains(f))
+    if (!d->queuedFeeds.tqcontains(f) && !d->fetchingFeeds.tqcontains(f))
     {
         connectToFeed(f);
         d->queuedFeeds.append(f);
diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp
index f3a583a6..fac9bd2e 100644
--- a/akregator/src/folder.cpp
+++ b/akregator/src/folder.cpp
@@ -62,9 +62,9 @@ bool Folder::accept(TreeNodeVisitor* visitor)
 
 Folder* Folder::fromOPML(TQDomElement e)
 {
-    Folder* fg = new Folder(e.hasAttribute(TQString::fromLatin1("text")) ? e.attribute(TQString::fromLatin1("text")) : e.attribute(TQString::fromLatin1("title")));
-    fg->setOpen( e.attribute(TQString::fromLatin1("isOpen")) != TQString::fromLatin1(("false")));
-    fg->setId( e.attribute(TQString::fromLatin1("id")).toUInt() );
+    Folder* fg = new Folder(e.hasAttribute(TQString::tqfromLatin1("text")) ? e.attribute(TQString::tqfromLatin1("text")) : e.attribute(TQString::tqfromLatin1("title")));
+    fg->setOpen( e.attribute(TQString::tqfromLatin1("isOpen")) != TQString::tqfromLatin1(("false")));
+    fg->setId( e.attribute(TQString::tqfromLatin1("id")).toUInt() );
     return fg;
 }
 
@@ -99,7 +99,7 @@ TQStringList Folder::tags() const
         // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want QSet. Now.
         TQStringList t2 = (*it)->tags();
         for (TQStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2)
-            if (!t.contains(*it2))
+            if (!t.tqcontains(*it2))
                 t.append(*it2);
     } 
     return t;
@@ -202,7 +202,7 @@ void Folder::prependChild(TreeNode* node)
 void Folder::removeChild(TreeNode* node)
 {
 //    kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl;
-    if (node && d->children.contains(node))
+    if (node && d->children.tqcontains(node))
     {    
         node->setParent(0);
         d->children.remove(node);
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index c8780462..85419931 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -51,7 +51,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co
     if (watchSignals) // e.g, articles tab has no part
     {
         connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &)));
-        connect(m_part, TQT_SIGNAL(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &)));
+        connect(m_part, TQT_SIGNAL(seStatusBarText (const TQString &)), this, TQT_SLOT(seStatusText (const TQString &)));
 
         KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p );
         if (ext)
@@ -120,10 +120,10 @@ void Frame::setCaption(const TQString &s)
     emit captionChanged(s);
 }
 
-void Frame::setStatusText(const TQString &s)
+void Frame::seStatusText(const TQString &s)
 {
     m_statusText=s;
-    m_statusText.replace(TQRegExp("<[^>]*>"), "");
+    m_statusText.tqreplace(TQRegExp("<[^>]*>"), "");
     emit statusText(m_statusText);
 }
 
@@ -175,7 +175,7 @@ void Frame::setStarted()
 {
     if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID();
     m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString::null, false);
-    m_progressItem->setStatus(i18n("Loading..."));
+    m_progressItem->seStatus(i18n("Loading..."));
     //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch()));
     m_state=Started;
     emit started();
@@ -184,7 +184,7 @@ void Frame::setStarted()
 void Frame::setCanceled(const TQString &s)
 {
     if(m_progressItem) {
-        m_progressItem->setStatus(i18n("Loading canceled"));
+        m_progressItem->seStatus(i18n("Loading canceled"));
         m_progressItem->setComplete();
         m_progressItem = 0;
     }
@@ -195,7 +195,7 @@ void Frame::setCanceled(const TQString &s)
 void Frame::setCompleted()
 {
     if(m_progressItem) {
-        m_progressItem->setStatus(i18n("Loading completed"));
+        m_progressItem->seStatus(i18n("Loading completed"));
         m_progressItem->setComplete();
         m_progressItem = 0;
     }
diff --git a/akregator/src/frame.h b/akregator/src/frame.h
index 1649722d..27418402 100644
--- a/akregator/src/frame.h
+++ b/akregator/src/frame.h
@@ -69,7 +69,7 @@ namespace Akregator
             void setProgress(int);
             void setCaption(const TQString &);
             void setTitle(const TQString &);
-            void setStatusText(const TQString &); 
+            void seStatusText(const TQString &); 
 
         signals:
             void captionChanged(const TQString &);
diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h
index 50e49aa8..da38eec5 100644
--- a/akregator/src/kcursorsaver.h
+++ b/akregator/src/kcursorsaver.h
@@ -17,9 +17,9 @@ namespace Akregator {
 class KCursorSaver : public Qt
 {
 public:
-    /// constructor taking TQCursor shapes
-    KCursorSaver(Qt::CursorShape shape) {
-        TQApplication::setOverrideCursor( TQCursor(shape) );
+    /// constructor taking TQCursor tqshapes
+    KCursorSaver(Qt::tqCursorShape tqshape) {
+        TQApplication::setOverrideCursor( TQCursor(tqshape) );
         inited = true;
     }
 
diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp
index 24413053..59949244 100644
--- a/akregator/src/librss/article.cpp
+++ b/akregator/src/librss/article.cpp
@@ -78,35 +78,35 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
 		TQDomNode n;
 		for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
 			const TQDomElement e = n.toElement();
-			if ( (e.tagName()==TQString::fromLatin1("link")) &&
-				(e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
+			if ( (e.tagName()==TQString::tqfromLatin1("link")) &&
+				(e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
 				{   
-					d->link=n.toElement().attribute(TQString::fromLatin1("href"));
+					d->link=n.toElement().attribute(TQString::tqfromLatin1("href"));
 					break;
 				}
 		}
 	}
 	else
 	{
-		if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
+		if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
 			d->link = elemText;
 	}
 
 
     // prefer content/content:encoded over summary/description for feeds that provide it
-    TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded");
+    TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded");
     
     if (!(elemText = extractNode(node, tagName, false)).isNull())
         d->description = elemText;
     
     if (d->description.isEmpty())
     {
-		if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull())
+		if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull())
 			d->description = elemText;
     
 		if (d->description.isEmpty())  // 3rd try: see http://www.intertwingly.net/blog/1299.html
 		{
-			if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
+			if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
 				d->description = elemText;
 		}
 	}
@@ -116,21 +116,21 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
 	if (format == AtomFeed)
 	{
         if (version == vAtom_1_0)
-            elemText = extractNode(node, TQString::fromLatin1("updated"));
+            elemText = extractNode(node, TQString::tqfromLatin1("updated"));
         else
-           elemText = extractNode(node, TQString::fromLatin1("issued"));
+           elemText = extractNode(node, TQString::tqfromLatin1("issued"));
 
 		if (!elemText.isNull())
 			time = parseISO8601Date(elemText); 	
 	}
 	else 
 	{
-		elemText = extractNode(node, TQString::fromLatin1("pubDate"));
+		elemText = extractNode(node, TQString::tqfromLatin1("pubDate"));
 		if (!elemText.isNull())
 			time = KRFCDate::parseDate(elemText);
 	}
 	
-	if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull())
 	{
 		time = parseISO8601Date(elemText);
 	}
@@ -139,11 +139,11 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
         if (time != 0)
 		d->pubDate.setTime_t(time);
 
-	if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) {
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) {
 		d->commentsLink = elemText;
 	}
 
-    if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) {
+    if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) {
         d->numComments = elemText.toInt();
     }
 
@@ -152,19 +152,19 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
     // in RSS 1.0, we use <item about> attribute as ID
     // FIXME: pass format version instead of checking for attribute
 
-    if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about")))
+    if (!element.isNull() && element.hasAttribute(TQString::tqfromLatin1("rdf:about")))
     {
-        d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work
+        d->guid = element.attribute(TQString::tqfromLatin1("rdf:about")); // HACK: using ns properly did not work
         d->guidIsPermaLink = false;
     }
     else
     {
-        tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid");
+        tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid");
         TQDomNode n = node.namedItem(tagName);
 	    if (!n.isNull())
         {
             d->guidIsPermaLink = (format==AtomFeed)? false : true;
-            if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
+            if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
             if (!(elemText = extractNode(node, tagName)).isNull())
                 d->guid = elemText;
         }
@@ -178,10 +178,10 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
 		md5Machine.update(d->title.utf8());
 		md5Machine.update(d->description.utf8());
 		d->guid = TQString(md5Machine.hexDigest().data());
-        d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true");
+        d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true");
 	}
 
-    TQDomNode enclosure = element.namedItem(TQString::fromLatin1("enclosure"));
+    TQDomNode enclosure = element.namedItem(TQString::tqfromLatin1("enclosure"));
     if (enclosure.isElement())
         d->enclosure = Enclosure::fromXML(enclosure.toElement());
 
@@ -191,12 +191,12 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
     {
         if (i.isElement())
         {
-            if (i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta"))
+            if (i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta"))
             {
-                TQString type = i.toElement().attribute(TQString::fromLatin1("type"));
+                TQString type = i.toElement().attribute(TQString::tqfromLatin1("type"));
                 d->meta[type] = i.toElement().text();
             }
-            else if (i.toElement().tagName() == TQString::fromLatin1("category"))
+            else if (i.toElement().tagName() == TQString::tqfromLatin1("category"))
             {
                 d->categories.append(Category::fromXML(i.toElement()));
             }
diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h
index 2cbbca06..611dd408 100644
--- a/akregator/src/librss/article.h
+++ b/akregator/src/librss/article.h
@@ -148,7 +148,7 @@ namespace RSS
           * @param parent The parent widget for the KURLLabel.
           * @param name A name for the widget which will be used internally.
           * @return a widget (a KURLLabel in this case) for the Article.
-          * This makes building a user-interface which contains the
+          * This makes building a user-interface which tqcontains the
           * information in this Article object more convenient.
           * The returned KURLLabel's caption will be the title(), clicking
           * on it will emit the URL link(), and it has a TQToolTip attached
diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp
index ae757714..6dc63d3b 100644
--- a/akregator/src/librss/category.cpp
+++ b/akregator/src/librss/category.cpp
@@ -64,8 +64,8 @@ bool Category::isNull() const
 Category Category::fromXML(const TQDomElement& e)
 {
     Category obj;
-    if (e.hasAttribute(TQString::fromLatin1("domain")))
-        obj.d->domain = e.attribute(TQString::fromLatin1("domain"));
+    if (e.hasAttribute(TQString::tqfromLatin1("domain")))
+        obj.d->domain = e.attribute(TQString::tqfromLatin1("domain"));
     obj.d->category = e.text();
     obj.d->isNull = false;
     return obj;
diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp
index b52ea87c..170ceaa7 100644
--- a/akregator/src/librss/document.cpp
+++ b/akregator/src/librss/document.cpp
@@ -79,15 +79,15 @@ static TQString extractLink(const TQDomNode& node, Format format)
         TQDomNode n;
         for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
             const TQDomElement e = n.toElement();
-            if ( (e.tagName() == TQString::fromLatin1("link")) 
-                  && (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
+            if ( (e.tagName() == TQString::tqfromLatin1("link")) 
+                  && (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
             {   
-                return n.toElement().attribute(TQString::fromLatin1("href"));
+                return n.toElement().attribute(TQString::tqfromLatin1("href"));
             }
         }
     }
 
-    return extractNode(node, TQString::fromLatin1("link"));
+    return extractNode(node, TQString::tqfromLatin1("link"));
     
 }
 
@@ -100,20 +100,20 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     TQString attr;
 
     // we should probably check that it ISN'T feed or rss, rather than check if it is xhtml
-    if (rootNode.toElement().tagName()==TQString::fromLatin1("html"))
+    if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html"))
         d->valid=false;
     else
         d->valid=true;
     
-    attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString::null);
-    if (rootNode.toElement().tagName()==TQString::fromLatin1("feed"))
+    attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString::null);
+    if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed"))
     {
         d->format=AtomFeed;
-        if (attr == TQString::fromLatin1("0.3"))
+        if (attr == TQString::tqfromLatin1("0.3"))
             d->version = vAtom_0_3;
-        else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */
+        else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */
             d->version = vAtom_0_2;
-        else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */
+        else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */
             d->version = vAtom_0_1;
         else
             d->version = vAtom_1_0;
@@ -121,13 +121,13 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     else
     {
         d->format=RSSFeed;
-        if (attr == TQString::fromLatin1("0.91"))
+        if (attr == TQString::tqfromLatin1("0.91"))
             d->version = v0_91;
-        else if (attr == TQString::fromLatin1("0.92"))
+        else if (attr == TQString::tqfromLatin1("0.92"))
             d->version = v0_92;
-        else if (attr == TQString::fromLatin1("0.93"))
+        else if (attr == TQString::tqfromLatin1("0.93"))
             d->version = v0_93;
-        else if (attr == TQString::fromLatin1("0.94"))
+        else if (attr == TQString::tqfromLatin1("0.94"))
             d->version = v0_94;
         else // otherwise, we just assume a RSS2 compatible feed. As rss2 is generally
              // backward-compatible, this should work
@@ -137,7 +137,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     
     if (d->format==UnknownFormat)
     {
-        attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString::null);
+        attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString::null);
         if (!attr.isNull()) {
         /*
          * Hardcoding these URLs is actually a bad idea, since the DTD doesn't
@@ -147,11 +147,11 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
          * distinguish the RSS versions by analyzing the relationship between
          * the nodes.
          */
-            if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
+            if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
                 d->format=RSSFeed;
                 d->version = v0_90;
              }
-            else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) {
+            else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) {
                 d->format=RSSFeed;
                 d->version = v1_0;
             }
@@ -163,7 +163,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     if (d->format == AtomFeed)
         channelNode=rootNode;
     else
-        channelNode=rootNode.namedItem(TQString::fromLatin1("channel"));
+        channelNode=rootNode.namedItem(TQString::tqfromLatin1("channel"));
 
     if (!(elemText = extractTitle(channelNode)).isNull())
         d->title = elemText;
@@ -192,27 +192,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     else
     {
 	// following is a HACK for broken 0.91 feeds like xanga.com's
-	if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull())
+	if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull())
 	    parentNode = rootNode;
 	else
             parentNode = channelNode;
     }
     
     // image and textinput aren't supported by Atom.. handle in case feed provides
-    TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image"));
+    TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image"));
     if (!n.isNull())
         d->image = new Image(n);
 
-    n = parentNode.namedItem(TQString::fromLatin1("textinput"));
+    n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
     if (!n.isNull())
         d->textInput = new TextInput(n);
 
     // Our (hopefully faster) version of elementsByTagName()
     TQString tagName;
     if (d->format == AtomFeed)
-        tagName=TQString::fromLatin1("entry");
+        tagName=TQString::tqfromLatin1("entry");
     else
-        tagName=TQString::fromLatin1("item");
+        tagName=TQString::tqfromLatin1("item");
 
     for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
         const TQDomElement e = n.toElement();
@@ -220,212 +220,212 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
             d->articles.append(Article(e, d->format, d->version));
     }
 
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull())
         d->copyright = elemText;
 
     if (d->format == AtomFeed)
-        elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString::null);
+        elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString::null);
     else
-        elemText = extractNode(channelNode, TQString::fromLatin1("language"));
+        elemText = extractNode(channelNode, TQString::tqfromLatin1("language"));
 
     if (!elemText.isNull()){
-        if (elemText == TQString::fromLatin1("af"))
+        if (elemText == TQString::tqfromLatin1("af"))
             d->language = af;
-        else if (elemText == TQString::fromLatin1("sq"))
+        else if (elemText == TQString::tqfromLatin1("sq"))
             d->language = sq;
-        else if (elemText == TQString::fromLatin1("eu"))
+        else if (elemText == TQString::tqfromLatin1("eu"))
             d->language = eu;
-        else if (elemText == TQString::fromLatin1("be"))
+        else if (elemText == TQString::tqfromLatin1("be"))
             d->language = be;
-        else if (elemText == TQString::fromLatin1("bg"))
+        else if (elemText == TQString::tqfromLatin1("bg"))
             d->language = bg;
-        else if (elemText == TQString::fromLatin1("ca"))
+        else if (elemText == TQString::tqfromLatin1("ca"))
             d->language = ca;
-        else if (elemText == TQString::fromLatin1("zh-cn"))
+        else if (elemText == TQString::tqfromLatin1("zh-cn"))
             d->language = zh_cn;
-        else if (elemText == TQString::fromLatin1("zh-tw"))
+        else if (elemText == TQString::tqfromLatin1("zh-tw"))
             d->language = zh_tw;
-        else if (elemText == TQString::fromLatin1("hr"))
+        else if (elemText == TQString::tqfromLatin1("hr"))
             d->language = hr;
-        else if (elemText == TQString::fromLatin1("cs"))
+        else if (elemText == TQString::tqfromLatin1("cs"))
             d->language = cs;
-        else if (elemText == TQString::fromLatin1("da"))
+        else if (elemText == TQString::tqfromLatin1("da"))
             d->language = da;
-        else if (elemText == TQString::fromLatin1("nl"))
+        else if (elemText == TQString::tqfromLatin1("nl"))
             d->language = nl;
-        else if (elemText == TQString::fromLatin1("nl-be"))
+        else if (elemText == TQString::tqfromLatin1("nl-be"))
             d->language = nl_be;
-        else if (elemText == TQString::fromLatin1("nl-nl"))
+        else if (elemText == TQString::tqfromLatin1("nl-nl"))
             d->language = nl_nl;
-        else if (elemText == TQString::fromLatin1("en"))
+        else if (elemText == TQString::tqfromLatin1("en"))
             d->language = en;
-        else if (elemText == TQString::fromLatin1("en-au"))
+        else if (elemText == TQString::tqfromLatin1("en-au"))
             d->language = en_au;
-        else if (elemText == TQString::fromLatin1("en-bz"))
+        else if (elemText == TQString::tqfromLatin1("en-bz"))
             d->language = en_bz;
-        else if (elemText == TQString::fromLatin1("en-ca"))
+        else if (elemText == TQString::tqfromLatin1("en-ca"))
             d->language = en_ca;
-        else if (elemText == TQString::fromLatin1("en-ie"))
+        else if (elemText == TQString::tqfromLatin1("en-ie"))
             d->language = en_ie;
-        else if (elemText == TQString::fromLatin1("en-jm"))
+        else if (elemText == TQString::tqfromLatin1("en-jm"))
             d->language = en_jm;
-        else if (elemText == TQString::fromLatin1("en-nz"))
+        else if (elemText == TQString::tqfromLatin1("en-nz"))
             d->language = en_nz;
-        else if (elemText == TQString::fromLatin1("en-ph"))
+        else if (elemText == TQString::tqfromLatin1("en-ph"))
             d->language = en_ph;
-        else if (elemText == TQString::fromLatin1("en-za"))
+        else if (elemText == TQString::tqfromLatin1("en-za"))
             d->language = en_za;
-        else if (elemText == TQString::fromLatin1("en-tt"))
+        else if (elemText == TQString::tqfromLatin1("en-tt"))
             d->language = en_tt;
-        else if (elemText == TQString::fromLatin1("en-gb"))
+        else if (elemText == TQString::tqfromLatin1("en-gb"))
             d->language = en_gb;
-        else if (elemText == TQString::fromLatin1("en-us"))
+        else if (elemText == TQString::tqfromLatin1("en-us"))
             d->language = en_us;
-        else if (elemText == TQString::fromLatin1("en-zw"))
+        else if (elemText == TQString::tqfromLatin1("en-zw"))
             d->language = en_zw;
-        else if (elemText == TQString::fromLatin1("fo"))
+        else if (elemText == TQString::tqfromLatin1("fo"))
             d->language = fo;
-        else if (elemText == TQString::fromLatin1("fi"))
+        else if (elemText == TQString::tqfromLatin1("fi"))
             d->language = fi;
-        else if (elemText == TQString::fromLatin1("fr"))
+        else if (elemText == TQString::tqfromLatin1("fr"))
             d->language = fr;
-        else if (elemText == TQString::fromLatin1("fr-be"))
+        else if (elemText == TQString::tqfromLatin1("fr-be"))
             d->language = fr_be;
-        else if (elemText == TQString::fromLatin1("fr-ca"))
+        else if (elemText == TQString::tqfromLatin1("fr-ca"))
             d->language = fr_ca;
-        else if (elemText == TQString::fromLatin1("fr-fr"))
+        else if (elemText == TQString::tqfromLatin1("fr-fr"))
             d->language = fr_fr;
-        else if (elemText == TQString::fromLatin1("fr-lu"))
+        else if (elemText == TQString::tqfromLatin1("fr-lu"))
             d->language = fr_lu;
-        else if (elemText == TQString::fromLatin1("fr-mc"))
+        else if (elemText == TQString::tqfromLatin1("fr-mc"))
             d->language = fr_mc;
-        else if (elemText == TQString::fromLatin1("fr-ch"))
+        else if (elemText == TQString::tqfromLatin1("fr-ch"))
             d->language = fr_ch;
-        else if (elemText == TQString::fromLatin1("gl"))
+        else if (elemText == TQString::tqfromLatin1("gl"))
             d->language = gl;
-        else if (elemText == TQString::fromLatin1("gd"))
+        else if (elemText == TQString::tqfromLatin1("gd"))
             d->language = gd;
-        else if (elemText == TQString::fromLatin1("de"))
+        else if (elemText == TQString::tqfromLatin1("de"))
             d->language = de;
-        else if (elemText == TQString::fromLatin1("de-at"))
+        else if (elemText == TQString::tqfromLatin1("de-at"))
             d->language = de_at;
-        else if (elemText == TQString::fromLatin1("de-de"))
+        else if (elemText == TQString::tqfromLatin1("de-de"))
             d->language = de_de;
-        else if (elemText == TQString::fromLatin1("de-li"))
+        else if (elemText == TQString::tqfromLatin1("de-li"))
             d->language = de_li;
-        else if (elemText == TQString::fromLatin1("de-lu"))
+        else if (elemText == TQString::tqfromLatin1("de-lu"))
             d->language = de_lu;
-        else if (elemText == TQString::fromLatin1("de-ch"))
+        else if (elemText == TQString::tqfromLatin1("de-ch"))
             d->language = de_ch;
-        else if (elemText == TQString::fromLatin1("el"))
+        else if (elemText == TQString::tqfromLatin1("el"))
             d->language = el;
-        else if (elemText == TQString::fromLatin1("hu"))
+        else if (elemText == TQString::tqfromLatin1("hu"))
             d->language = hu;
-        else if (elemText == TQString::fromLatin1("is"))
+        else if (elemText == TQString::tqfromLatin1("is"))
             d->language = is;
-        else if (elemText == TQString::fromLatin1("id"))
+        else if (elemText == TQString::tqfromLatin1("id"))
             d->language = id;
-        else if (elemText == TQString::fromLatin1("ga"))
+        else if (elemText == TQString::tqfromLatin1("ga"))
             d->language = ga;
-        else if (elemText == TQString::fromLatin1("it"))
+        else if (elemText == TQString::tqfromLatin1("it"))
             d->language = it;
-        else if (elemText == TQString::fromLatin1("it-it"))
+        else if (elemText == TQString::tqfromLatin1("it-it"))
             d->language = it_it;
-        else if (elemText == TQString::fromLatin1("it-ch"))
+        else if (elemText == TQString::tqfromLatin1("it-ch"))
             d->language = it_ch;
-        else if (elemText == TQString::fromLatin1("ja"))
+        else if (elemText == TQString::tqfromLatin1("ja"))
             d->language = ja;
-        else if (elemText == TQString::fromLatin1("ko"))
+        else if (elemText == TQString::tqfromLatin1("ko"))
             d->language = ko;
-        else if (elemText == TQString::fromLatin1("mk"))
+        else if (elemText == TQString::tqfromLatin1("mk"))
             d->language = mk;
-        else if (elemText == TQString::fromLatin1("no"))
+        else if (elemText == TQString::tqfromLatin1("no"))
             d->language = no;
-        else if (elemText == TQString::fromLatin1("pl"))
+        else if (elemText == TQString::tqfromLatin1("pl"))
             d->language = pl;
-        else if (elemText == TQString::fromLatin1("pt"))
+        else if (elemText == TQString::tqfromLatin1("pt"))
             d->language = pt;
-        else if (elemText == TQString::fromLatin1("pt-br"))
+        else if (elemText == TQString::tqfromLatin1("pt-br"))
             d->language = pt_br;
-        else if (elemText == TQString::fromLatin1("pt-pt"))
+        else if (elemText == TQString::tqfromLatin1("pt-pt"))
             d->language = pt_pt;
-        else if (elemText == TQString::fromLatin1("ro"))
+        else if (elemText == TQString::tqfromLatin1("ro"))
             d->language = ro;
-        else if (elemText == TQString::fromLatin1("ro-mo"))
+        else if (elemText == TQString::tqfromLatin1("ro-mo"))
             d->language = ro_mo;
-        else if (elemText == TQString::fromLatin1("ro-ro"))
+        else if (elemText == TQString::tqfromLatin1("ro-ro"))
             d->language = ro_ro;
-        else if (elemText == TQString::fromLatin1("ru"))
+        else if (elemText == TQString::tqfromLatin1("ru"))
             d->language = ru;
-        else if (elemText == TQString::fromLatin1("ru-mo"))
+        else if (elemText == TQString::tqfromLatin1("ru-mo"))
             d->language = ru_mo;
-        else if (elemText == TQString::fromLatin1("ru-ru"))
+        else if (elemText == TQString::tqfromLatin1("ru-ru"))
             d->language = ru_ru;
-        else if (elemText == TQString::fromLatin1("sr"))
+        else if (elemText == TQString::tqfromLatin1("sr"))
             d->language = sr;
-        else if (elemText == TQString::fromLatin1("sk"))
+        else if (elemText == TQString::tqfromLatin1("sk"))
             d->language = sk;
-        else if (elemText == TQString::fromLatin1("sl"))
+        else if (elemText == TQString::tqfromLatin1("sl"))
             d->language = sl;
-        else if (elemText == TQString::fromLatin1("es"))
+        else if (elemText == TQString::tqfromLatin1("es"))
             d->language = es;
-        else if (elemText == TQString::fromLatin1("es-ar"))
+        else if (elemText == TQString::tqfromLatin1("es-ar"))
             d->language = es_ar;
-        else if (elemText == TQString::fromLatin1("es-bo"))
+        else if (elemText == TQString::tqfromLatin1("es-bo"))
             d->language = es_bo;
-        else if (elemText == TQString::fromLatin1("es-cl"))
+        else if (elemText == TQString::tqfromLatin1("es-cl"))
             d->language = es_cl;
-        else if (elemText == TQString::fromLatin1("es-co"))
+        else if (elemText == TQString::tqfromLatin1("es-co"))
             d->language = es_co;
-        else if (elemText == TQString::fromLatin1("es-cr"))
+        else if (elemText == TQString::tqfromLatin1("es-cr"))
             d->language = es_cr;
-        else if (elemText == TQString::fromLatin1("es-do"))
+        else if (elemText == TQString::tqfromLatin1("es-do"))
             d->language = es_do;
-        else if (elemText == TQString::fromLatin1("es-ec"))
+        else if (elemText == TQString::tqfromLatin1("es-ec"))
             d->language = es_ec;
-        else if (elemText == TQString::fromLatin1("es-sv"))
+        else if (elemText == TQString::tqfromLatin1("es-sv"))
             d->language = es_sv;
-        else if (elemText == TQString::fromLatin1("es-gt"))
+        else if (elemText == TQString::tqfromLatin1("es-gt"))
             d->language = es_gt;
-        else if (elemText == TQString::fromLatin1("es-hn"))
+        else if (elemText == TQString::tqfromLatin1("es-hn"))
             d->language = es_hn;
-        else if (elemText == TQString::fromLatin1("es-mx"))
+        else if (elemText == TQString::tqfromLatin1("es-mx"))
             d->language = es_mx;
-        else if (elemText == TQString::fromLatin1("es-ni"))
+        else if (elemText == TQString::tqfromLatin1("es-ni"))
             d->language = es_ni;
-        else if (elemText == TQString::fromLatin1("es-pa"))
+        else if (elemText == TQString::tqfromLatin1("es-pa"))
             d->language = es_pa;
-        else if (elemText == TQString::fromLatin1("es-py"))
+        else if (elemText == TQString::tqfromLatin1("es-py"))
             d->language = es_py;
-        else if (elemText == TQString::fromLatin1("es-pe"))
+        else if (elemText == TQString::tqfromLatin1("es-pe"))
             d->language = es_pe;
-        else if (elemText == TQString::fromLatin1("es-pr"))
+        else if (elemText == TQString::tqfromLatin1("es-pr"))
             d->language = es_pr;
-        else if (elemText == TQString::fromLatin1("es-es"))
+        else if (elemText == TQString::tqfromLatin1("es-es"))
             d->language = es_es;
-        else if (elemText == TQString::fromLatin1("es-uy"))
+        else if (elemText == TQString::tqfromLatin1("es-uy"))
             d->language = es_uy;
-        else if (elemText == TQString::fromLatin1("es-ve"))
+        else if (elemText == TQString::tqfromLatin1("es-ve"))
             d->language = es_ve;
-        else if (elemText == TQString::fromLatin1("sv"))
+        else if (elemText == TQString::tqfromLatin1("sv"))
             d->language = sv;
-        else if (elemText == TQString::fromLatin1("sv-fi"))
+        else if (elemText == TQString::tqfromLatin1("sv-fi"))
             d->language = sv_fi;
-        else if (elemText == TQString::fromLatin1("sv-se"))
+        else if (elemText == TQString::tqfromLatin1("sv-se"))
             d->language = sv_se;
-        else if (elemText == TQString::fromLatin1("tr"))
+        else if (elemText == TQString::tqfromLatin1("tr"))
             d->language = tr;
-        else if (elemText == TQString::fromLatin1("uk"))
+        else if (elemText == TQString::tqfromLatin1("uk"))
             d->language = uk;
         else
             d->language = UndefinedLanguage;
     }
 
     if (d->format == AtomFeed)
-        tagName=TQString::fromLatin1("issued"); // atom doesn't specify this for feeds
+        tagName=TQString::tqfromLatin1("issued"); // atom doesn't specify this for feeds
                                                // but some broken feeds do this
     else
-        tagName=TQString::fromLatin1("pubDate");
+        tagName=TQString::tqfromLatin1("pubDate");
 
     if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
         time_t _time;
@@ -441,7 +441,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
         d->pubDate.setTime_t(_time);
     }
 
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) {
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("dc:date"))).isNull()) {
         time_t _time = parseISO8601Date(elemText);
         /* \bug This isn't really the right way since it will set the date to
          * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that
@@ -451,9 +451,9 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     }
 
     if (d->format == AtomFeed)
-        tagName=TQString::fromLatin1("modified");
+        tagName=TQString::tqfromLatin1("modified");
     else
-        tagName=TQString::fromLatin1("lastBuildDate");
+        tagName=TQString::tqfromLatin1("lastBuildDate");
     if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
         time_t _time;
         if (d->format == AtomFeed)
@@ -463,44 +463,44 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
         d->lastBuildDate.setTime_t(_time);
     }
 
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("rating"))).isNull())
         d->rating = elemText;
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull())
         d->docs = elemText;
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
         d->managingEditor = elemText;
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull())
         d->webMaster = elemText;
 
-	if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull())
+	if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("ttl"))).isNull())
         d->ttl = elemText.toUInt();
 
-    n = channelNode.namedItem(TQString::fromLatin1("skipHours"));
+    n = channelNode.namedItem(TQString::tqfromLatin1("skipHours"));
     if (!n.isNull())
         for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
-            if (e.tagName() == TQString::fromLatin1("hour"))
+            if (e.tagName() == TQString::tqfromLatin1("hour"))
                 d->skipHours.append(e.text().toUInt());
 
-    n = channelNode.namedItem(TQString::fromLatin1("skipDays"));
+    n = channelNode.namedItem(TQString::tqfromLatin1("skipDays"));
     if (!n.isNull()) {
         Day day;
         TQString elemText;
         for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
-            if (e.tagName() == TQString::fromLatin1("day")) {
+            if (e.tagName() == TQString::tqfromLatin1("day")) {
                 elemText = e.text().lower();
-                if (elemText == TQString::fromLatin1("monday"))
+                if (elemText == TQString::tqfromLatin1("monday"))
                     day = Monday;
-                else if (elemText == TQString::fromLatin1("tuesday"))
+                else if (elemText == TQString::tqfromLatin1("tuesday"))
                     day = Tuesday;
-                else if (elemText == TQString::fromLatin1("wednesday"))
+                else if (elemText == TQString::tqfromLatin1("wednesday"))
                     day = Wednesday;
-                else if (elemText == TQString::fromLatin1("thursday"))
+                else if (elemText == TQString::tqfromLatin1("thursday"))
                     day = Thursday;
-                else if (elemText == TQString::fromLatin1("friday"))
+                else if (elemText == TQString::tqfromLatin1("friday"))
                     day = Friday;
-                else if (elemText == TQString::fromLatin1("saturday"))
+                else if (elemText == TQString::tqfromLatin1("saturday"))
                     day = Saturday;
-                else if (elemText == TQString::fromLatin1("sunday"))
+                else if (elemText == TQString::tqfromLatin1("sunday"))
                     day = Sunday;
                 else
                     day = UndefinedDay;
@@ -529,17 +529,17 @@ Version Document::version() const
 TQString Document::verbVersion() const
 {
     switch (d->version) {
-        case v0_90: return TQString::fromLatin1("0.90");
-        case v0_91: return TQString::fromLatin1("0.91");
-        case v0_92: return TQString::fromLatin1("0.92");
-        case v0_93: return TQString::fromLatin1("0.93");
-        case v0_94: return TQString::fromLatin1("0.94");
-        case v1_0: return TQString::fromLatin1("1.0");
-        case v2_0: return TQString::fromLatin1("2.0");
-        case vAtom_0_3: return TQString::fromLatin1("0.3");
-        case vAtom_0_2: return TQString::fromLatin1("0.2");
-        case vAtom_0_1: return TQString::fromLatin1("0.1");
-        case vAtom_1_0: return TQString::fromLatin1("1.0");
+        case v0_90: return TQString::tqfromLatin1("0.90");
+        case v0_91: return TQString::tqfromLatin1("0.91");
+        case v0_92: return TQString::tqfromLatin1("0.92");
+        case v0_93: return TQString::tqfromLatin1("0.93");
+        case v0_94: return TQString::tqfromLatin1("0.94");
+        case v1_0: return TQString::tqfromLatin1("1.0");
+        case v2_0: return TQString::tqfromLatin1("2.0");
+        case vAtom_0_3: return TQString::tqfromLatin1("0.3");
+        case vAtom_0_2: return TQString::tqfromLatin1("0.2");
+        case vAtom_0_1: return TQString::tqfromLatin1("0.1");
+        case vAtom_1_0: return TQString::tqfromLatin1("1.0");
     }
     return TQString::null;
 }
diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp
index 602a2558..864c19fc 100644
--- a/akregator/src/librss/enclosure.cpp
+++ b/akregator/src/librss/enclosure.cpp
@@ -57,30 +57,30 @@ Enclosure Enclosure::fromXML(const TQDomElement& e)
     TQString url, type;
     int length = -1;
 
-    if (e.hasAttribute(TQString::fromLatin1("url")))
-        url = e.attribute(TQString::fromLatin1("url"));
+    if (e.hasAttribute(TQString::tqfromLatin1("url")))
+        url = e.attribute(TQString::tqfromLatin1("url"));
     
-    if (e.hasAttribute(TQString::fromLatin1("length")))
+    if (e.hasAttribute(TQString::tqfromLatin1("length")))
     {
         bool ok;
-        int c = e.attribute(TQString::fromLatin1("length")).toInt(&ok);
+        int c = e.attribute(TQString::tqfromLatin1("length")).toInt(&ok);
         length = ok ? c : -1;
     }
-    if (e.hasAttribute(TQString::fromLatin1("type")))
-        type = e.attribute(TQString::fromLatin1("type"));
+    if (e.hasAttribute(TQString::tqfromLatin1("type")))
+        type = e.attribute(TQString::tqfromLatin1("type"));
 
     return Enclosure(url, length, type);
 }
 
 TQDomElement Enclosure::toXML(TQDomDocument document) const
 {
-    TQDomElement e = document.createElement(TQString::fromLatin1("enclosure"));
+    TQDomElement e = document.createElement(TQString::tqfromLatin1("enclosure"));
     if (!d->url.isNull())
-        e.setAttribute(TQString::fromLatin1("url"), d->url);
+        e.setAttribute(TQString::tqfromLatin1("url"), d->url);
     if (d->length != -1)
-        e.setAttribute(TQString::fromLatin1("length"), TQString::number(d->length));
+        e.setAttribute(TQString::tqfromLatin1("length"), TQString::number(d->length));
     if (!d->type.isNull())
-        e.setAttribute(TQString::fromLatin1("type"), d->type);
+        e.setAttribute(TQString::tqfromLatin1("type"), d->type);
 
     return e;
 }
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index cb8d7c86..98074be3 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/image.cpp
@@ -48,17 +48,17 @@ Image::Image(const TQDomNode &node) : TQObject(), d(new Private)
 {
 	TQString elemText;
 
-	if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
 		d->title = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull())
 		d->url = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
 		d->link = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
 		d->description = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull())
 		d->height = elemText.toUInt();
-	if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull())
 		d->width = elemText.toUInt();
 }
 
diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp
index 04799fca..a12442fa 100644
--- a/akregator/src/librss/textinput.cpp
+++ b/akregator/src/librss/textinput.cpp
@@ -38,13 +38,13 @@ TextInput::TextInput(const TQDomNode &node) : d(new Private)
 {
 	TQString elemText;
 
-	if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
 		d->title = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
 		d->description = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("name"))))
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("name"))))
 		d->name = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
 		d->link = elemText;
 }
 
diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp
index 41996fd8..e12bea88 100644
--- a/akregator/src/librss/tools_p.cpp
+++ b/akregator/src/librss/tools_p.cpp
@@ -43,11 +43,11 @@ TQString childNodesAsXML(const TQDomNode& parent)
 static TQString plainTextToHtml(const TQString& plainText)
 {
     TQString str(plainText);
-    str.replace("&", "&amp;");
-    str.replace("\"", "&quot;");
-    str.replace("<", "&lt;");
-    //str.replace(">", "&gt;");
-    str.replace("\n", "<br/>");
+    str.tqreplace("&", "&amp;");
+    str.tqreplace("\"", "&quot;");
+    str.tqreplace("<", "&lt;");
+    //str.tqreplace(">", "&gt;");
+    str.tqreplace("\n", "<br/>");
     return str;
 }
 
@@ -84,7 +84,7 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
     xmltypes.append(TQString::fromUtf8("application/xml-dtd"));
     
     
-    if (xmltypes.contains(type)
+    if (xmltypes.tqcontains(type)
         || type.endsWith(TQString::fromUtf8("+xml"), false)
         || type.endsWith(TQString::fromUtf8("/xml"), false))
         return XML;
@@ -102,7 +102,7 @@ static TQString extractAtomContent(const TQDomElement& e)
     {
         case HTML:
         {
-            const bool hasPre = e.text().contains( "<pre>", false ) || e.text().contains( "<pre ", false );
+            const bool hasPre = e.text().tqcontains( "<pre>", false ) || e.text().tqcontains( "<pre ", false );
             return KCharsets::resolveEntities( hasPre ? e.text() : e.text().simplifyWhiteSpace() );
         }
         case Text:
@@ -132,10 +132,10 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI
         }        
         else // check for HTML; not necessary for Atom:content
         {
-            bool hasPre = result.contains("<pre>", false) || result.contains("<pre ", false);
-            bool hasHtml = hasPre || result.contains("<");	// FIXME: test if we have html, should be more clever -> regexp
+            bool hasPre = result.tqcontains("<pre>", false) || result.tqcontains("<pre ", false);
+            bool hasHtml = hasPre || result.tqcontains("<");	// FIXME: test if we have html, should be more clever -> regexp
             if(!isInlined && !hasHtml)						// perform nl2br if not a inline elt and it has no html elts
-                    result = result = result.replace(TQChar('\n'), "<br />");
+                    result = result = result.tqreplace(TQChar('\n'), "<br />");
             if(!hasPre)										// strip white spaces if no <pre>
                     result = result.simplifyWhiteSpace();
         }
@@ -145,13 +145,13 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI
 
 TQString extractTitle(const TQDomNode & parent)
 {
-    TQDomNode node = parent.namedItem(TQString::fromLatin1("title"));
+    TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title"));
     if (node.isNull())
         return TQString::null;
 
     TQString result = node.toElement().text();
 
-    result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).replace(TQRegExp("<[^>]*>"), "").remove("\\"));
+    result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).tqreplace(TQRegExp("<[^>]*>"), "").remove("\\"));
 	result = result.simplifyWhiteSpace();
 
     if (result.isEmpty())
@@ -177,7 +177,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema
     {
         TQString all = remail.cap(0);
         email = remail.cap(1);
-        str.replace(all, ""); // remove mail address
+        str.tqreplace(all, ""); // remove mail address
     }
     
     // simplify the rest and use it as name
diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp
index 5434a4a6..608d36a0 100644
--- a/akregator/src/listtabwidget.cpp
+++ b/akregator/src/listtabwidget.cpp
@@ -52,7 +52,7 @@ public:
     int currentID;
     TQValueList<NodeListView*> views;
     TQMap<int, NodeListView*> idToView;
-    TQHBoxLayout* layout;
+    TQHBoxLayout* tqlayout;
     ViewMode viewMode;
     TQMap<TQWidget*, TQString> captions;
 };
@@ -158,17 +158,17 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare
     d->current = 0;
     d->currentID = -1;
     d->viewMode = verticalTabs;
-    d->layout = new TQHBoxLayout(this);
-    //d->layout = new TQGridLayout(this, 1, 2);
+    d->tqlayout = new TQHBoxLayout(this);
+    //d->tqlayout = new TQGridLayout(this, 1, 2);
     d->tabBar = new KMultiTabBar(KMultiTabBar::Vertical, this); 
     d->tabBar->setStyle(KMultiTabBar::KDEV3ICON);
     //d->tabBar->setStyle(KMultiTabBar::KDEV3);
     d->tabBar->showActiveTabTexts(true);
     d->tabBar->setPosition(KMultiTabBar::Left);
-    d->layout->addWidget(d->tabBar/*, 0, 0*/);
+    d->tqlayout->addWidget(d->tabBar/*, 0, 0*/);
 
     d->stack = new TQWidgetStack(this);
-    d->layout->addWidget(d->stack/*, 0, 1*/);
+    d->tqlayout->addWidget(d->stack/*, 0, 1*/);
     
 //    connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*)));
 }
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 8271994f..255309ff 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -85,7 +85,7 @@ MainWindow::MainWindow()
     int statH=fontMetrics().height()+2;
     m_statusLabel = new KSqueezedTextLabel(this);
     m_statusLabel->setTextFormat(Qt::RichText);
-    m_statusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+    m_statusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
     m_statusLabel->setMinimumWidth( 0 );
     m_statusLabel->setFixedHeight( statH );
     statusBar()->addWidget (m_statusLabel, 1, false);
@@ -277,7 +277,7 @@ void MainWindow::slotClearStatusText()
     m_statusLabel->setText(TQString());
 }
 
-void MainWindow::slotSetStatusBarText( const TQString & text )
+void MainWindow::slotSeStatusBarText( const TQString & text )
 {
     m_statusLabel->setText(text);
 }
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index 3c52cdc5..84306282 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -93,7 +93,7 @@ public:
     
 public slots:
     void slotClearStatusText();
-    void slotSetStatusBarText(const TQString &c);
+    void slotSeStatusBarText(const TQString &c);
 
 protected:
     /**
diff --git a/akregator/src/mk4storage/Makefile.am b/akregator/src/mk4storage/Makefile.am
index 4f2ebfae..badfa183 100644
--- a/akregator/src/mk4storage/Makefile.am
+++ b/akregator/src/mk4storage/Makefile.am
@@ -12,7 +12,9 @@ libakregator_mk4storage_plugin_la_LIBADD = \
     $(top_builddir)/akregator/src/librss/librsslocal.la \
     ../libakregatorprivate.la \
     $(LIB_KFILE) \
-    $(LIB_KDECORE)
+    $(LIB_KDECORE) \
+    $(LIB_QT) \
+    $(LIB_KDEUI)
 
 libakregator_mk4storage_plugin_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index b03f0438..a535197f 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -147,8 +147,8 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main
     kdDebug() << url2 << endl;
     TQString t = url2;
     TQString t2 = url2;
-    TQString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_");
-    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml";
+    TQString filePath = main->archivePath() +"/"+ t.tqreplace("/", "_").tqreplace(":", "_");
+    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.tqreplace("/", "_").tqreplace(":", "_") + ".xml";
 
     d->convert = !TQFile::exists(filePath + ".mk4") && TQFile::exists(d->oldArchivePath);
     d->storage = new c4_Storage((filePath + ".mk4").local8Bit(), true);
@@ -297,7 +297,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
 {
     c4_Row row;
     d->pguid(row) = guid.ascii();
-    if (!contains(guid))
+    if (!tqcontains(guid))
     {
         d->archiveView.Add(row);
         markDirty();
@@ -305,7 +305,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
     }
 }
 
-bool FeedStorageMK4Impl::contains(const TQString& guid)
+bool FeedStorageMK4Impl::tqcontains(const TQString& guid)
 {
     return findArticle(guid) != -1;
 }
@@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid)
     return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0;
 }
 
-void FeedStorageMK4Impl::setStatus(const TQString& guid, int status)
+void FeedStorageMK4Impl::seStatus(const TQString& guid, int status)
 {
     int findidx = findArticle(guid);
     if (findidx == -1)
@@ -789,7 +789,7 @@ void FeedStorageMK4Impl::add(FeedStorage* source)
 
 void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
 {
-    if (!contains(guid))
+    if (!tqcontains(guid))
         addEntry(guid);
     setComments(guid, source->comments(guid));
     setCommentsLink(guid, source->commentsLink(guid));
@@ -799,7 +799,7 @@ void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
     setHash(guid, source->hash(guid));
     setLink(guid, source->link(guid));
     setPubDate(guid, source->pubDate(guid));
-    setStatus(guid, source->status(guid));
+    seStatus(guid, source->status(guid));
     setTitle(guid, source->title(guid));
     setAuthor(guid, source->author(guid));
 
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h
index b6fea2e8..df60b29c 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.h
+++ b/akregator/src/mk4storage/feedstoragemk4impl.h
@@ -50,7 +50,7 @@ class FeedStorageMK4Impl : public FeedStorage
 
         virtual TQStringList articles(const Category& cat);
 
-        virtual bool contains(const TQString& guid);
+        virtual bool tqcontains(const TQString& guid);
         virtual void addEntry(const TQString& guid);
         virtual void deleteArticle(const TQString& guid);
         virtual int comments(const TQString& guid);
@@ -69,7 +69,7 @@ class FeedStorageMK4Impl : public FeedStorage
         virtual uint pubDate(const TQString& guid);
         virtual void setPubDate(const TQString& guid, uint pubdate);
         virtual int status(const TQString& guid);
-        virtual void setStatus(const TQString& guid, int status);
+        virtual void seStatus(const TQString& guid, int status);
         virtual TQString title(const TQString& guid);
         virtual void setTitle(const TQString& guid, const TQString& title);
         virtual TQString description(const TQString& guid);
diff --git a/akregator/src/mk4storage/metakit/include/mk4str.h b/akregator/src/mk4storage/metakit/include/mk4str.h
index 7124a29e..88b7a39d 100644
--- a/akregator/src/mk4storage/metakit/include/mk4str.h
+++ b/akregator/src/mk4storage/metakit/include/mk4str.h
@@ -96,7 +96,7 @@ d4_inline bool operator== (const char* s1, const c4_String& s2);
 d4_inline bool operator!= (const c4_String& s1, const char* s2);
 d4_inline bool operator!= (const char* s1, const c4_String& s2);
 
-#else                           // Universal replacement classes
+#else                           // Universal tqreplacement classes
 
     /// An efficient string class, modeled after the MFC version
 class c4_String
diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp
index 2d191c64..0873ac83 100644
--- a/akregator/src/mk4storage/metakit/src/column.cpp
+++ b/akregator/src/mk4storage/metakit/src/column.cpp
@@ -770,7 +770,7 @@ void c4_Column::StoreBytes(t4_i32 pos_, const c4_Bytes& buffer_)
       
 t4_i32 c4_Column::PullValue(const t4_byte*& ptr_)
 {
-  t4_i32 mask = *ptr_ ? 0 : ~0;
+  t4_i32 tqmask = *ptr_ ? 0 : ~0;
 
   t4_i32 v = 0;
   for (;;) {
@@ -779,7 +779,7 @@ t4_i32 c4_Column::PullValue(const t4_byte*& ptr_)
       break;      
   }
   
-  return mask ^ (v - 0x80);   // oops, last byte had bit 7 set
+  return tqmask ^ (v - 0x80);   // oops, last byte had bit 7 set
 }
 
 void c4_Column::PushValue(t4_byte*& ptr_, t4_i32 v_)
@@ -1398,30 +1398,30 @@ void c4_ColOfInts::ResizeData(int index_, int count_, bool clear_)
 
     /*  _currwidth    1:  2:  4:
      *    shiftPos     3   2   1    shift the offset right this much
-     *    maskPos      7   3   1    mask the offset with this
+     *    tqmaskPos      7   3   1    tqmask the offset with this
      */
 
   const int shiftPos = _currWidth == 4 ? 1 : 4 - _currWidth;
-  const int maskPos = (1 << shiftPos) - 1;
+  const int tqmaskPos = (1 << shiftPos) - 1;
 
   // the following code is similar to c4_Column::Resize, but at bit level
 
     // turn insertion into deletion by inserting entire bytes
   if (count_ > 0) {
     unsigned off = (unsigned) index_ >> shiftPos;
-    int gapBytes = (count_ + maskPos) >> shiftPos;
+    int gapBytes = (count_ + tqmaskPos) >> shiftPos;
 
     InsertData(off, gapBytes, clear_);
 
       // oops, we might have inserted too low by a few entries
-    const int bits = (index_ & maskPos) * _currWidth;
+    const int bits = (index_ & tqmaskPos) * _currWidth;
     if (bits) {
-      const int maskLow = (1 << bits) - 1;
+      const int tqmaskLow = (1 << bits) - 1;
 
         // move the first few bits to start of inserted range
       t4_byte* p = CopyNow(off + gapBytes);
-      t4_byte one = *p & maskLow;
-      *p &= ~maskLow;
+      t4_byte one = *p & tqmaskLow;
+      *p &= ~tqmaskLow;
 
       * CopyNow(off) = one;
     }
diff --git a/akregator/src/mk4storage/metakit/src/column.h b/akregator/src/mk4storage/metakit/src/column.h
index 3f6e4f15..96d1622e 100644
--- a/akregator/src/mk4storage/metakit/src/column.h
+++ b/akregator/src/mk4storage/metakit/src/column.h
@@ -169,7 +169,7 @@ private:
   tSetter _setter;
 
   union {
-  t4_byte _item[8]; // holds temp result (careful with alignment!)
+  t4_byte _item[8]; // holds temp result (careful with tqalignment!)
   double _aligner;  // needed for SPARC
   };
 
diff --git a/akregator/src/mk4storage/metakit/src/field.h b/akregator/src/mk4storage/metakit/src/field.h
index 5dfc2573..8bf3dc8c 100644
--- a/akregator/src/mk4storage/metakit/src/field.h
+++ b/akregator/src/mk4storage/metakit/src/field.h
@@ -34,7 +34,7 @@ public:
   c4_Field& SubField(int) const;
     //: Returns the description of each subfield.
   bool IsRepeating() const;
-    //: Returns true if this field contains subtables.
+    //: Returns true if this field tqcontains subtables.
   
 /* Field name and description */
   const c4_String& Name() const;
diff --git a/akregator/src/mk4storage/metakit/src/format.cpp b/akregator/src/mk4storage/metakit/src/format.cpp
index aa23e739..49c45bce 100644
--- a/akregator/src/mk4storage/metakit/src/format.cpp
+++ b/akregator/src/mk4storage/metakit/src/format.cpp
@@ -1036,7 +1036,7 @@ void c4_FormatV::SetupAllSubviews()
 void c4_FormatV::Define(int rows_, const t4_byte** ptr_)
 {
   if (_inited) {
-    // big oops: a root handler already contains data
+    // big oops: a root handler already tqcontains data
     
     for (int i = 0; i < _subSeqs.GetSize(); ++i)
       ForgetSubview(i);
diff --git a/akregator/src/mk4storage/metakit/src/handler.h b/akregator/src/mk4storage/metakit/src/handler.h
index 6003f625..353d0517 100644
--- a/akregator/src/mk4storage/metakit/src/handler.h
+++ b/akregator/src/mk4storage/metakit/src/handler.h
@@ -52,7 +52,7 @@ public:
   virtual int ItemSize(int index_) = 0;
     //: Return width of specified data item.
   void GetBytes(int index_, c4_Bytes& buf_, bool copySmall_ =false);
-    //: Used for backward compatibility, should probably be replaced.
+    //: Used for backward compatibility, should probably be tqreplaced.
   virtual const void* Get(int index_, int& length_) = 0;
     //: Retrieves the data item at the specified index.
   virtual void Set(int index_, const c4_Bytes& buf_) = 0;
diff --git a/akregator/src/mk4storage/metakit/src/persist.cpp b/akregator/src/mk4storage/metakit/src/persist.cpp
index 65a9e94e..743f4757 100644
--- a/akregator/src/mk4storage/metakit/src/persist.cpp
+++ b/akregator/src/mk4storage/metakit/src/persist.cpp
@@ -144,7 +144,7 @@ private:
 //      other hand, the allocator does not know the size of used slots.
 //    * Alternate function allows marking a specific range as occupied.
 //    * Allocator can be initialized as either all free or all in-use.
-//    * Allocation info contains only integers, it could be stored.
+//    * Allocation info tqcontains only integers, it could be stored.
 //    * To extend allocated slots: "occupy" extra bytes at the end.
 //    * Generic: can be used for memory, disk files, and array entries.
 
@@ -767,7 +767,7 @@ void c4_SaveContext::SaveIt(c4_HandlerSeq& root_, c4_Allocator** spacePtr_,
 
   * write new skip + commit "tails" at limit (no visible effect on file)
   * overwrite commit tail at end  with a skip to this new one (equivalent)
-  * replace header with one pointing to that internal new one (equivalent)
+  * tqreplace header with one pointing to that internal new one (equivalent)
   * flush (now the file is valid both truncated and not-yet-truncated
 
       end = limit;
diff --git a/akregator/src/mk4storage/metakit/src/remap.cpp b/akregator/src/mk4storage/metakit/src/remap.cpp
index cc8175df..243eca04 100644
--- a/akregator/src/mk4storage/metakit/src/remap.cpp
+++ b/akregator/src/mk4storage/metakit/src/remap.cpp
@@ -79,7 +79,7 @@ public:
 };
 
 /////////////////////////////////////////////////////////////////////////////
-// The following contains code derived froms Python's dictionaries, hence:
+// The following tqcontains code derived froms Python's dictionaries, hence:
 //  Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
 //  The Netherlands.
 // Reduced and turned into a fast C++ class by Christian Tismer, hence:
@@ -258,10 +258,10 @@ t4_i32 c4_HashViewer::CalcHash(c4_Cursor cursor_) const
 
 int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
 {
-  const unsigned int mask = _map.GetSize() - 2;
+  const unsigned int tqmask = _map.GetSize() - 2;
   /* We must come up with (i, incr) such that 0 <= i < _size
      and 0 < incr < _size and both are a function of hash */
-  int i = mask & ~hash_;
+  int i = tqmask & ~hash_;
   /* We use ~hash_ instead of hash_, as degenerate hash functions, such
      as for ints <sigh>, can have lots of leading zeros. It's not
      really a performance risk, but better safe than sorry. */
@@ -272,14 +272,14 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
 
   /* Derive incr from hash_, just to make it more arbitrary. Note that
      incr must not be 0, or we will get into an infinite loop.*/
-  unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & mask;
+  unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & tqmask;
   if (!incr)
-    incr = mask;
+    incr = tqmask;
 
   int poly = GetPoly();
   for (;;)
   {
-    i = (i+incr) & mask;
+    i = (i+incr) & tqmask;
     if (IsUnused(i))
       break;
     if (Hash(i) == hash_ && KeySame(Row(i), cursor_))
@@ -288,7 +288,7 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
       freeslot = i;
       /* Cycle through GF(2^n)-{0} */
     incr = incr << 1;
-    if (incr > mask)
+    if (incr > tqmask)
       incr ^= poly; /* This will implicitely clear the highest bit */
   }
 
@@ -434,7 +434,7 @@ bool c4_HashViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
   int i = Lookup(value_, n);
   if (i >= 0 && n > 0)
   {
-    _base.SetAt(i, *value_); // replace existing
+    _base.SetAt(i, *value_); // tqreplace existing
     return true;
   }
 
@@ -944,7 +944,7 @@ bool c4_OrderedViewer::InsertRows(int, c4_Cursor value_, int count_)
   else
   {
     d4_assert(i < _base.GetSize());
-    _base.SetAt(i, *value_); // replace existing
+    _base.SetAt(i, *value_); // tqreplace existing
   }
 
   return true;
@@ -1099,7 +1099,7 @@ bool c4_IndexedViewer::InsertRows(int, c4_Cursor value_, int count_)
   else
   {
     d4_assert(i < _base.GetSize());
-    _base.SetAt(i, *value_); // replace existing
+    _base.SetAt(i, *value_); // tqreplace existing
   }
 
   return true;
diff --git a/akregator/src/mk4storage/metakit/src/store.cpp b/akregator/src/mk4storage/metakit/src/store.cpp
index a32de665..f43bc0e3 100644
--- a/akregator/src/mk4storage/metakit/src/store.cpp
+++ b/akregator/src/mk4storage/metakit/src/store.cpp
@@ -161,7 +161,7 @@ void c4_Notifier::Notify()
  *  Manager for persistent storage of view structures.
  *
  *  The storage class uses a view, with additional functionality to be able 
- *  to store and reload the data it contains (including nested subviews).
+ *  to store and reload the data it tqcontains (including nested subviews).
  *
  *  By default, data is loaded on demand, i.e. whenever data which has
  *  not yet been referenced is used for the first time.  Loading is limited
@@ -366,7 +366,7 @@ bool c4_Storage::SetAside(c4_Storage& aside_)
 {
   c4_Persist* pers = Persist();
   bool f = pers->SetAside(aside_);
-  // adjust our copy when the root view has been replaced
+  // adjust our copy when the root view has been tqreplaced
   *(c4_View*) this = &pers->Root();
   return f;
 }
@@ -391,7 +391,7 @@ bool c4_Storage::Rollback(bool full_)
 {
   c4_Persist* pers = Persist();
   bool f = Strategy().IsValid() && pers->Rollback(full_);
-  // adjust our copy when the root view has been replaced
+  // adjust our copy when the root view has been tqreplaced
   *(c4_View*) this = &pers->Root();
   return f;
 }
diff --git a/akregator/src/mk4storage/metakit/src/view.cpp b/akregator/src/mk4storage/metakit/src/view.cpp
index af2fc9fa..11e384ee 100644
--- a/akregator/src/mk4storage/metakit/src/view.cpp
+++ b/akregator/src/mk4storage/metakit/src/view.cpp
@@ -44,7 +44,7 @@ public:
  *  On Win32, use a critical section to protect the global symbol table.
  *  Also uses special thread-safe calls to inc/dec all reference counts.
  *
- *  This implementation replaces the previous use of TLS, which cannot
+ *  This implementation tqreplaces the previous use of TLS, which cannot
  *  be used without special tricks in dynamically loaded DLL's, as is
  *  required for OCX/ActiveX use (which uses LoadLibrary).
  *
diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp
index 0725f57f..4e210444 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.cpp
+++ b/akregator/src/mk4storage/metakit/tests/regress.cpp
@@ -100,7 +100,7 @@ main()
 }
 
 // Recursively display the entire view contents. The results shown do not
-// depend on file layout (free space, file positions, flat vs. on-demand).
+// depend on file tqlayout (free space, file positions, flat vs. on-demand).
 
 static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0)
 {
@@ -219,9 +219,9 @@ void FailExpr(const char* expr)
   Fail(buffer);
 }
 
-int StartTest(int mask_, const char* name_, const char* desc_)
+int StartTest(int tqmask_, const char* name_, const char* desc_)
 {
-  if (mask_)
+  if (tqmask_)
   {
     #if q4_MFC && defined(_DEBUG)
       TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_);
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index cc91559a..c8960237 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>MK4ConfWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -27,7 +27,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -46,7 +46,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -74,7 +74,7 @@
         </widget>
         <widget class="QLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -90,7 +90,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>140</width>
                             <height>20</height>
@@ -169,7 +169,7 @@
         <slot>&lt;No)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp
index 4fc9ecec..8fd93c55 100644
--- a/akregator/src/mk4storage/storagemk4impl.cpp
+++ b/akregator/src/mk4storage/storagemk4impl.cpp
@@ -276,7 +276,7 @@ void StorageMK4Impl::slotCommit()
 
 FeedStorage* StorageMK4Impl::archiveFor(const TQString& url)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
     {
         FeedStorage* fs = new FeedStorageMK4Impl(url, this);
         d->feeds[url] = fs;
diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h
index bf50efc6..37e31764 100644
--- a/akregator/src/mk4storage/storagemk4impl.h
+++ b/akregator/src/mk4storage/storagemk4impl.h
@@ -105,7 +105,7 @@ class StorageMK4Impl : public Storage
         virtual TQString restoreTagSet() const; 
   
         /** adds all feed storages from a source to this storage
-            existing articles are replaced
+            existing articles are tqreplaced
         */
         virtual void add(Storage* source);
         
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index 95242840..fd49c060 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -216,7 +216,7 @@ int NodeList::generateID()
 void NodeList::slotNodeAdded(TreeNode* node)
 {
     Folder* parent = node->parent();
-    if ( !node || !d->flatList.contains(parent) || d->flatList.contains(node) )
+    if ( !node || !d->flatList.tqcontains(parent) || d->flatList.tqcontains(node) )
         return;
 
     addNode(node, false);
@@ -224,7 +224,7 @@ void NodeList::slotNodeAdded(TreeNode* node)
 
 void NodeList::slotNodeDestroyed(TreeNode* node)
 {
-    if ( !node || !d->flatList.contains(node) )
+    if ( !node || !d->flatList.tqcontains(node) )
         return;
 
     removeNode(node);
@@ -232,7 +232,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node)
 
 void NodeList::slotNodeRemoved(Folder* /*parent*/, TreeNode* node)
 {
-    if ( !node || !d->flatList.contains(node) )
+    if ( !node || !d->flatList.tqcontains(node) )
         return;
 
     removeNode(node);
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 9f1e5591..90bf6008 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -356,7 +356,7 @@ void PageViewer::slotCancelled( const TQString & /*errMsg*/ )
 
 void PageViewer::urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args)
 {
-    if (url.startsWith(TQString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) )
+    if (url.startsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
     {
         KHTMLPart::urlSelected(url,button,state,_target,args);
     }
@@ -390,7 +390,7 @@ void PageViewer::slotPaletteOrFontChanged()
     if ( !obj ) // not all views have a browser extension !
         return;
     
-    int id = obj->metaObject()->findSlot("reparseConfiguration()");
+    int id = obj->tqmetaObject()->findSlot("reparseConfiguration()");
     if (id == -1)
         return;
     QUObject o[1];
diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp
index 6146ddd8..6535896b 100644
--- a/akregator/src/progressmanager.cpp
+++ b/akregator/src/progressmanager.cpp
@@ -102,7 +102,7 @@ void ProgressManager::slotNodeAdded(TreeNode* node)
     Feed* feed = dynamic_cast<Feed*>(node);
     if (feed)
     {
-        if (!d->handlers.contains(feed))
+        if (!d->handlers.tqcontains(feed))
         d->handlers[feed] = new ProgressItemHandler(feed);
         connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*)));
     }
@@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted()
 {
     if (d->progressItem)
     {
-        d->progressItem->setStatus(i18n("Fetch completed"));
+        d->progressItem->seStatus(i18n("Fetch completed"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
@@ -188,7 +188,7 @@ void ProgressItemHandler::slotFetchError()
 {
     if (d->progressItem)
     {
-        d->progressItem->setStatus(i18n("Fetch error"));
+        d->progressItem->seStatus(i18n("Fetch error"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
@@ -198,7 +198,7 @@ void ProgressItemHandler::slotFetchAborted()
 {
     if (d->progressItem)
     {
-        d->progressItem->setStatus(i18n("Fetch aborted"));
+        d->progressItem->seStatus(i18n("Fetch aborted"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui
index eb7d3962..3e94c7ed 100644
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>FeedPropertiesWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -39,7 +39,7 @@
                     </property>
                     <widget class="QLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout8</cstring>
+                            <cstring>tqlayout8</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -100,7 +100,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="2" column="0">
                         <property name="name">
-                            <cstring>layout9</cstring>
+                            <cstring>tqlayout9</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -116,7 +116,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>31</width>
                                         <height>20</height>
@@ -282,7 +282,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>99</width>
                                         <height>20</height>
@@ -299,7 +299,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>100</width>
                                         <height>20</height>
@@ -362,7 +362,7 @@
                     </property>
                     <widget class="QLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout4</cstring>
+                            <cstring>tqlayout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -396,7 +396,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>71</height>
@@ -456,7 +456,7 @@
     <slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot>
     <slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index eb5b7cff..f2dd33e7 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -65,7 +65,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name),
     d->delay = 400;
     setMargin(2);
     setSpacing(5);
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
     TQToolButton *clearButton = new TQToolButton(this);
     clearButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) );
 
@@ -144,7 +144,7 @@ void SearchBar::slotClearSearch()
     }
 }
 
-void SearchBar::slotSetStatus(int status)
+void SearchBar::slotSeStatus(int status)
 {
      d->searchCombo->setCurrentItem(status);
      slotSearchComboChanged(status);
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index 93227578..8227f83f 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -58,7 +58,7 @@ class SearchBar : public QHBox
 
     public slots:
         void slotClearSearch();
-        void slotSetStatus(int status);
+        void slotSeStatus(int status);
         void slotSetText(const TQString& text);
 
     private slots:
diff --git a/akregator/src/settings_advancedbase.ui b/akregator/src/settings_advancedbase.ui
index 0fc99295..3cb48868 100644
--- a/akregator/src/settings_advancedbase.ui
+++ b/akregator/src/settings_advancedbase.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>SettingsAdvanced</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -89,7 +89,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>174</width>
                             <height>20</height>
@@ -133,7 +133,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>260</height>
@@ -150,7 +150,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui
index 48985a87..2f40bcd5 100644
--- a/akregator/src/settings_appearance.ui
+++ b/akregator/src/settings_appearance.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>SettingsAppearance</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -197,7 +197,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -234,7 +234,7 @@
         <slot>setValue(int)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui
index 4fcfc4e5..86e0a303 100644
--- a/akregator/src/settings_archive.ui
+++ b/akregator/src/settings_archive.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>SettingsArchive</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -143,7 +143,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -168,7 +168,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui
index 52729a16..af9798e3 100644
--- a/akregator/src/settings_browser.ui
+++ b/akregator/src/settings_browser.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>SettingsBrowser</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -87,7 +87,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>31</width>
                     <height>16</height>
@@ -96,7 +96,7 @@
         </spacer>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -202,5 +202,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui
index dc0e559d..26ef9299 100644
--- a/akregator/src/settings_general.ui
+++ b/akregator/src/settings_general.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>SettingsGeneral</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -139,7 +139,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -183,5 +183,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index 5c3272a1..cd991a49 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -142,8 +142,8 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con
     
     connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
 
-    TQGridLayout* layout = new TQGridLayout(this, 1, 1);
-    layout->addWidget(d->view, 0, 0);
+    TQGridLayout* tqlayout = new TQGridLayout(this, 1, 1);
+    tqlayout->addWidget(d->view, 0, 0);
 
     d->visitor = new NodeVisitor(this);
 
@@ -185,7 +185,7 @@ void SimpleNodeSelector::slotItemSelected(TQListViewItem* item)
 
 void SimpleNodeSelector::slotNodeDestroyed(TreeNode* node)
 {
-    if (d->nodeToItem.contains(node))
+    if (d->nodeToItem.tqcontains(node))
     {
         TQListViewItem* item = d->nodeToItem[node];
         d->nodeToItem.remove(node);
diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp
index 4f98df2c..6263c11f 100644
--- a/akregator/src/speechclient.cpp
+++ b/akregator/src/speechclient.cpp
@@ -135,7 +135,7 @@ void SpeechClient::slotAbortJobs()
 ASYNC SpeechClient::textRemoved(const TQCString& /*appId*/, uint jobNum)
 {
     kdDebug() << "SpeechClient::textRemoved() called" << endl;
-    if (d->pendingJobs.contains(jobNum))
+    if (d->pendingJobs.tqcontains(jobNum))
     {
         d->pendingJobs.remove(jobNum);
         if (d->pendingJobs.isEmpty())
diff --git a/akregator/src/storage.h b/akregator/src/storage.h
index 8c02a9f7..2c6a9ceb 100644
--- a/akregator/src/storage.h
+++ b/akregator/src/storage.h
@@ -105,7 +105,7 @@ class AKREGATOR_EXPORT Storage : public QObject
         virtual TQStringList feeds() const = 0;
 
         /** adds all feed storages from a source to this storage
-            existing articles are replaced
+            existing articles are tqreplaced
         */
         virtual void add(Storage* source) = 0;
         
diff --git a/akregator/src/storagedummyimpl.cpp b/akregator/src/storagedummyimpl.cpp
index 25d3f320..43b8788d 100644
--- a/akregator/src/storagedummyimpl.cpp
+++ b/akregator/src/storagedummyimpl.cpp
@@ -100,12 +100,12 @@ bool StorageDummyImpl::rollback()
 
 int StorageDummyImpl::unreadFor(const TQString &url)
 {
-    return d->feeds.contains(url) ? d->feeds[url].unread : 0;
+    return d->feeds.tqcontains(url) ? d->feeds[url].unread : 0;
 }
 
 void StorageDummyImpl::setUnreadFor(const TQString &url, int unread)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
        d->addEntry(url, unread, unread, 0);
     else
        d->feeds[url].unread = unread;
@@ -113,12 +113,12 @@ void StorageDummyImpl::setUnreadFor(const TQString &url, int unread)
 
 int StorageDummyImpl::totalCountFor(const TQString &url)
 {
-    return d->feeds.contains(url) ? d->feeds[url].totalCount : 0;
+    return d->feeds.tqcontains(url) ? d->feeds[url].totalCount : 0;
 }
 
 void StorageDummyImpl::setTotalCountFor(const TQString &url, int total)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
        d->addEntry(url, 0, total, 0);
     else
        d->feeds[url].totalCount = total;
@@ -126,12 +126,12 @@ void StorageDummyImpl::setTotalCountFor(const TQString &url, int total)
 
 int StorageDummyImpl::lastFetchFor(const TQString& url)
 {
-    return d->feeds.contains(url) ? d->feeds[url].lastFetch : 0;
+    return d->feeds.tqcontains(url) ? d->feeds[url].lastFetch : 0;
 }
 
 void StorageDummyImpl::setLastFetchFor(const TQString& url, int lastFetch)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
        d->addEntry(url, 0, 0, lastFetch);
     else 
        d->feeds[url].lastFetch = lastFetch;
@@ -143,7 +143,7 @@ void StorageDummyImpl::slotCommit()
 
 FeedStorage* StorageDummyImpl::archiveFor(const TQString& url)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
         d->feeds[url].feedStorage = new FeedStorageDummyImpl(url, this);
 
     return d->feeds[url].feedStorage;
diff --git a/akregator/src/storagedummyimpl.h b/akregator/src/storagedummyimpl.h
index e5ef8cd8..35cbdda4 100644
--- a/akregator/src/storagedummyimpl.h
+++ b/akregator/src/storagedummyimpl.h
@@ -88,7 +88,7 @@ class StorageDummyImpl : public Storage
         virtual TQString restoreTagSet() const;
 
         /** adds all feed storages from a source to this storage
-            existing articles are replaced
+            existing articles are tqreplaced
         */
         virtual void add(Storage* source);
         
diff --git a/akregator/src/storagefactoryregistry.cpp b/akregator/src/storagefactoryregistry.cpp
index a175df9d..f6162ef9 100644
--- a/akregator/src/storagefactoryregistry.cpp
+++ b/akregator/src/storagefactoryregistry.cpp
@@ -52,7 +52,7 @@ StorageFactoryRegistry* StorageFactoryRegistry::self()
 	
 bool StorageFactoryRegistry::registerFactory(StorageFactory* factory, const TQString& typestr)
 {
-    if (containsFactory(typestr))
+    if (tqcontainsFactory(typestr))
         return false;
     d->map[typestr] = factory;
     return true; 
@@ -68,9 +68,9 @@ StorageFactory* StorageFactoryRegistry::getFactory(const TQString& typestr)
     return d->map[typestr];
 }
 
-bool StorageFactoryRegistry::containsFactory(const TQString& typestr) const
+bool StorageFactoryRegistry::tqcontainsFactory(const TQString& typestr) const
 {
-    return d->map.contains(typestr);
+    return d->map.tqcontains(typestr);
 }
 
 TQStringList StorageFactoryRegistry::list() const
diff --git a/akregator/src/storagefactoryregistry.h b/akregator/src/storagefactoryregistry.h
index 75976e26..64567840 100644
--- a/akregator/src/storagefactoryregistry.h
+++ b/akregator/src/storagefactoryregistry.h
@@ -45,7 +45,7 @@ class AKREGATOR_EXPORT StorageFactoryRegistry
         bool registerFactory(StorageFactory* factory, const TQString& typestr);
         void unregisterFactory(const TQString& typestr);
         StorageFactory* getFactory(const TQString& typestr);
-        bool containsFactory(const TQString& typestr) const;
+        bool tqcontainsFactory(const TQString& typestr) const;
         TQStringList list() const;
         
 
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index df969aac..3f86fa1d 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f)
 uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
 {
     int hframe, overlap;
-    hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
-    overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+    hframe = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+    overlap = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
 
     TQFontMetrics fm = tabBar()->fontMetrics();
     int x = 0;
@@ -198,7 +198,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
     removeTabToolTip( sender );
    
     uint lcw=0, rcw=0;
-    int tabBarHeight = tabBar()->sizeHint().height();
+    int tabBarHeight = tabBar()->tqsizeHint().height();
     if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
         lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
     if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
@@ -218,7 +218,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
         newTitle = newTitle.left( newMaxLength-3 ) + "...";
     }
 
-    newTitle.replace( '&', "&&" );
+    newTitle.tqreplace( '&', "&&" );
     if ( tabLabel( sender ) != newTitle )
         changeTab( sender, newTitle );
 
@@ -235,7 +235,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
                 newTitle = newTitle.left( newMaxLength-3 ) + "...";
             }
 
-            newTitle.replace( '&', "&&" );
+            newTitle.tqreplace( '&', "&&" );
             if ( newTitle != tabLabel( page( i ) ) )
                     changeTab( page( i ), newTitle );
         }
diff --git a/akregator/src/tag.h b/akregator/src/tag.h
index 01c0f4e2..a865b6ec 100644
--- a/akregator/src/tag.h
+++ b/akregator/src/tag.h
@@ -81,7 +81,7 @@ class Tag
 
     bool isNull() const;
     
-    /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary unicode string, an URI etc. */
+    /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary tqunicode string, an URI etc. */
     TQString id() const;
 
     /** user-visible name of the tag */
diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp
index eba476c5..20a68eb4 100644
--- a/akregator/src/tagaction.cpp
+++ b/akregator/src/tagaction.cpp
@@ -90,7 +90,7 @@ int TagAction::plug(TQWidget* widget, int index)
         return -1;
     
    TagMenuItem* item = new TagMenuItem(d->tag);
-    int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index);
+    int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->tqcolorGroup()), item, -1, index);
    
     
     popup->connectItem (id, this, TQT_SLOT(slotActivated()));
diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp
index b351d668..3b4939cd 100644
--- a/akregator/src/tagnode.cpp
+++ b/akregator/src/tagnode.cpp
@@ -162,7 +162,7 @@ void TagNode::slotMarkAllArticlesAsRead()
     setNotificationMode(false);
     TQValueList<Article>::Iterator en = d->articles.end();
     for (TQValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it)
-        (*it).setStatus(Article::Read);
+        (*it).seStatus(Article::Read);
     setNotificationMode(true);
 }
     
@@ -196,7 +196,7 @@ void TagNode::slotArticlesAdded(TreeNode* node, const TQValueList<Article>& list
     bool added = false;
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (!d->articles.contains(*it) && d->filter.matches(*it))
+        if (!d->articles.tqcontains(*it) && d->filter.matches(*it))
         {
             d->articles.append(*it);
             d->addedArticlesNotify.append(*it);
@@ -216,7 +216,7 @@ void TagNode::slotArticlesUpdated(TreeNode* node, const TQValueList<Article>& li
     bool updated = false;
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (d->articles.contains(*it))
+        if (d->articles.tqcontains(*it))
         {
             if (!d->filter.matches(*it)) // articles is in list, but doesn't match our criteria anymore -> remove it
 	    {
@@ -252,7 +252,7 @@ void TagNode::slotArticlesRemoved(TreeNode* node, const TQValueList<Article>& li
     bool removed = false;
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (d->articles.contains(*it))
+        if (d->articles.tqcontains(*it))
         {
             d->articles.remove(*it);
             d->removedArticlesNotify.append(*it);
diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h
index efe54ae9..30630f86 100644
--- a/akregator/src/tagnode.h
+++ b/akregator/src/tagnode.h
@@ -75,7 +75,7 @@ public:
     virtual int totalCount() const;
 
     
-    /** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree.
+    /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree.
     If @c tag is not null, only articles tagged with @c tag are returned
     @return sequence of articles */
     
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index c53e5be3..f1a98b62 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -92,7 +92,7 @@ bool TagNodeList::insert(TagNode* tagNode)
 {
     tagNode->setId(KApplication::random());
     TQString id = tagNode->tag().id();
-    if (!containsTagId(id))
+    if (!tqcontainsTagId(id))
     {
         rootNode()->appendChild(tagNode); // TODO: maintain sorting
         d->tagIdToNodeMap[id] = tagNode;
@@ -105,7 +105,7 @@ bool TagNodeList::insert(TagNode* tagNode)
 bool TagNodeList::remove(TagNode* tagNode)
 {
     TQString id = tagNode->tag().id();
-    if (containsTagId(id))
+    if (tqcontainsTagId(id))
     {
         rootNode()->removeChild(tagNode);
         d->tagIdToNodeMap.remove(id);
@@ -120,7 +120,7 @@ void TagNodeList::slotNodeDestroyed(TreeNode* node)
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
     TQString id = tagNode ? tagNode->tag().id() : TQString::null;
     
-    if (tagNode != 0 && containsTagId(id))
+    if (tagNode != 0 && tqcontainsTagId(id))
     {
         rootNode()->removeChild(tagNode);
         d->tagIdToNodeMap.remove(id);
@@ -135,7 +135,7 @@ void TagNodeList::slotNodeAdded(TreeNode* node)
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
     TQString id = tagNode ? tagNode->tag().id() : TQString::null;
     
-    if (tagNode != 0L && !containsTagId(id))
+    if (tagNode != 0L && !tqcontainsTagId(id))
     {
        d->tagIdToNodeMap[id] = tagNode;
        emit signalTagNodeAdded(tagNode);
@@ -149,16 +149,16 @@ void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node)
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
     TQString id = tagNode ? tagNode->tag().id() : TQString::null;
     
-    if (parent == rootNode() && tagNode != 0L && containsTagId(id))
+    if (parent == rootNode() && tagNode != 0L && tqcontainsTagId(id))
     {
         d->tagIdToNodeMap.remove(id);
         emit signalTagNodeRemoved(tagNode);
     }
 }
 
-bool TagNodeList::containsTagId(const TQString& tagId)
+bool TagNodeList::tqcontainsTagId(const TQString& tagId)
 {
-    return d->tagIdToNodeMap.contains(tagId);
+    return d->tagIdToNodeMap.tqcontains(tagId);
 }
 
 TQValueList<TagNode*> TagNodeList::toList() const
@@ -178,7 +178,7 @@ TQDomDocument TagNodeList::toXML() const
 
 void TagNodeList::slotTagAdded(const Tag& tag)
 {
-    if (!containsTagId(tag.id()))
+    if (!tqcontainsTagId(tag.id()))
     {
         insert(new TagNode(tag, d->feedList->rootNode()));
     }
@@ -186,14 +186,14 @@ void TagNodeList::slotTagAdded(const Tag& tag)
 
 void TagNodeList::slotTagUpdated(const Tag& tag)
 {
-    if (containsTagId(tag.id()))
+    if (tqcontainsTagId(tag.id()))
     {
         d->tagIdToNodeMap[tag.id()]->tagChanged();
     }
 }
 void TagNodeList::slotTagRemoved(const Tag& tag)
 {
-    if (containsTagId(tag.id()))
+    if (tqcontainsTagId(tag.id()))
     {
         delete d->tagIdToNodeMap[tag.id()];
         d->tagIdToNodeMap[tag.id()] = 0;
diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h
index f909c827..9e67b197 100644
--- a/akregator/src/tagnodelist.h
+++ b/akregator/src/tagnodelist.h
@@ -53,7 +53,7 @@ namespace Akregator {
        FeedList* feedList() const;
        bool insert(TagNode* tagNode);
        bool remove(TagNode* tagNode);
-       bool containsTagId(const TQString& tagId);
+       bool tqcontainsTagId(const TQString& tagId);
        TQValueList<TagNode*> toList() const;
        
        TagNode* findByTagID(const TQString& tagID);
diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui
index 68bc09c1..d96744bb 100644
--- a/akregator/src/tagpropertieswidgetbase.ui
+++ b/akregator/src/tagpropertieswidgetbase.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -53,7 +53,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
@@ -62,7 +62,7 @@
         </spacer>
         <widget class="QLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -91,7 +91,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>40</width>
                             <height>40</height>
@@ -117,7 +117,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>200</width>
                             <height>21</height>
@@ -128,7 +128,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kicondialog.h</includehint>
 </includehints>
diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp
index e3a8d60e..4cfb787a 100644
--- a/akregator/src/tagset.cpp
+++ b/akregator/src/tagset.cpp
@@ -54,7 +54,7 @@ TagSet::~TagSet()
 
 void TagSet::insert(const Tag& tag)
 {
-    if (!d->map.contains(tag.id()))
+    if (!d->map.tqcontains(tag.id()))
     {
         d->map.insert(tag.id(), tag);
         tag.addedToTagSet(this);
@@ -64,7 +64,7 @@ void TagSet::insert(const Tag& tag)
 
 void TagSet::remove(const Tag& tag)
 {
-    if (d->map.contains(tag.id()))
+    if (d->map.tqcontains(tag.id()))
     {
         d->map.remove(tag.id());
         tag.removedFromTagSet(this);
@@ -72,19 +72,19 @@ void TagSet::remove(const Tag& tag)
     }
 }
 
-bool TagSet::containsID(const TQString& id) const
+bool TagSet::tqcontainsID(const TQString& id) const
 {
-    return d->map.contains(id);
+    return d->map.tqcontains(id);
 }
 
-bool TagSet::contains(const Tag& tag) const
+bool TagSet::tqcontains(const Tag& tag) const
 {
-    return d->map.contains(tag.id());
+    return d->map.tqcontains(tag.id());
 }
 
 Tag TagSet::findByID(const TQString& id) const
 {
-    return d->map.contains(id) ? d->map[id] : Tag();
+    return d->map.tqcontains(id) ? d->map[id] : Tag();
 }
 
 TQMap<TQString,Tag> TagSet::toMap() const
@@ -99,21 +99,21 @@ void TagSet::readFromXML(const TQDomDocument& doc)
     if (root.isNull())
         return;
 
-    TQDomNodeList list = root.elementsByTagName(TQString::fromLatin1("tag"));
+    TQDomNodeList list = root.elementsByTagName(TQString::tqfromLatin1("tag"));
 
     for (uint i = 0; i < list.length(); ++i)
     {
         TQDomElement e = list.item(i).toElement();
         if (!e.isNull())
         {
-            if (e.hasAttribute(TQString::fromLatin1("id")))
+            if (e.hasAttribute(TQString::tqfromLatin1("id")))
             {
-                TQString id = e.attribute(TQString::fromLatin1("id"));
+                TQString id = e.attribute(TQString::tqfromLatin1("id"));
                 TQString name = e.text();
-                TQString scheme = e.attribute(TQString::fromLatin1("scheme"));
+                TQString scheme = e.attribute(TQString::tqfromLatin1("scheme"));
                 Tag tag(id, name, scheme);
                 
-                TQString icon = e.attribute(TQString::fromLatin1("icon"));
+                TQString icon = e.attribute(TQString::tqfromLatin1("icon"));
                 if (!icon.isEmpty())
                     tag.setIcon(icon);
 
@@ -145,11 +145,11 @@ TQDomDocument TagSet::toXML() const
         TQDomElement tn = doc.createElement("tag");
         
         TQDomText text = doc.createTextNode((*it).name());
-        tn.setAttribute(TQString::fromLatin1("id"),(*it).id());
+        tn.setAttribute(TQString::tqfromLatin1("id"),(*it).id());
         if (!(*it).scheme().isEmpty())
-            tn.setAttribute(TQString::fromLatin1("scheme"),(*it).scheme());
+            tn.setAttribute(TQString::tqfromLatin1("scheme"),(*it).scheme());
         if (!(*it).icon().isEmpty())
-            tn.setAttribute(TQString::fromLatin1("icon"),(*it).icon());
+            tn.setAttribute(TQString::tqfromLatin1("icon"),(*it).icon());
         tn.appendChild(text);
         root.appendChild(tn);
     }
diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h
index aea004c8..febb47d3 100644
--- a/akregator/src/tagset.h
+++ b/akregator/src/tagset.h
@@ -62,11 +62,11 @@ class TagSet : public QObject
         /** returns the tag set as map ((id, Tag) pairs) */
         TQMap<TQString,Tag> toMap() const;
 
-        /** returns @c true if this set contains @c tag */
-        bool contains(const Tag& tag) const;
+        /** returns @c true if this set tqcontains @c tag */
+        bool tqcontains(const Tag& tag) const;
 
-        /** returns @c true if this set contains a tag with a given ID */
-        bool containsID(const TQString& id) const;
+        /** returns @c true if this set tqcontains a tag with a given ID */
+        bool tqcontainsID(const TQString& id) const;
 
         /** returns the tag with the given ID if the tag is element of the set, or a null tag if not */
         Tag findByID(const TQString& id) const;
diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h
index 1e8a1cf6..366677d3 100644
--- a/akregator/src/treenode.h
+++ b/akregator/src/treenode.h
@@ -111,7 +111,7 @@ public:
     virtual void setParent(Folder* parent);
     
     
-    /** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree.
+    /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree.
     If @c tag is not null, only articles tagged with @c tag are returned
     @return sequence of articles */
     
diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp
index 92a36859..02361f37 100644
--- a/akregator/src/treenodeitem.cpp
+++ b/akregator/src/treenodeitem.cpp
@@ -105,7 +105,7 @@ FolderItem* TreeNodeItem::parent() const
 } 
     
 
-// TODO: reverse for reverse layout
+// TODO: reverse for reverse tqlayout
 void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
                                int column, int width, int align )
 
diff --git a/akregator/src/utils.cpp b/akregator/src/utils.cpp
index e4a24209..eb555a75 100644
--- a/akregator/src/utils.cpp
+++ b/akregator/src/utils.cpp
@@ -30,7 +30,7 @@ namespace Akregator {
 
 TQString Utils::stripTags(const TQString& str)
 {
-    return TQString(str).replace(TQRegExp("<[^>]*>"), "");
+    return TQString(str).tqreplace(TQRegExp("<[^>]*>"), "");
 }
 
 uint Utils::calcHash(const TQString& str)
@@ -48,7 +48,7 @@ TQString Utils::fileNameForUrl(const TQString& url_p)
 {
     TQString url2(url_p);
     
-    url2 = url2.replace("/", "_").replace(":", "_");
+    url2 = url2.tqreplace("/", "_").tqreplace(":", "_");
     
     if (url2.length() > 255)
         url2 = url2.left(200) + TQString::number(Akregator::Utils::calcHash(url2), 16);
diff --git a/akregator/src/utils.h b/akregator/src/utils.h
index 8ab0fea1..7a65915b 100644
--- a/akregator/src/utils.h
+++ b/akregator/src/utils.h
@@ -46,7 +46,7 @@ class Utils
     
     /**
      * returns a file name for a URL, with chars like "/" ":"
-     * replaced by "_". Too long URLs (>255 chars) are shortened and
+     * tqreplaced by "_". Too long URLs (>255 chars) are shortened and
      * appended with a hash value.
      * 
      */
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 55e9b758..6926a151 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -112,7 +112,7 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype)
    {
        TQString cmd = Settings::externalBrowserCustomCommand();
        TQString urlStr = url.url();
-       cmd.replace(TQRegExp("%u"), urlStr);
+       cmd.tqreplace(TQRegExp("%u"), urlStr);
        KProcess *proc = new KProcess;
        TQStringList cmdAndArgs = KShell::splitArgs(cmd);
        *proc << cmdAndArgs;
@@ -202,7 +202,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c
 void Viewer::slotCopy()
 {
     TQString text = selectedText();
-    text.replace( TQChar( 0xa0 ), ' ' );
+    text.tqreplace( TQChar( 0xa0 ), ' ' );
     QClipboard *cb = TQApplication::clipboard();
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
     cb->setText(text);