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

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:50:21 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:50:21 -0600
commit: 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (patch)
tree: 89de88213bd261e4ccaade899ab2d6ec34b3a5a7 /akregator/src
parent: 1dad5f662a09dfc5cc041caffe0f674044a4dcec (diff)
download: tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.tar.gz
tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.zip
70 files changed, 617 insertions, 617 deletions
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index 1cca9d90..bb37d26e 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -83,7 +83,7 @@ void AddFeedDialog::slotOk( )
         feedURL.prepend("http://");
     f->setXmlUrl(feedURL);
 
-    widget->statusLabel->setText( i18n("Downloading %1").tqarg(feedURL) );
+    widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) );
 
     connect( feed, TQT_SIGNAL(fetched(Feed* )),
              this, TQT_SLOT(fetchCompleted(Feed *)) );
@@ -102,7 +102,7 @@ void AddFeedDialog::fetchCompleted(Feed */*f*/)
 
 void AddFeedDialog::fetchError(Feed *)
 {
-    KMessageBox::error(this, i18n("Feed not found from %1.").tqarg(feedURL));
+    KMessageBox::error(this, i18n("Feed not found from %1.").arg(feedURL));
     KDialogBase::slotCancel();
 }
 
diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui
index 7d9a8a48..8ee0614d 100644
--- a/akregator/src/addfeedwidgetbase.ui
+++ b/akregator/src/addfeedwidgetbase.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout16</cstring>
+                <cstring>layout16</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -65,7 +65,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout15</cstring>
+                        <cstring>layout15</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -75,7 +75,7 @@
                             <property name="name">
                                 <cstring>urlEdit</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -115,7 +115,7 @@
                 <cstring>statusLabel</cstring>
             </property>
             <property name="text">
-                <string>tqStatus</string>
+                <string>Status</string>
             </property>
         </widget>
         <spacer>
@@ -128,7 +128,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 223db5a0..a21aaa70 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -146,7 +146,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
    
     TQStringList storageParams;
     
-    storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false"));
+    storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
     
     if (factory != 0)
     {
@@ -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.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
+        KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
     }
 
     Filters::ArticleFilterList list;
@@ -232,7 +232,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
 
     initFonts();
 
-    RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION));
+    RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
 }
 
 void Part::loadPlugins()
@@ -428,11 +428,11 @@ bool Part::openFile()
 
             if (file.size() > 0) // don't backup empty files 
             {
-                TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
+                TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::currentDateTime().toTime_t());
         
                 copyFile(backup);
         
-                KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("XML Parsing Error") );
+                KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") );
             }
 
             if (!doc.setContent(listBackup))
@@ -444,10 +444,10 @@ bool Part::openFile()
     {
         if (file.size() > 0) // don't backup empty files 
         {
-            TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
+            TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::currentDateTime().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>").tqarg(backup), i18n("OPML Parsing Error") );
+            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") );
         }
         m_view->loadFeeds(createDefaultFeedList());
     }
@@ -486,7 +486,7 @@ void Part::slotSaveFeedList()
     if (file.open(IO_WriteOnly) == false)
     {
         //FIXME: allow to save the feedlist into different location -tpr 20041118
-        KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") );
+        KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") );
         return;
     }
 
@@ -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->tqtopLevelWidgets();
+    TQWidgetList *l = kapp->topLevelWidgets();
     TQWidgetListIt it( *l );
     TQWidget *wid;
 
@@ -639,10 +639,10 @@ void Part::importFile(const KURL& url)
         if (doc.setContent(TQByteArray(file.readAll())))
             m_view->importFeeds(doc);
         else
-            KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(filename), i18n("OPML Parsing Error") );
+            KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(filename), i18n("OPML Parsing Error") );
     }
     else
-        KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").tqarg(filename), i18n("Read Error"));
+        KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error"));
 
     if (isRemote)
         KIO::NetAccess::removeTempFile(filename);
@@ -656,7 +656,7 @@ void Part::exportFile(const KURL& url)
 
         if ( file.exists() &&
                 KMessageBox::questionYesNo(m_view,
-            i18n("The file %1 already exists; do you want to overwrite it?").tqarg(file.name()),
+            i18n("The file %1 already exists; do you want to overwrite it?").arg(file.name()),
             i18n("Export"),
             i18n("Overwrite"),
             KStdGuiItem::cancel()) == KMessageBox::No )
@@ -664,7 +664,7 @@ void Part::exportFile(const KURL& url)
 
         if ( !file.open(IO_WriteOnly) )
         {
-            KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(file.name()), i18n("Write Error") );
+            KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(file.name()), i18n("Write Error") );
             return;
         }
 
@@ -978,11 +978,11 @@ bool Part::tryToLock(const TQString& backendName)
                         "can cause the loss of archived articles and crashes at startup.</b> "
                         "You should disable the archive for now "
                         "unless you are sure that %2 is not already running.</qt>")
-                        .tqarg( programName, programName, backendName );
+                        .arg( programName, programName, backendName );
               // TQString::arg( st ) only replaces the first occurrence of %1
               // with st while TQString::arg( s1, s2 ) replacess all occurrences
               // of %1 with s1 and all occurrences of %2 with s2. So don't
-              // even think about changing the above to .tqarg( programName ).
+              // even think about changing the above to .arg( programName ).
             else
                 msg = i18n("<qt>%1 seems to be running on another display on this "
                         "machine. <b>Running %1 and %2 at the same "
@@ -990,7 +990,7 @@ bool Part::tryToLock(const TQString& backendName)
                         "the loss of archived articles and crashes at startup.</b> "
                         "You should disable the archive for now "
                         "unless you are sure that %2 is not already running.</qt>")
-                        .tqarg( oldProgramName, programName, backendName );
+                        .arg( oldProgramName, programName, backendName );
         }
         else
         {
@@ -1001,7 +1001,7 @@ bool Part::tryToLock(const TQString& backendName)
                         "You should disable the archive for now "
                         "unless you are sure that it is "
                         "not already running on %2.</qt>")
-                        .tqarg( programName, oldHostName, backendName );
+                        .arg( programName, oldHostName, backendName );
             else
                 msg = i18n("<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the "
                         "same time is not supported by the %4 backend and can cause "
@@ -1009,7 +1009,7 @@ bool Part::tryToLock(const TQString& backendName)
                         "You should disable the archive for now "
                         "unless you are sure that %1 is "
                         "not running on %3.</qt>")
-                        .tqarg( oldProgramName, programName, oldHostName, backendName );
+                        .arg( oldProgramName, programName, oldHostName, backendName );
         }
 
         KCursorSaver idle( KBusyPtr::idle() );
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 3aa9dd2c..e296f29c 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -90,18 +90,18 @@
 #include <tqfile.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmultilineedit.h>
 #include <tqpopupmenu.h>
 #include <tqptrlist.h>
-#include <tqstylesheet.h>
-#include <tqtextstream.h>
+#include <stylesheet.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 #include <tqvaluevector.h>
 #include <tqwhatsthis.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 namespace Akregator {
 
@@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
 
         virtual bool visitTagNode(TagNode* node)
         {
-            TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").tqarg(node->title());
+            TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title());
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue)
             {
                 Tag tag = node->tag();
@@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
             if (node->title().isEmpty())
                 msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>");
             else
-                msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(node->title());
+                msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(node->title());
 
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue)
             {
@@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
             if (node->title().isEmpty())
                 msg = i18n("<qt>Are you sure you want to delete this feed?</qt>");
             else
-                msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title());
+                msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title());
 
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue)
             {
@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
 
     if (!Settings::resetQuickFilterOnNodeChange())
     {
-        m_searchBar->slotSetqStatus(Settings::statusFilter());
+        m_searchBar->slotSeStatus(Settings::statusFilter());
         m_searchBar->slotSetText(Settings::textFilter());
     }
 
@@ -884,7 +884,7 @@ void View::slotFeedAdd()
 
     }
 
-    TreeNode* lastChild = group->tqchildren().last();
+    TreeNode* lastChild = group->children().last();
 
     addFeed(TQString(), lastChild, group, false);
 }
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
             if (delay > 0)
                 m_markReadTimer->start( delay*1000, true );
             else
-                a.setqStatus(Article::Read);
+                a.seStatus(Article::Read);
         }
     }
 
@@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
             link = article.link().url();
         else
             link = article.guid();
-        TQClipboard *cb = TQApplication::tqclipboard();
+        TQClipboard *cb = TQApplication::clipboard();
         cb->setText(link, TQClipboard::Clipboard);
         cb->setText(link, TQClipboard::Selection);
     }
@@ -1312,7 +1312,7 @@ void View::slotArticleDelete()
         case 0:
             return;
         case 1:
-            msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape(articles.first().title()));
+            msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title()));
             break;
         default:
             msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",
@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).setqStatus(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).setqStatus(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).setqStatus(Article::New);
+        (*it).seStatus(Article::New);
 }
 
 void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
     if (article.isNull())
         return;
 
-    article.setqStatus(Article::Read);
+    article.seStatus(Article::Read);
 }
 
 void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -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->slotSetqStatus(statusfilter);
+            m_searchBar->slotSeStatus(statusfilter);
     }
 
     int selectedID = config->readNumEntry("selectedNodeID", -1);
diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp
index 3b7f321a..36ba87d6 100644
--- a/akregator/src/article.cpp
+++ b/akregator/src/article.cpp
@@ -55,7 +55,7 @@ struct Article::Private : public Shared
         0001 0000 Keep
      */
 
-    enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
+    enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
 
     TQString guid;
     Backend::FeedStorage* archive;
@@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
         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->setqStatus(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::tqcurrentDateTime();
+            d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime();
             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;
-                setqStatus(statusInt);
+                seStatus(statusInt);
             }
             setKeep(article.meta("keep") == "true");
         }
@@ -210,9 +210,9 @@ void Article::setDeleted()
     if (isDeleted())
         return;
   
-    setqStatus(Read);
+    seStatus(Read);
     d->status = Private::Deleted | Private::Read;
-    d->archive->setqStatus(d->guid, d->status);
+    d->archive->seStatus(d->guid, d->status);
     d->archive->setDeleted(d->guid);
 
     if (d->feed)
@@ -299,13 +299,13 @@ int Article::status() const
         return Unread;
 }
 
-void Article::setqStatus(int stat)
+void Article::seStatus(int stat)
 {
     // use status() rather than statusBits() here to filter out status flags that we are not
     // interested in
-    int oldtqStatus = status();
+    int oldStatus = status();
 
-    if (oldtqStatus != stat)
+    if (oldStatus != stat)
     {
         switch (stat)
         {
@@ -319,9 +319,9 @@ void Article::setqStatus(int stat)
                 d->status = ( d->status | Private::New) & ~Private::Read;
                 break;
         }
-        d->archive->setqStatus(d->guid, d->status);
+        d->archive->seStatus(d->guid, d->status);
         if (d->feed)
-            d->feed->setArticleChanged(*this, oldtqStatus);
+            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->setqStatus(d->guid, d->status);
+    d->archive->seStatus(d->guid, d->status);
     if (d->feed)
         d->feed->setArticleChanged(*this);
 }
diff --git a/akregator/src/article.h b/akregator/src/article.h
index 8d1baa2a..902aa47c 100644
--- a/akregator/src/article.h
+++ b/akregator/src/article.h
@@ -57,7 +57,7 @@ namespace Akregator
     class Article
     {
         public:
-            enum tqStatus { Unread=0, Read, New };
+            enum Status { Unread=0, Read, New };
             typedef TQValueList<Article> List;
 
             Article();
@@ -80,7 +80,7 @@ namespace Akregator
             bool isNull() const;
             
             int status() const;
-            void setqStatus(int s);
+            void seStatus(int s);
 
             void offsetPubDate(int secs);
 
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index 21009190..fc1ff29a 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::tqfromLatin1("Title");
+            return TQString::fromLatin1("Title");
         case Link:
-            return TQString::tqfromLatin1("Link");
+            return TQString::fromLatin1("Link");
         case Author:
-            return TQString::tqfromLatin1("Author");
+            return TQString::fromLatin1("Author");
         case Description:
-            return TQString::tqfromLatin1("Description");
-        case tqStatus:
-            return TQString::tqfromLatin1("Status");
+            return TQString::fromLatin1("Description");
+        case Status:
+            return TQString::fromLatin1("Status");
         case KeepFlag:
-            return TQString::tqfromLatin1("KeepFlag");
+            return TQString::fromLatin1("KeepFlag");
         default: // should never happen (TM)
-            return TQString::tqfromLatin1("Description");
+            return TQString::fromLatin1("Description");
     }
 }
 
 Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
 {
-    if (subjStr == TQString::tqfromLatin1("Title"))
+    if (subjStr == TQString::fromLatin1("Title"))
         return Title;
-    else if (subjStr == TQString::tqfromLatin1("Link"))
+    else if (subjStr == TQString::fromLatin1("Link"))
         return Link;
-    else if (subjStr == TQString::tqfromLatin1("Description"))
+    else if (subjStr == TQString::fromLatin1("Description"))
         return Description;
-    else if (subjStr == TQString::tqfromLatin1("Author"))
+    else if (subjStr == TQString::fromLatin1("Author"))
         return Author;
-    else if (subjStr == TQString::tqfromLatin1("Status"))
-        return tqStatus;
-    else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
+    else if (subjStr == TQString::fromLatin1("Status"))
+        return Status;
+    else if (subjStr == TQString::fromLatin1("KeepFlag"))
         return KeepFlag;
 
     // hopefully never reached
@@ -83,27 +83,27 @@ TQString Criterion::predicateToString(Predicate pred)
     switch (pred)
     {
         case Contains:
-            return TQString::tqfromLatin1("Contains");
+            return TQString::fromLatin1("Contains");
         case Equals:
-            return TQString::tqfromLatin1("Equals");
+            return TQString::fromLatin1("Equals");
         case Matches:
-            return TQString::tqfromLatin1("Matches");
+            return TQString::fromLatin1("Matches");
         case Negation:
-            return TQString::tqfromLatin1("Negation");
+            return TQString::fromLatin1("Negation");
         default:// hopefully never reached
-            return TQString::tqfromLatin1("Contains");
+            return TQString::fromLatin1("Contains");
     }
 }
 
 Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr)
 {
-    if (predStr == TQString::tqfromLatin1("Contains"))
+    if (predStr == TQString::fromLatin1("Contains"))
         return Contains;
-    else if (predStr == TQString::tqfromLatin1("Equals"))
+    else if (predStr == TQString::fromLatin1("Equals"))
         return Equals;
-    else if (predStr == TQString::tqfromLatin1("Matches"))
+    else if (predStr == TQString::fromLatin1("Matches"))
         return Matches;
-    else if (predStr == TQString::tqfromLatin1("Negation"))
+    else if (predStr == TQString::fromLatin1("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::tqfromLatin1("subject"), subjectToString(m_subject));
+    config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));
 
-    config->writeEntry(TQString::tqfromLatin1("predicate"), predicateToString(m_predicate));
+    config->writeEntry(TQString::fromLatin1("predicate"), predicateToString(m_predicate));
 
-    config->writeEntry(TQString::tqfromLatin1("objectType"), TQString(m_object.typeName()));
+    config->writeEntry(TQString::fromLatin1("objectType"), TQString(m_object.typeName()));
 
-    config->writeEntry(TQString::tqfromLatin1("objectValue"), m_object);
+    config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
 }
 
 void Criterion::readConfig(KConfig* config)
 {
-    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());
+    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());
 
     if (type != TQVariant::Invalid)
     {
-        m_object = config->readPropertyEntry(TQString::tqfromLatin1("objectValue"), type);
+        m_object = config->readPropertyEntry(TQString::fromLatin1("objectValue"), type);
     }
 }
 
@@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
             // ### Maybe use prettyURL here?
             concreteSubject = TQVariant(article.link().url());
             break;
-        case tqStatus:
+        case Status:
             concreteSubject = TQVariant(article.status());
             break;
         case KeepFlag:
@@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const
 
 void ArticleMatcher::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::tqfromLatin1("matcherAssociation"), associationToString(m_association));
+    config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
     
-    config->writeEntry(TQString::tqfromLatin1("matcherCriteriaCount"), m_criteria.count());
+    config->writeEntry(TQString::fromLatin1("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::tqfromLatin1("_Criterion")+TQString::number(index));
+        config->setGroup(config->group()+TQString::fromLatin1("_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::tqfromLatin1("matcherAssociation")));
+    m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));
 
-    int count =  config->readNumEntry(TQString::tqfromLatin1("matcherCriteriaCount"), 0);
+    int count =  config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0);
     
     for (int i = 0; i < count; ++i)
     {
         Criterion c;
-        config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(i));
+        config->setGroup(config->group()+TQString::fromLatin1("_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::tqfromLatin1("LogicalAnd"))
+    if (assocStr == TQString::fromLatin1("LogicalAnd"))
         return LogicalAnd;
-    else if (assocStr == TQString::tqfromLatin1("LogicalOr"))
+    else if (assocStr == TQString::fromLatin1("LogicalOr"))
         return LogicalOr;
     else
         return None;
@@ -356,11 +356,11 @@ TQString ArticleMatcher::associationToString(Association association)
     switch (association)
     {
         case LogicalAnd:
-            return TQString::tqfromLatin1("LogicalAnd");
+            return TQString::fromLatin1("LogicalAnd");
         case LogicalOr:
-            return TQString::tqfromLatin1("LogicalOr");
+            return TQString::fromLatin1("LogicalOr");
         default:
-            return TQString::tqfromLatin1("None");
+            return TQString::fromLatin1("None");
     }
 }
 
@@ -408,13 +408,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)
 
 void TagMatcher::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::tqfromLatin1("matcherType"), TQString::tqfromLatin1("TagMatcher"));
-    config->writeEntry(TQString::tqfromLatin1("matcherParams"), d->tagID);
+    config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
+    config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
 }
 
 void TagMatcher::readConfig(KConfig* config)
 {
-    d->tagID = config->readEntry(TQString::tqfromLatin1("matcherParams"));
+    d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
 }
 
 bool TagMatcher::operator==(const AbstractMatcher& other) const
@@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status)
 void SeStatusAction::exec(Article& article)
 {
     if (!article.isNull())
-        article.setqStatus(m_status);
+        article.seStatus(m_status);
 }
 
 int SeStatusAction::status() const
@@ -457,20 +457,20 @@ int SeStatusAction::status() const
     return m_status;
 }
 
-void SeStatusAction::setqStatus(int status)
+void SeStatusAction::seStatus(int status)
 {
     m_status = status;
 }
 
 void SeStatusAction::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("SeStatusAction"));
-    config->writeEntry(TQString::tqfromLatin1("actionParams"), m_status);
+    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SeStatusAction"));
+    config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
 }
 
 void SeStatusAction::readConfig(KConfig* config)
 {
-    m_status = config->readNumEntry(TQString::tqfromLatin1("actionParams"), Article::Read);
+    m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
 }
 
 bool SeStatusAction::operator==(const AbstractAction& other)
@@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const
 
 void ArticleFilterList::writeConfig(KConfig* config) const
 {
-    config->setGroup(TQString::tqfromLatin1("Filters"));
-    config->writeEntry(TQString::tqfromLatin1("count"), count());
+    config->setGroup(TQString::fromLatin1("Filters"));
+    config->writeEntry(TQString::fromLatin1("count"), count());
     int index = 0;
     for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it)
     {
-        config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(index));
+        config->setGroup(TQString::fromLatin1("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::tqfromLatin1("Filters"));
-    int count = config->readNumEntry(TQString::tqfromLatin1("count"), 0);
+    config->setGroup(TQString::fromLatin1("Filters"));
+    int count = config->readNumEntry(TQString::fromLatin1("count"), 0);
     for (int i = 0; i < count; ++i)
     {
-        config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(i));
+        config->setGroup(TQString::fromLatin1("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::tqfromLatin1("actionParams"));
+    m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
 }
 
 void AssignTagAction::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("AssignTagAction"));
-    config->writeEntry(TQString::tqfromLatin1("actionParams"), m_tagID);
+    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
+    config->writeEntry(TQString::fromLatin1("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::tqfromLatin1("actionType"), TQString::tqfromLatin1("DeleteAction"));
+    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
 }
 
 bool DeleteAction::operator==(const AbstractAction& other)
@@ -661,27 +661,27 @@ void ArticleFilter::readConfig(KConfig* config)
     delete d->action;
     d->action = 0;
 
-    d->name = config->readEntry(TQString::tqfromLatin1("name"));
-    d->id = config->readNumEntry(TQString::tqfromLatin1("id"), 0);
+    d->name = config->readEntry(TQString::fromLatin1("name"));
+    d->id = config->readNumEntry(TQString::fromLatin1("id"), 0);
 
-    TQString matcherType = config->readEntry(TQString::tqfromLatin1("matcherType"));
+    TQString matcherType = config->readEntry(TQString::fromLatin1("matcherType"));
 
-    if (matcherType == TQString::tqfromLatin1("TagMatcher"))
+    if (matcherType == TQString::fromLatin1("TagMatcher"))
         d->matcher = new TagMatcher();
-    else if (matcherType == TQString::tqfromLatin1("ArticleMatcher"))
+    else if (matcherType == TQString::fromLatin1("ArticleMatcher"))
         d->matcher = new ArticleMatcher();
 
     if (d->matcher)
         d->matcher->readConfig(config);
 
 
-        TQString actionType = config->readEntry(TQString::tqfromLatin1("actionType"));
+        TQString actionType = config->readEntry(TQString::fromLatin1("actionType"));
 
-    if (actionType == TQString::tqfromLatin1("AssignTagAction"))
+    if (actionType == TQString::fromLatin1("AssignTagAction"))
         d->action = new AssignTagAction();
-    else if (actionType == TQString::tqfromLatin1("DeleteAction"))
+    else if (actionType == TQString::fromLatin1("DeleteAction"))
         d->action = new DeleteAction();
-    else if (actionType == TQString::tqfromLatin1("SeStatusAction"))
+    else if (actionType == TQString::fromLatin1("SeStatusAction"))
         d->action = new SeStatusAction();
 
     if (d->action)
@@ -690,8 +690,8 @@ void ArticleFilter::readConfig(KConfig* config)
 
 void ArticleFilter::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::tqfromLatin1("name"), d->name);
-    config->writeEntry(TQString::tqfromLatin1("id"), d->id);
+    config->writeEntry(TQString::fromLatin1("name"), d->name);
+    config->writeEntry(TQString::fromLatin1("id"), d->id);
     d->matcher->writeConfig(config);
     d->action->writeConfig(config);
 }
diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h
index c39d72e8..ddf05490 100644
--- a/akregator/src/articlefilter.h
+++ b/akregator/src/articlefilter.h
@@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction
         virtual void exec(Article& article);
         
         int status() const;
-        void setqStatus(int status);
+        void seStatus(int status);
 
         virtual void writeConfig(KConfig* config) const;
         virtual void readConfig(KConfig* config);
@@ -259,7 +259,7 @@ class Criterion
     public:
 
         enum Subject {
-            Title, Description, Author, Link, tqStatus, KeepFlag
+            Title, Description, Author, Link, Status, KeepFlag
         };
 
         static TQString subjectToString(Subject subj);
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index 0ec644ad..3449ee9c 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -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( tqcolorGroup().background() );
+    p.setBrush( colorGroup().background() );
     p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
-    t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
+    t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
 }
 
 void ArticleListView::viewportPaintEvent(TQPaintEvent *e)
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index f8ad74bc..40195069 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -72,9 +72,9 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
         m_view->m_link = TQString();
         
         TQString text;
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
         
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">").tqarg(directionOf(Utils::stripTags(node->title())));
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title())));
         text += node->title();
         if(node->unread() == 0)
             text += i18n(" (no unread articles)");
@@ -90,26 +90,26 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
             TQString file = url.replace("/", "_").replace(":", "_");
             KURL u(m_view->m_imageDir);
             u.setFileName(file);
-            text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(u.url());
+            text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url());
         }
         else text += "<div class=\"body\">";
         
         
         if( !node->description().isEmpty() )
         {
-            text += TQString("<div dir=\"%1\">").tqarg(Utils::stripTags(directionOf(node->description())));
-            text += i18n("<b>Description:</b> %1<br><br>").tqarg(node->description());
+            text += TQString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description())));
+            text += i18n("<b>Description:</b> %1<br><br>").arg(node->description());
             text += "</div>\n"; // /description
         }
         
         if ( !node->htmlUrl().isEmpty() )
         {
-            text += TQString("<div dir=\"%1\">").tqarg(directionOf(node->htmlUrl()));
-            text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").tqarg(node->htmlUrl()).tqarg(node->htmlUrl());
+            text += TQString("<div dir=\"%1\">").arg(directionOf(node->htmlUrl()));
+            text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").arg(node->htmlUrl()).arg(node->htmlUrl());
             text += "</div>\n"; // / link
         }
         
-        //text += i18n("<b>Unread articles:</b> %1").tqarg(node->unread());
+        //text += i18n("<b>Unread articles:</b> %1").arg(node->unread());
         text += "</div>"; // /body
         
         m_view->renderContent(text);
@@ -121,8 +121,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
         m_view->m_link = TQString();
         
         TQString text;
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
         if(node->unread() == 0)
             text += i18n(" (no unread articles)");
         else
@@ -139,8 +139,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
         m_view->m_link = TQString();
         
         TQString text;
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
         if(node->unread() == 0)
             text += i18n(" (no unread articles)");
         else
@@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer()
 
 void ArticleViewer::generateNormalModeCSS()
 {
-    const TQColorGroup & cg = TQApplication::tqpalette().active();
+    const TQColorGroup & cg = TQApplication::palette().active();
     
     // from kmail::headerstyle.cpp
     m_normalModeCSS = TQString(
@@ -198,10 +198,10 @@ void ArticleViewer::generateNormalModeCSS()
             "  font-size: %2 ! important;\n"
             "  color: %3 ! important;\n"
             "  background: %4 ! important;\n"
-            "}\n\n").tqarg(Settings::standardFont())
-            .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
-            .tqarg(cg.text().name())
-            .tqarg(cg.base().name());
+            "}\n\n").arg(Settings::standardFont())
+            .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
+            .arg(cg.text().name())
+            .arg(cg.base().name());
     m_normalModeCSS += TQString(
     "a {\n"
     + TQString("  color: %1 ! important;\n")
@@ -214,18 +214,18 @@ void ArticleViewer::generateNormalModeCSS()
     +"  margin-bottom: 10pt;\n"
 //    +"  width: 99%;\n"
     +        "}\n\n")
-            .tqarg(cg.link().name())
-            .tqarg(cg.background().name())
-            .tqarg(cg.text().name());
+            .arg(cg.link().name())
+            .arg(cg.background().name())
+            .arg(cg.text().name());
 
     m_normalModeCSS += TQString(".headertitle a:link { color: %1  ! important; }\n"
     ".headertitle a:visited { color: %2 ! important; }\n"
     ".headertitle a:hover{ color: %3 ! important; }\n"
             ".headertitle a:active { color: %4 ! important; }\n")
-            .tqarg(cg.highlightedText().name())
-            .tqarg(cg.highlightedText().name())
-            .tqarg(cg.highlightedText().name())
-            .tqarg(cg.highlightedText().name());
+            .arg(cg.highlightedText().name())
+            .arg(cg.highlightedText().name())
+            .arg(cg.highlightedText().name())
+            .arg(cg.highlightedText().name());
     
     m_normalModeCSS += TQString(
     ".headertitle {\n"
@@ -244,8 +244,8 @@ void ArticleViewer::generateNormalModeCSS()
     ".headimage {\n"
     "  float: right;\n"
     "  margin-left: 5px;\n"
-            "}\n\n").tqarg(cg.highlight().name())
-            .tqarg(cg.highlightedText().name());
+            "}\n\n").arg(cg.highlight().name())
+            .arg(cg.highlightedText().name());
     
     m_normalModeCSS += TQString(
     "body { clear: none; }\n\n"
@@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS()
 
 void ArticleViewer::generateCombinedModeCSS()
 {
-    const TQColorGroup & cg = TQApplication::tqpalette().active();
+    const TQColorGroup & cg = TQApplication::palette().active();
     
     // from kmail::headerstyle.cpp
     m_combinedModeCSS = TQString (
@@ -278,10 +278,10 @@ void ArticleViewer::generateCombinedModeCSS()
             "  font-size: %2 ! important;\n"
             "  color: %3 ! important;\n"
             "  background: %4 ! important;\n"
-            "}\n\n").tqarg(Settings::standardFont())
-            .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
-            .tqarg(cg.text().name())
-            .tqarg(cg.base().name());
+            "}\n\n").arg(Settings::standardFont())
+            .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
+            .arg(cg.text().name())
+            .arg(cg.base().name());
     m_combinedModeCSS += (
     "a {\n"
     + TQString("  color: %1 ! important;\n")
@@ -294,18 +294,18 @@ void ArticleViewer::generateCombinedModeCSS()
     +"  margin-bottom: 10pt;\n"
 //    +"  width: 99%;\n"
     +        "}\n\n")
-            .tqarg(cg.link().name())
-            .tqarg(cg.background().name())
-            .tqarg(cg.text().name());
+            .arg(cg.link().name())
+            .arg(cg.background().name())
+            .arg(cg.text().name());
 
     m_combinedModeCSS += TQString(".headertitle a:link { color: %1  ! important; }\n"
     ".headertitle a:visited { color: %2 ! important; }\n"
     ".headertitle a:hover{ color: %3 ! important; }\n"
             ".headertitle a:active { color: %4 ! important; }\n")
-            .tqarg(cg.highlightedText().name())
-            .tqarg(cg.highlightedText().name())
-            .tqarg(cg.highlightedText().name())
-            .tqarg(cg.highlightedText().name());
+            .arg(cg.highlightedText().name())
+            .arg(cg.highlightedText().name())
+            .arg(cg.highlightedText().name())
+            .arg(cg.highlightedText().name());
     m_combinedModeCSS += TQString(
     ".headertitle {\n"
     "  background: %1 ! important;\n"
@@ -323,8 +323,8 @@ void ArticleViewer::generateCombinedModeCSS()
     ".headimage {\n"
     "  float: right;\n"
     "  margin-left: 5px;\n"
-            "}\n\n").tqarg(cg.highlight().name())
-            .tqarg(cg.highlightedText().name());
+            "}\n\n").arg(cg.highlight().name())
+            .arg(cg.highlightedText().name());
     
     m_combinedModeCSS += TQString(
     "body { clear: none; }\n\n"
@@ -368,11 +368,11 @@ void ArticleViewer::displayAboutPage()
 {
     TQString location = locate("data", "akregator/about/main.html");
     TQString content = KPIM::kFileToString(location);
-    content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
+    content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
     if ( kapp->reverseLayout() )
-        content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
+        content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
     else
-        content = content.tqarg( "" );
+        content = content.arg( "" );
 
     begin(KURL( location ));
     TQString info =
@@ -389,25 +389,25 @@ void ArticleViewer::displayAboutPage()
             "<p>We hope that you will enjoy Akregator.</p>\n"
             "<p>Thank you,</p>\n"
             "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Akregator Team</p>\n")
-            .tqarg(AKREGATOR_VERSION) // Akregator version
-            .tqarg("http://akregator.kde.org/"); // Akregator homepage URL
+            .arg(AKREGATOR_VERSION) // Akregator version
+            .arg("http://akregator.kde.org/"); // Akregator homepage URL
 
     TQString fontSize = TQString::number( pointsToPixel( Settings::mediumFontSize() ));
     TQString appTitle = i18n("Akregator");
     TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite");
     TQString quickDescription = i18n("An RSS feed reader for the K Desktop Environment.");
-    write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info));
+    write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info));
     end();
 }
 
 TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article)
 {
     TQString text;
-    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
 
     if (!article.title().isEmpty())
     {
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
+        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
@@ -417,16 +417,16 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
     }
     if (article.pubDate().isValid())
     {
-        text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
-        text += TQString ("%1:").tqarg(i18n("Date"));
+        text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
+        text += TQString ("%1:").arg(i18n("Date"));
         text += "</span><span class=\"headertext\">";
         text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL?
     }
     TQString author = article.author();
     if (!author.isEmpty())
     {
-        text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
-        text += TQString ("%1:").tqarg(i18n("Author"));
+        text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
+        text += TQString ("%1:").arg(i18n("Author"));
         text += "</span><span class=\"headertext\">";
         text += author+"</span>\n"; // TODO: might need RTL?
     }
@@ -437,14 +437,14 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
         TQString file = Utils::fileNameForUrl(feed->xmlUrl());
         KURL u(m_imageDir);
         u.setFileName(file);
-        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
+        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
     }
 
     
 
     if (!article.description().isEmpty())
     {
-        text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
+        text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
         text += "<span class=\"content\">"+article.description()+"</span>";
         text += "</div>";
     }
@@ -486,7 +486,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
         //int length = article.enclosure().length();
         //TQString lengthStr = KIO::convertSize(length);
 
-        //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").tqarg(url).tqarg(url).tqarg(lengthStr).tqarg(type);
+        //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type);
     }
     //kdDebug() << text << endl;
     return text;
@@ -496,13 +496,13 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
 TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& article)
 {
     TQString text;
-    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
 
     KURL link = article.link();
     
     if (!article.title().isEmpty())
     {
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
+        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
@@ -512,8 +512,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
     }
     if (article.pubDate().isValid())
     {
-        text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
-        text += TQString ("%1:").tqarg(i18n("Date"));
+        text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
+        text += TQString ("%1:").arg(i18n("Date"));
         text += "</span><span class=\"headertext\">";
         text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL?
     }
@@ -521,8 +521,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
     TQString author = article.author();
     if (!author.isEmpty())
     {
-        text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
-        text += TQString ("%1:").tqarg(i18n("Author"));
+        text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
+        text += TQString ("%1:").arg(i18n("Author"));
         text += "</span><span class=\"headertext\">";
         text += author+"</span>\n"; // TODO: might need RTL?
     }
@@ -534,14 +534,14 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
         TQString file = Utils::fileNameForUrl(feed->xmlUrl());
         KURL u(m_imageDir);
         u.setFileName(file);
-        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
+        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
     }
 
     
 
     if (!article.description().isEmpty())
     {
-        text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
+        text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
         text += "<span class=\"content\">"+article.description()+"</span>";
         text += "</div>";
     }
diff --git a/akregator/src/dragobjects.cpp b/akregator/src/dragobjects.cpp
index 5f48d5be..1141d465 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->tqencodedData("akregator/articles");
+    TQByteArray array = e->encodedData("akregator/articles");
     
     TQDataStream stream(array, IO_ReadOnly);
 
@@ -68,7 +68,7 @@ const char* ArticleDrag::format(int i) const
     return 0;
 }
 
-TQByteArray ArticleDrag::tqencodedData(const char* mime) const
+TQByteArray ArticleDrag::encodedData(const char* mime) const
 {
     TQCString mimetype(mime);
     if (mimetype == "akregator/articles")
@@ -86,7 +86,7 @@ TQByteArray ArticleDrag::tqencodedData(const char* mime) const
     }
     else
     {
-        return KURLDrag::tqencodedData(mime);
+        return KURLDrag::encodedData(mime);
     }
 }
 
diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h
index ebe931f6..3b4d7f8d 100644
--- a/akregator/src/dragobjects.h
+++ b/akregator/src/dragobjects.h
@@ -57,7 +57,7 @@ public:
 
 protected:
 
-    virtual TQByteArray tqencodedData(const char* mime) const;
+    virtual TQByteArray encodedData(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 44d40977..f24c4809 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
         TQValueList<Article>::Iterator en = tarticles.end();
 
         for (it = tarticles.begin(); it != en; ++it)
-            (*it).setqStatus(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::tqcurrentDateTime().toTime_t();
+        uint now = TQDateTime::currentDateTime().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
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
             d->addedArticlesNotify.append(mya);
             
             if (!mya.isDeleted() && !markImmediatelyAsRead())
-                mya.setqStatus(Article::New);
+                mya.seStatus(Article::New);
             else
-                mya.setqStatus(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.setqStatus(Article::Read);
+                old.seStatus(Article::Read);
 
                 d->articles.remove(old.guid());
                 appendArticle(mya);
 
-                mya.setqStatus(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::tqcurrentDateTime();
+    TQDateTime now = TQDateTime::currentDateTime();
     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)
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
     {
         if ((*it).status() == Article::New)
         {
-            (*it).setqStatus(Article::Unread);
+            (*it).seStatus(Article::Unread);
         }
     }
 
@@ -579,7 +579,7 @@ void Feed::tryFetch()
 {
     d->fetchError = false;
 
-    d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) );
+    d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) );
     //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long)));
     d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever );
 }
@@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image)
     nodeModified();
 }
 
-void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status)
+void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
 {
     // Note that loader instances delete themselves
     d->loader = 0;
@@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu
         else
         {
             d->fetchError = true;
-            d->lastErrorFetch = TQDateTime::tqcurrentDateTime().toTime_t();
+            d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t();
             emit fetchError(this);
         }
         return;
@@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu
 
     appendArticles(doc);
 
-    d->archive->setLastFetch( TQDateTime::tqcurrentDateTime().toTime_t());
+    d->archive->setLastFetch( TQDateTime::currentDateTime().toTime_t());
     emit fetched(this);
 }
 
@@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a)
     articlesModified();
 }
 
-void Feed::setArticleChanged(Article& a, int oldtqStatus)
+void Feed::setArticleChanged(Article& a, int oldStatus)
 {
-    if (oldtqStatus != -1)
+    if (oldStatus != -1)
     {
-        int newtqStatus = a.status();
-        if (oldtqStatus == Article::Read && newtqStatus != Article::Read)
+        int newStatus = a.status();
+        if (oldStatus == Article::Read && newStatus != Article::Read)
             setUnread(unread()+1);
-        else if (oldtqStatus != Article::Read && newtqStatus == Article::Read)
+        else if (oldStatus != Article::Read && newStatus == Article::Read)
             setUnread(unread()-1);
     }
     d->updatedArticlesNotify.append(a);
diff --git a/akregator/src/feed.h b/akregator/src/feed.h
index 663723cb..2c5bc768 100644
--- a/akregator/src/feed.h
+++ b/akregator/src/feed.h
@@ -43,7 +43,7 @@ namespace KPIM {
 // needed for slot fetchCompleted()
 using RSS::Document;
 using RSS::Loader;
-using RSS::tqStatus;
+using RSS::Status;
 
 namespace Akregator
 {
@@ -254,7 +254,7 @@ namespace Akregator
             
         private slots:
 
-            void fetchCompleted(Loader *loader, Document doc, tqStatus status);
+            void fetchCompleted(Loader *loader, Document doc, Status status);
             void slotImageFetched(const TQPixmap& image);
 
         private:
@@ -265,10 +265,10 @@ namespace Akregator
             void setArticleDeleted(Article& a);
 
             /** notifies that article @c mya was changed
-                @param oldtqStatus if the status was changed, it contains the old status, -1 otherwise
+                @param oldStatus if the status was changed, it contains the old status, -1 otherwise
                 To be called by @ref Article
              */
-            void setArticleChanged(Article& a, int oldtqStatus=-1);
+            void setArticleChanged(Article& a, int oldStatus=-1);
             
             void enforceLimitArticleNumber();
 
diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp
index 1daf1aa6..e05aded8 100644
--- a/akregator/src/feedlist.cpp
+++ b/akregator/src/feedlist.cpp
@@ -222,10 +222,10 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after)
     if ( !flatList()->contains(parent) )
         parent = rootNode();
 
-    TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren();
+    TQValueList<TreeNode*> children = list->rootNode()->children();
 
-    TQValueList<TreeNode*>::ConstIterator end(  tqchildren.end() );
-    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
+    TQValueList<TreeNode*>::ConstIterator end(  children.end() );
+    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
     {
         list->rootNode()->removeChild(*it);
         parent->insertChild(*it, after);
@@ -254,11 +254,11 @@ TQDomDocument FeedList::toXML() const
     TQDomElement body = doc.createElement( "body" );
     root.appendChild( body );
 
-    TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren();
+    TQValueList<TreeNode*> children = rootNode()->children();
 
-    TQValueList<TreeNode*>::ConstIterator end(  tqchildren.end() );
+    TQValueList<TreeNode*>::ConstIterator end(  children.end() );
 
-    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
+    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
         body.appendChild( (*it)->toOPML(body, doc) );
 
     return doc;
diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index aa6101de..8998882f 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -180,8 +180,8 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor
         virtual bool visitFolder(Folder* node)
         {
             // delete child items recursively before deleting parent
-            TQValueList<TreeNode*> tqchildren = node->tqchildren();
-            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
+            TQValueList<TreeNode*> children = node->children();
+            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
                 visit(*it);
             
             visitTreeNode(node);
@@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
 
             }
             m_view->d->itemDict.insert(node, item);
-            TQValueList<TreeNode*> tqchildren = node->tqchildren();
+            TQValueList<TreeNode*> children = node->children();
 
-            // add tqchildren recursively
-            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
+            // add children recursively
+            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
                 visit(*it);
 
             m_view->connectToNode(node);
@@ -305,9 +305,9 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
             }
             m_view->d->itemDict.insert(node, item);
             
-            // add tqchildren recursively
-            TQValueList<TreeNode*> tqchildren = node->tqchildren();
-            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
+            // add children recursively
+            TQValueList<TreeNode*> children = node->children();
+            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
                 visit(*it);
 
             m_view->connectToNode(node);
diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h
index 52952089..8d4394e1 100644
--- a/akregator/src/feedlistview.h
+++ b/akregator/src/feedlistview.h
@@ -157,7 +157,7 @@ protected slots:
     
     /** Called when a node in the tree is taken out of the tree (parent->removeChild()) 
     
-    Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
+    Removes a node and its children from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
     virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
     
     /** deletes the item belonging to the deleted node */
diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h
index 32e6c058..98176756 100644
--- a/akregator/src/feedstorage.h
+++ b/akregator/src/feedstorage.h
@@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public TQObject
         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 setqStatus(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 5ae572a8..6fe97395 100644
--- a/akregator/src/feedstoragedummyimpl.cpp
+++ b/akregator/src/feedstoragedummyimpl.cpp
@@ -246,7 +246,7 @@ int FeedStorageDummyImpl::status(const TQString& guid)
     return contains(guid) ? d->entries[guid].status : 0;
 }
 
-void FeedStorageDummyImpl::setqStatus(const TQString& guid, int status)
+void FeedStorageDummyImpl::seStatus(const TQString& guid, int status)
 {
     if (contains(guid))
         d->entries[guid].status = status;
@@ -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));
-    setqStatus(guid, source->status(guid));
+    seStatus(guid, source->status(guid));
     setTitle(guid, source->title(guid));
     TQStringList tags = source->tags(guid);
     
diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h
index bd71a11c..fc9ab31f 100644
--- a/akregator/src/feedstoragedummyimpl.h
+++ b/akregator/src/feedstoragedummyimpl.h
@@ -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 setqStatus(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/folder.cpp b/akregator/src/folder.cpp
index 1d2c6a5c..739b0cf1 100644
--- a/akregator/src/folder.cpp
+++ b/akregator/src/folder.cpp
@@ -39,9 +39,9 @@ namespace Akregator {
 class Folder::FolderPrivate
 {
     public:
-        /** List of tqchildren */
-        TQValueList<TreeNode*> tqchildren;
-        /** caching unread count of tqchildren */
+        /** List of children */
+        TQValueList<TreeNode*> children;
+        /** caching unread count of children */
         int unread;
         /** whether or not the folder is expanded */
         bool open;
@@ -62,9 +62,9 @@ bool Folder::accept(TreeNodeVisitor* visitor)
 
 Folder* Folder::fromOPML(TQDomElement e)
 {
-    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() );
+    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() );
     return fg;
 }
 
@@ -77,7 +77,7 @@ Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate)
 Folder::~Folder()
 {
     TreeNode* tmp = 0;
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != d->tqchildren.end(); ++it)
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it)
     {
         delete tmp;
         tmp = *it;
@@ -93,8 +93,8 @@ Folder::~Folder()
 TQStringList Folder::tags() const
 {
     TQStringList t;
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
     {
         // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now.
         TQStringList t2 = (*it)->tags();
@@ -108,8 +108,8 @@ TQStringList Folder::tags() const
 TQValueList<Article> Folder::articles(const TQString& tag)
 {
     TQValueList<Article> seq;
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
         seq += (*it)->articles(tag);
      
     return seq;
@@ -123,21 +123,21 @@ TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const
     el.setAttribute("isOpen", d->open ? "true" : "false");
     el.setAttribute( "id", TQString::number(id()) );
 
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
         el.appendChild( (*it)->toOPML(el, document) );
         
     return el;
 }
 
-TQValueList<TreeNode*> Folder::tqchildren() const
+TQValueList<TreeNode*> Folder::children() const
 {
-    return d->tqchildren;
+    return d->children;
 }
 
 void Folder::insertChild(TreeNode* node, TreeNode* after)
 {
-    int pos = d->tqchildren.findIndex(after);
+    int pos = d->children.findIndex(after);
     
     if (pos < 0)
         prependChild(node);
@@ -150,10 +150,10 @@ void Folder::insertChild(uint index, TreeNode* node)
 //    kdDebug() << "enter Folder::insertChild(int, node) " << node->title() << endl;
     if (node)
     {
-        if (index >= d->tqchildren.size())
-            d->tqchildren.append(node);
+        if (index >= d->children.size())
+            d->children.append(node);
         else
-            d->tqchildren.insert(d->tqchildren.at(index), node);
+            d->children.insert(d->children.at(index), node);
         node->setParent(this);
         connectToNode(node);
         updateUnreadCount();
@@ -170,7 +170,7 @@ void Folder::appendChild(TreeNode* node)
 //    kdDebug() << "enter Folder::appendChild() " << node->title() << endl;
     if (node)
     {
-        d->tqchildren.append(node);
+        d->children.append(node);
         node->setParent(this);
         connectToNode(node);
         updateUnreadCount();
@@ -187,7 +187,7 @@ void Folder::prependChild(TreeNode* node)
 //    kdDebug() << "enter Folder::prependChild() " << node->title() << endl;
     if (node)
     {
-        d->tqchildren.prepend(node);
+        d->children.prepend(node);
         node->setParent(this);
         connectToNode(node);
         updateUnreadCount();
@@ -202,10 +202,10 @@ void Folder::prependChild(TreeNode* node)
 void Folder::removeChild(TreeNode* node)
 {
 //    kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl;
-    if (node && d->tqchildren.contains(node))
+    if (node && d->children.contains(node))
     {    
         node->setParent(0);
-        d->tqchildren.remove(node);
+        d->children.remove(node);
         disconnectFromNode(node);
         updateUnreadCount();    
         emit signalChildRemoved(this, node);
@@ -219,12 +219,12 @@ void Folder::removeChild(TreeNode* node)
 
 TreeNode* Folder::firstChild()
 {
-    return d->tqchildren.isEmpty() ? 0 : d->tqchildren.first();
+    return d->children.isEmpty() ? 0 : d->children.first();
 }            
 
 TreeNode* Folder::lastChild()
 {
-    return d->tqchildren.isEmpty() ? 0 : d->tqchildren.last();
+    return d->children.isEmpty() ? 0 : d->children.last();
 }
             
 bool Folder::isOpen() const
@@ -246,8 +246,8 @@ int Folder::totalCount() const
 {
     int totalCount = 0;
 
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
         totalCount += (*it)->totalCount();
     
     return totalCount;
@@ -257,8 +257,8 @@ void Folder::updateUnreadCount()
 {
     int unread = 0;
 
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
         unread += (*it)->unread();
     
     d->unread = unread;
@@ -267,8 +267,8 @@ void Folder::updateUnreadCount()
 void Folder::slotMarkAllArticlesAsRead() 
 {
     setNotificationMode(false);
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
         (*it)->slotMarkAllArticlesAsRead();
     setNotificationMode(true, true);
 }
@@ -281,7 +281,7 @@ void Folder::slotChildChanged(TreeNode* /*node*/)
 
 void Folder::slotChildDestroyed(TreeNode* node)
 {
-    d->tqchildren.remove(node);
+    d->children.remove(node);
     updateUnreadCount();    
     nodeModified();
 }
@@ -289,16 +289,16 @@ void Folder::slotChildDestroyed(TreeNode* node)
 void Folder::slotDeleteExpiredArticles()
 {
     setNotificationMode(false);
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
         (*it)->slotDeleteExpiredArticles();
     setNotificationMode(true, true);
 }
 
 void Folder::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
 {
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
         (*it)->slotAddToFetchQueue(queue, intervalFetchOnly);
 }
 
diff --git a/akregator/src/folder.h b/akregator/src/folder.h
index 6743dd57..f2a024dd 100644
--- a/akregator/src/folder.h
+++ b/akregator/src/folder.h
@@ -61,18 +61,18 @@ namespace Akregator
 
             virtual bool accept(TreeNodeVisitor* visitor);
             
-            /** returns recursively concatenated articles of tqchildren  
-            @return an article sequence containing articles of tqchildren */
+            /** returns recursively concatenated articles of children  
+            @return an article sequence containing articles of children */
             virtual TQValueList<Article> articles(const TQString& tag=TQString());
 
             /** returns a list of all tags occurring in the subtree of this folder */
             virtual TQStringList tags() const;
             
-            /** returns the number of unread articles in all tqchildren    
+            /** returns the number of unread articles in all children    
             @return number of unread articles */
             virtual int unread() const;
             
-            /** returns the number of articles in all tqchildren
+            /** returns the number of articles in all children
             @return number of articles */
             virtual int totalCount() const;
             
@@ -86,10 +86,10 @@ namespace Akregator
             @return The newly created element representing this feed group */
             virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
             
-            /** returns the (direct) tqchildren of this node.
+            /** returns the (direct) children of this node.
             @return a list of pointers to the child nodes
              */
-            virtual TQValueList<TreeNode*> tqchildren() const;
+            virtual TQValueList<TreeNode*> children() const;
             
             /** inserts @c node as child after child node @c after.
             if @c after is not a child of this group, @c node will be inserted as first child
@@ -105,7 +105,7 @@ namespace Akregator
             @param node the tree node to insert */
             virtual void appendChild(TreeNode* node);
 
-            /** remove @c node from tqchildren. Note that @c node will not be deleted
+            /** remove @c node from children. Note that @c node will not be deleted
             @param node the child node to remove  */
             virtual void removeChild(TreeNode* node);
 
@@ -134,7 +134,7 @@ namespace Akregator
             /** Delete expired articles recursively. */
             virtual void slotDeleteExpiredArticles();
             
-            /** Mark articles of tqchildren recursively as read. */
+            /** Mark articles of children recursively as read. */
             virtual void slotMarkAllArticlesAsRead();
  
             /** Called when a child was modified. 
@@ -147,7 +147,7 @@ namespace Akregator
             */
             virtual void slotChildDestroyed(TreeNode* node);
 
-            /** enqueues tqchildren recursively for fetching
+            /** enqueues children recursively for fetching
             @param queue a fetch queue 
             @param internvalFetchesOnly */
             virtual void slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchesOnly=false);
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index 647f580c..23cd86ef 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <tqregexp.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <kactioncollection.h>
 #include <kdebug.h>
@@ -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(), false);
-    m_progressItem->setqStatus(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->setqStatus(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->setqStatus(i18n("Loading completed"));
+        m_progressItem->seStatus(i18n("Loading completed"));
         m_progressItem->setComplete();
         m_progressItem = 0;
     }
diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h
index e12d6e8d..95dca1f6 100644
--- a/akregator/src/kcursorsaver.h
+++ b/akregator/src/kcursorsaver.h
@@ -17,9 +17,9 @@ namespace Akregator {
 class KCursorSaver : public TQt
 {
 public:
-    /// constructor taking TQCursor tqshapes
-    KCursorSaver(TQt::tqCursorShape tqshape) {
-        TQApplication::setOverrideCursor( TQCursor(tqshape) );
+    /// constructor taking TQCursor shapes
+    KCursorSaver(TQt::CursorShape shape) {
+        TQApplication::setOverrideCursor( TQCursor(shape) );
         inited = true;
     }
 
diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp
index 59949244..24413053 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::tqfromLatin1("link")) &&
-				(e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
+			if ( (e.tagName()==TQString::fromLatin1("link")) &&
+				(e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
 				{   
-					d->link=n.toElement().attribute(TQString::tqfromLatin1("href"));
+					d->link=n.toElement().attribute(TQString::fromLatin1("href"));
 					break;
 				}
 		}
 	}
 	else
 	{
-		if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
+		if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
 			d->link = elemText;
 	}
 
 
     // prefer content/content:encoded over summary/description for feeds that provide it
-    TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded");
+    TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded");
     
     if (!(elemText = extractNode(node, tagName, false)).isNull())
         d->description = elemText;
     
     if (d->description.isEmpty())
     {
-		if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull())
+		if (!(elemText = extractNode(node, TQString::fromLatin1("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::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
+			if (!(elemText = extractNode(node, TQString::fromLatin1((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::tqfromLatin1("updated"));
+            elemText = extractNode(node, TQString::fromLatin1("updated"));
         else
-           elemText = extractNode(node, TQString::tqfromLatin1("issued"));
+           elemText = extractNode(node, TQString::fromLatin1("issued"));
 
 		if (!elemText.isNull())
 			time = parseISO8601Date(elemText); 	
 	}
 	else 
 	{
-		elemText = extractNode(node, TQString::tqfromLatin1("pubDate"));
+		elemText = extractNode(node, TQString::fromLatin1("pubDate"));
 		if (!elemText.isNull())
 			time = KRFCDate::parseDate(elemText);
 	}
 	
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull())
+	if (!(elemText = extractNode(node, TQString::fromLatin1("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::tqfromLatin1("wfw:comment"))).isNull()) {
+	if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) {
 		d->commentsLink = elemText;
 	}
 
-    if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) {
+    if (!(elemText = extractNode(node, TQString::fromLatin1("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::tqfromLatin1("rdf:about")))
+    if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about")))
     {
-        d->guid = element.attribute(TQString::tqfromLatin1("rdf:about")); // HACK: using ns properly did not work
+        d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work
         d->guidIsPermaLink = false;
     }
     else
     {
-        tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid");
+        tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid");
         TQDomNode n = node.namedItem(tagName);
 	    if (!n.isNull())
         {
             d->guidIsPermaLink = (format==AtomFeed)? false : true;
-            if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
+            if (n.toElement().attribute(TQString::fromLatin1("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::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true");
+        d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true");
 	}
 
-    TQDomNode enclosure = element.namedItem(TQString::tqfromLatin1("enclosure"));
+    TQDomNode enclosure = element.namedItem(TQString::fromLatin1("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::tqfromLatin1("metaInfo:meta"))
+            if (i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta"))
             {
-                TQString type = i.toElement().attribute(TQString::tqfromLatin1("type"));
+                TQString type = i.toElement().attribute(TQString::fromLatin1("type"));
                 d->meta[type] = i.toElement().text();
             }
-            else if (i.toElement().tagName() == TQString::tqfromLatin1("category"))
+            else if (i.toElement().tagName() == TQString::fromLatin1("category"))
             {
                 d->categories.append(Category::fromXML(i.toElement()));
             }
diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp
index c020655c..7f6c70c2 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::tqfromLatin1("domain")))
-        obj.d->domain = e.attribute(TQString::tqfromLatin1("domain"));
+    if (e.hasAttribute(TQString::fromLatin1("domain")))
+        obj.d->domain = e.attribute(TQString::fromLatin1("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 610cec4c..6d6e1057 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::tqfromLatin1("link")) 
-                  && (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
+            if ( (e.tagName() == TQString::fromLatin1("link")) 
+                  && (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
             {   
-                return n.toElement().attribute(TQString::tqfromLatin1("href"));
+                return n.toElement().attribute(TQString::fromLatin1("href"));
             }
         }
     }
 
-    return extractNode(node, TQString::tqfromLatin1("link"));
+    return extractNode(node, TQString::fromLatin1("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::tqfromLatin1("html"))
+    if (rootNode.toElement().tagName()==TQString::fromLatin1("html"))
         d->valid=false;
     else
         d->valid=true;
     
-    attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString());
-    if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed"))
+    attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString());
+    if (rootNode.toElement().tagName()==TQString::fromLatin1("feed"))
     {
         d->format=AtomFeed;
-        if (attr == TQString::tqfromLatin1("0.3"))
+        if (attr == TQString::fromLatin1("0.3"))
             d->version = vAtom_0_3;
-        else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */
+        else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */
             d->version = vAtom_0_2;
-        else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */
+        else if (attr == TQString::fromLatin1("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::tqfromLatin1("0.91"))
+        if (attr == TQString::fromLatin1("0.91"))
             d->version = v0_91;
-        else if (attr == TQString::tqfromLatin1("0.92"))
+        else if (attr == TQString::fromLatin1("0.92"))
             d->version = v0_92;
-        else if (attr == TQString::tqfromLatin1("0.93"))
+        else if (attr == TQString::fromLatin1("0.93"))
             d->version = v0_93;
-        else if (attr == TQString::tqfromLatin1("0.94"))
+        else if (attr == TQString::fromLatin1("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::tqfromLatin1("xmlns"), TQString());
+        attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString());
         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::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
+            if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
                 d->format=RSSFeed;
                 d->version = v0_90;
              }
-            else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) {
+            else if (attr == TQString::fromLatin1("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::tqfromLatin1("channel"));
+        channelNode=rootNode.namedItem(TQString::fromLatin1("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::tqfromLatin1("item")).isNull())
+	if (!rootNode.namedItem(TQString::fromLatin1("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::tqfromLatin1("image"));
+    TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image"));
     if (!n.isNull())
         d->image = new Image(n);
 
-    n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
+    n = parentNode.namedItem(TQString::fromLatin1("textinput"));
     if (!n.isNull())
         d->textInput = new TextInput(n);
 
     // Our (hopefully faster) version of elementsByTagName()
     TQString tagName;
     if (d->format == AtomFeed)
-        tagName=TQString::tqfromLatin1("entry");
+        tagName=TQString::fromLatin1("entry");
     else
-        tagName=TQString::tqfromLatin1("item");
+        tagName=TQString::fromLatin1("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::tqfromLatin1("copyright"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull())
         d->copyright = elemText;
 
     if (d->format == AtomFeed)
-        elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString());
+        elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString());
     else
-        elemText = extractNode(channelNode, TQString::tqfromLatin1("language"));
+        elemText = extractNode(channelNode, TQString::fromLatin1("language"));
 
     if (!elemText.isNull()){
-        if (elemText == TQString::tqfromLatin1("af"))
+        if (elemText == TQString::fromLatin1("af"))
             d->language = af;
-        else if (elemText == TQString::tqfromLatin1("sq"))
+        else if (elemText == TQString::fromLatin1("sq"))
             d->language = sq;
-        else if (elemText == TQString::tqfromLatin1("eu"))
+        else if (elemText == TQString::fromLatin1("eu"))
             d->language = eu;
-        else if (elemText == TQString::tqfromLatin1("be"))
+        else if (elemText == TQString::fromLatin1("be"))
             d->language = be;
-        else if (elemText == TQString::tqfromLatin1("bg"))
+        else if (elemText == TQString::fromLatin1("bg"))
             d->language = bg;
-        else if (elemText == TQString::tqfromLatin1("ca"))
+        else if (elemText == TQString::fromLatin1("ca"))
             d->language = ca;
-        else if (elemText == TQString::tqfromLatin1("zh-cn"))
+        else if (elemText == TQString::fromLatin1("zh-cn"))
             d->language = zh_cn;
-        else if (elemText == TQString::tqfromLatin1("zh-tw"))
+        else if (elemText == TQString::fromLatin1("zh-tw"))
             d->language = zh_tw;
-        else if (elemText == TQString::tqfromLatin1("hr"))
+        else if (elemText == TQString::fromLatin1("hr"))
             d->language = hr;
-        else if (elemText == TQString::tqfromLatin1("cs"))
+        else if (elemText == TQString::fromLatin1("cs"))
             d->language = cs;
-        else if (elemText == TQString::tqfromLatin1("da"))
+        else if (elemText == TQString::fromLatin1("da"))
             d->language = da;
-        else if (elemText == TQString::tqfromLatin1("nl"))
+        else if (elemText == TQString::fromLatin1("nl"))
             d->language = nl;
-        else if (elemText == TQString::tqfromLatin1("nl-be"))
+        else if (elemText == TQString::fromLatin1("nl-be"))
             d->language = nl_be;
-        else if (elemText == TQString::tqfromLatin1("nl-nl"))
+        else if (elemText == TQString::fromLatin1("nl-nl"))
             d->language = nl_nl;
-        else if (elemText == TQString::tqfromLatin1("en"))
+        else if (elemText == TQString::fromLatin1("en"))
             d->language = en;
-        else if (elemText == TQString::tqfromLatin1("en-au"))
+        else if (elemText == TQString::fromLatin1("en-au"))
             d->language = en_au;
-        else if (elemText == TQString::tqfromLatin1("en-bz"))
+        else if (elemText == TQString::fromLatin1("en-bz"))
             d->language = en_bz;
-        else if (elemText == TQString::tqfromLatin1("en-ca"))
+        else if (elemText == TQString::fromLatin1("en-ca"))
             d->language = en_ca;
-        else if (elemText == TQString::tqfromLatin1("en-ie"))
+        else if (elemText == TQString::fromLatin1("en-ie"))
             d->language = en_ie;
-        else if (elemText == TQString::tqfromLatin1("en-jm"))
+        else if (elemText == TQString::fromLatin1("en-jm"))
             d->language = en_jm;
-        else if (elemText == TQString::tqfromLatin1("en-nz"))
+        else if (elemText == TQString::fromLatin1("en-nz"))
             d->language = en_nz;
-        else if (elemText == TQString::tqfromLatin1("en-ph"))
+        else if (elemText == TQString::fromLatin1("en-ph"))
             d->language = en_ph;
-        else if (elemText == TQString::tqfromLatin1("en-za"))
+        else if (elemText == TQString::fromLatin1("en-za"))
             d->language = en_za;
-        else if (elemText == TQString::tqfromLatin1("en-tt"))
+        else if (elemText == TQString::fromLatin1("en-tt"))
             d->language = en_tt;
-        else if (elemText == TQString::tqfromLatin1("en-gb"))
+        else if (elemText == TQString::fromLatin1("en-gb"))
             d->language = en_gb;
-        else if (elemText == TQString::tqfromLatin1("en-us"))
+        else if (elemText == TQString::fromLatin1("en-us"))
             d->language = en_us;
-        else if (elemText == TQString::tqfromLatin1("en-zw"))
+        else if (elemText == TQString::fromLatin1("en-zw"))
             d->language = en_zw;
-        else if (elemText == TQString::tqfromLatin1("fo"))
+        else if (elemText == TQString::fromLatin1("fo"))
             d->language = fo;
-        else if (elemText == TQString::tqfromLatin1("fi"))
+        else if (elemText == TQString::fromLatin1("fi"))
             d->language = fi;
-        else if (elemText == TQString::tqfromLatin1("fr"))
+        else if (elemText == TQString::fromLatin1("fr"))
             d->language = fr;
-        else if (elemText == TQString::tqfromLatin1("fr-be"))
+        else if (elemText == TQString::fromLatin1("fr-be"))
             d->language = fr_be;
-        else if (elemText == TQString::tqfromLatin1("fr-ca"))
+        else if (elemText == TQString::fromLatin1("fr-ca"))
             d->language = fr_ca;
-        else if (elemText == TQString::tqfromLatin1("fr-fr"))
+        else if (elemText == TQString::fromLatin1("fr-fr"))
             d->language = fr_fr;
-        else if (elemText == TQString::tqfromLatin1("fr-lu"))
+        else if (elemText == TQString::fromLatin1("fr-lu"))
             d->language = fr_lu;
-        else if (elemText == TQString::tqfromLatin1("fr-mc"))
+        else if (elemText == TQString::fromLatin1("fr-mc"))
             d->language = fr_mc;
-        else if (elemText == TQString::tqfromLatin1("fr-ch"))
+        else if (elemText == TQString::fromLatin1("fr-ch"))
             d->language = fr_ch;
-        else if (elemText == TQString::tqfromLatin1("gl"))
+        else if (elemText == TQString::fromLatin1("gl"))
             d->language = gl;
-        else if (elemText == TQString::tqfromLatin1("gd"))
+        else if (elemText == TQString::fromLatin1("gd"))
             d->language = gd;
-        else if (elemText == TQString::tqfromLatin1("de"))
+        else if (elemText == TQString::fromLatin1("de"))
             d->language = de;
-        else if (elemText == TQString::tqfromLatin1("de-at"))
+        else if (elemText == TQString::fromLatin1("de-at"))
             d->language = de_at;
-        else if (elemText == TQString::tqfromLatin1("de-de"))
+        else if (elemText == TQString::fromLatin1("de-de"))
             d->language = de_de;
-        else if (elemText == TQString::tqfromLatin1("de-li"))
+        else if (elemText == TQString::fromLatin1("de-li"))
             d->language = de_li;
-        else if (elemText == TQString::tqfromLatin1("de-lu"))
+        else if (elemText == TQString::fromLatin1("de-lu"))
             d->language = de_lu;
-        else if (elemText == TQString::tqfromLatin1("de-ch"))
+        else if (elemText == TQString::fromLatin1("de-ch"))
             d->language = de_ch;
-        else if (elemText == TQString::tqfromLatin1("el"))
+        else if (elemText == TQString::fromLatin1("el"))
             d->language = el;
-        else if (elemText == TQString::tqfromLatin1("hu"))
+        else if (elemText == TQString::fromLatin1("hu"))
             d->language = hu;
-        else if (elemText == TQString::tqfromLatin1("is"))
+        else if (elemText == TQString::fromLatin1("is"))
             d->language = is;
-        else if (elemText == TQString::tqfromLatin1("id"))
+        else if (elemText == TQString::fromLatin1("id"))
             d->language = id;
-        else if (elemText == TQString::tqfromLatin1("ga"))
+        else if (elemText == TQString::fromLatin1("ga"))
             d->language = ga;
-        else if (elemText == TQString::tqfromLatin1("it"))
+        else if (elemText == TQString::fromLatin1("it"))
             d->language = it;
-        else if (elemText == TQString::tqfromLatin1("it-it"))
+        else if (elemText == TQString::fromLatin1("it-it"))
             d->language = it_it;
-        else if (elemText == TQString::tqfromLatin1("it-ch"))
+        else if (elemText == TQString::fromLatin1("it-ch"))
             d->language = it_ch;
-        else if (elemText == TQString::tqfromLatin1("ja"))
+        else if (elemText == TQString::fromLatin1("ja"))
             d->language = ja;
-        else if (elemText == TQString::tqfromLatin1("ko"))
+        else if (elemText == TQString::fromLatin1("ko"))
             d->language = ko;
-        else if (elemText == TQString::tqfromLatin1("mk"))
+        else if (elemText == TQString::fromLatin1("mk"))
             d->language = mk;
-        else if (elemText == TQString::tqfromLatin1("no"))
+        else if (elemText == TQString::fromLatin1("no"))
             d->language = no;
-        else if (elemText == TQString::tqfromLatin1("pl"))
+        else if (elemText == TQString::fromLatin1("pl"))
             d->language = pl;
-        else if (elemText == TQString::tqfromLatin1("pt"))
+        else if (elemText == TQString::fromLatin1("pt"))
             d->language = pt;
-        else if (elemText == TQString::tqfromLatin1("pt-br"))
+        else if (elemText == TQString::fromLatin1("pt-br"))
             d->language = pt_br;
-        else if (elemText == TQString::tqfromLatin1("pt-pt"))
+        else if (elemText == TQString::fromLatin1("pt-pt"))
             d->language = pt_pt;
-        else if (elemText == TQString::tqfromLatin1("ro"))
+        else if (elemText == TQString::fromLatin1("ro"))
             d->language = ro;
-        else if (elemText == TQString::tqfromLatin1("ro-mo"))
+        else if (elemText == TQString::fromLatin1("ro-mo"))
             d->language = ro_mo;
-        else if (elemText == TQString::tqfromLatin1("ro-ro"))
+        else if (elemText == TQString::fromLatin1("ro-ro"))
             d->language = ro_ro;
-        else if (elemText == TQString::tqfromLatin1("ru"))
+        else if (elemText == TQString::fromLatin1("ru"))
             d->language = ru;
-        else if (elemText == TQString::tqfromLatin1("ru-mo"))
+        else if (elemText == TQString::fromLatin1("ru-mo"))
             d->language = ru_mo;
-        else if (elemText == TQString::tqfromLatin1("ru-ru"))
+        else if (elemText == TQString::fromLatin1("ru-ru"))
             d->language = ru_ru;
-        else if (elemText == TQString::tqfromLatin1("sr"))
+        else if (elemText == TQString::fromLatin1("sr"))
             d->language = sr;
-        else if (elemText == TQString::tqfromLatin1("sk"))
+        else if (elemText == TQString::fromLatin1("sk"))
             d->language = sk;
-        else if (elemText == TQString::tqfromLatin1("sl"))
+        else if (elemText == TQString::fromLatin1("sl"))
             d->language = sl;
-        else if (elemText == TQString::tqfromLatin1("es"))
+        else if (elemText == TQString::fromLatin1("es"))
             d->language = es;
-        else if (elemText == TQString::tqfromLatin1("es-ar"))
+        else if (elemText == TQString::fromLatin1("es-ar"))
             d->language = es_ar;
-        else if (elemText == TQString::tqfromLatin1("es-bo"))
+        else if (elemText == TQString::fromLatin1("es-bo"))
             d->language = es_bo;
-        else if (elemText == TQString::tqfromLatin1("es-cl"))
+        else if (elemText == TQString::fromLatin1("es-cl"))
             d->language = es_cl;
-        else if (elemText == TQString::tqfromLatin1("es-co"))
+        else if (elemText == TQString::fromLatin1("es-co"))
             d->language = es_co;
-        else if (elemText == TQString::tqfromLatin1("es-cr"))
+        else if (elemText == TQString::fromLatin1("es-cr"))
             d->language = es_cr;
-        else if (elemText == TQString::tqfromLatin1("es-do"))
+        else if (elemText == TQString::fromLatin1("es-do"))
             d->language = es_do;
-        else if (elemText == TQString::tqfromLatin1("es-ec"))
+        else if (elemText == TQString::fromLatin1("es-ec"))
             d->language = es_ec;
-        else if (elemText == TQString::tqfromLatin1("es-sv"))
+        else if (elemText == TQString::fromLatin1("es-sv"))
             d->language = es_sv;
-        else if (elemText == TQString::tqfromLatin1("es-gt"))
+        else if (elemText == TQString::fromLatin1("es-gt"))
             d->language = es_gt;
-        else if (elemText == TQString::tqfromLatin1("es-hn"))
+        else if (elemText == TQString::fromLatin1("es-hn"))
             d->language = es_hn;
-        else if (elemText == TQString::tqfromLatin1("es-mx"))
+        else if (elemText == TQString::fromLatin1("es-mx"))
             d->language = es_mx;
-        else if (elemText == TQString::tqfromLatin1("es-ni"))
+        else if (elemText == TQString::fromLatin1("es-ni"))
             d->language = es_ni;
-        else if (elemText == TQString::tqfromLatin1("es-pa"))
+        else if (elemText == TQString::fromLatin1("es-pa"))
             d->language = es_pa;
-        else if (elemText == TQString::tqfromLatin1("es-py"))
+        else if (elemText == TQString::fromLatin1("es-py"))
             d->language = es_py;
-        else if (elemText == TQString::tqfromLatin1("es-pe"))
+        else if (elemText == TQString::fromLatin1("es-pe"))
             d->language = es_pe;
-        else if (elemText == TQString::tqfromLatin1("es-pr"))
+        else if (elemText == TQString::fromLatin1("es-pr"))
             d->language = es_pr;
-        else if (elemText == TQString::tqfromLatin1("es-es"))
+        else if (elemText == TQString::fromLatin1("es-es"))
             d->language = es_es;
-        else if (elemText == TQString::tqfromLatin1("es-uy"))
+        else if (elemText == TQString::fromLatin1("es-uy"))
             d->language = es_uy;
-        else if (elemText == TQString::tqfromLatin1("es-ve"))
+        else if (elemText == TQString::fromLatin1("es-ve"))
             d->language = es_ve;
-        else if (elemText == TQString::tqfromLatin1("sv"))
+        else if (elemText == TQString::fromLatin1("sv"))
             d->language = sv;
-        else if (elemText == TQString::tqfromLatin1("sv-fi"))
+        else if (elemText == TQString::fromLatin1("sv-fi"))
             d->language = sv_fi;
-        else if (elemText == TQString::tqfromLatin1("sv-se"))
+        else if (elemText == TQString::fromLatin1("sv-se"))
             d->language = sv_se;
-        else if (elemText == TQString::tqfromLatin1("tr"))
+        else if (elemText == TQString::fromLatin1("tr"))
             d->language = tr;
-        else if (elemText == TQString::tqfromLatin1("uk"))
+        else if (elemText == TQString::fromLatin1("uk"))
             d->language = uk;
         else
             d->language = UndefinedLanguage;
     }
 
     if (d->format == AtomFeed)
-        tagName=TQString::tqfromLatin1("issued"); // atom doesn't specify this for feeds
+        tagName=TQString::fromLatin1("issued"); // atom doesn't specify this for feeds
                                                // but some broken feeds do this
     else
-        tagName=TQString::tqfromLatin1("pubDate");
+        tagName=TQString::fromLatin1("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::tqfromLatin1("dc:date"))).isNull()) {
+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("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::tqfromLatin1("modified");
+        tagName=TQString::fromLatin1("modified");
     else
-        tagName=TQString::tqfromLatin1("lastBuildDate");
+        tagName=TQString::fromLatin1("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::tqfromLatin1("rating"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull())
         d->rating = elemText;
-    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull())
         d->docs = elemText;
-    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
         d->managingEditor = elemText;
-    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull())
         d->webMaster = elemText;
 
-	if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("ttl"))).isNull())
+	if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull())
         d->ttl = elemText.toUInt();
 
-    n = channelNode.namedItem(TQString::tqfromLatin1("skipHours"));
+    n = channelNode.namedItem(TQString::fromLatin1("skipHours"));
     if (!n.isNull())
         for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
-            if (e.tagName() == TQString::tqfromLatin1("hour"))
+            if (e.tagName() == TQString::fromLatin1("hour"))
                 d->skipHours.append(e.text().toUInt());
 
-    n = channelNode.namedItem(TQString::tqfromLatin1("skipDays"));
+    n = channelNode.namedItem(TQString::fromLatin1("skipDays"));
     if (!n.isNull()) {
         Day day;
         TQString elemText;
         for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
-            if (e.tagName() == TQString::tqfromLatin1("day")) {
+            if (e.tagName() == TQString::fromLatin1("day")) {
                 elemText = e.text().lower();
-                if (elemText == TQString::tqfromLatin1("monday"))
+                if (elemText == TQString::fromLatin1("monday"))
                     day = Monday;
-                else if (elemText == TQString::tqfromLatin1("tuesday"))
+                else if (elemText == TQString::fromLatin1("tuesday"))
                     day = Tuesday;
-                else if (elemText == TQString::tqfromLatin1("wednesday"))
+                else if (elemText == TQString::fromLatin1("wednesday"))
                     day = Wednesday;
-                else if (elemText == TQString::tqfromLatin1("thursday"))
+                else if (elemText == TQString::fromLatin1("thursday"))
                     day = Thursday;
-                else if (elemText == TQString::tqfromLatin1("friday"))
+                else if (elemText == TQString::fromLatin1("friday"))
                     day = Friday;
-                else if (elemText == TQString::tqfromLatin1("saturday"))
+                else if (elemText == TQString::fromLatin1("saturday"))
                     day = Saturday;
-                else if (elemText == TQString::tqfromLatin1("sunday"))
+                else if (elemText == TQString::fromLatin1("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::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");
+        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");
     }
     return TQString();
 }
diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp
index 66616268..e048fa88 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::tqfromLatin1("url")))
-        url = e.attribute(TQString::tqfromLatin1("url"));
+    if (e.hasAttribute(TQString::fromLatin1("url")))
+        url = e.attribute(TQString::fromLatin1("url"));
     
-    if (e.hasAttribute(TQString::tqfromLatin1("length")))
+    if (e.hasAttribute(TQString::fromLatin1("length")))
     {
         bool ok;
-        int c = e.attribute(TQString::tqfromLatin1("length")).toInt(&ok);
+        int c = e.attribute(TQString::fromLatin1("length")).toInt(&ok);
         length = ok ? c : -1;
     }
-    if (e.hasAttribute(TQString::tqfromLatin1("type")))
-        type = e.attribute(TQString::tqfromLatin1("type"));
+    if (e.hasAttribute(TQString::fromLatin1("type")))
+        type = e.attribute(TQString::fromLatin1("type"));
 
     return Enclosure(url, length, type);
 }
 
 TQDomElement Enclosure::toXML(TQDomDocument document) const
 {
-    TQDomElement e = document.createElement(TQString::tqfromLatin1("enclosure"));
+    TQDomElement e = document.createElement(TQString::fromLatin1("enclosure"));
     if (!d->url.isNull())
-        e.setAttribute(TQString::tqfromLatin1("url"), d->url);
+        e.setAttribute(TQString::fromLatin1("url"), d->url);
     if (d->length != -1)
-        e.setAttribute(TQString::tqfromLatin1("length"), TQString::number(d->length));
+        e.setAttribute(TQString::fromLatin1("length"), TQString::number(d->length));
     if (!d->type.isNull())
-        e.setAttribute(TQString::tqfromLatin1("type"), d->type);
+        e.setAttribute(TQString::fromLatin1("type"), d->type);
 
     return e;
 }
diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h
index c714f566..091018cb 100644
--- a/akregator/src/librss/global.h
+++ b/akregator/src/librss/global.h
@@ -42,7 +42,7 @@ namespace RSS
 	 * Possible status values returned by the signal
 	 * Loader::loadingComplete().
 	 */
-	enum tqStatus {
+	enum Status {
 		Success,	   /**
 						* Nothing went wrong so far, but you still have to check
 						* what values are returned by the classes since it's not
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index 98074be3..cb8d7c86 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::tqfromLatin1("title"))).isNull())
+	if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
 		d->title = elemText;
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull())
+	if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull())
 		d->url = elemText;
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
+	if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
 		d->link = elemText;
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
+	if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
 		d->description = elemText;
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull())
+	if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull())
 		d->height = elemText.toUInt();
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull())
+	if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull())
 		d->width = elemText.toUInt();
 }
 
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index edc38432..5fad1409 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -268,7 +268,7 @@ Loader *Loader::create()
 Loader *Loader::create(TQObject *object, const char *slot)
 {
    Loader *loader = create();
-   connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
+   connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
            object, slot);
    return loader;
 }
@@ -326,7 +326,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success)
    d->retriever = NULL;
 
    Document rssDoc;
-   tqStatus status = Success;
+   Status status = Success;
 
    if (success) {
       TQDomDocument doc;
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index 2129bc79..59f47c9c 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/loader.h
@@ -211,8 +211,8 @@ namespace RSS
 	 *
 	 * \code
 	 * Loader *loader = Loader::create();
-	 * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
-	 *         this, TQT_SLOT(slotLoadingComplete(Loader *, Document, tqStatus)));
+	 * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
+	 *         this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status)));
 	 * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever);
 	 * \endcode
 	 *
@@ -236,7 +236,7 @@ namespace RSS
 	 * 'slotLoadingComplete' method might look like this:
 	 *
 	 * \code
-	 * void MyClass::slotLoadingComplete(Loader *loader, Document doc, tqStatus status)
+	 * void MyClass::slotLoadingComplete(Loader *loader, Document doc, Status status)
 	 * {
 	 *     // Note that Loader::~Loader() is private, so you cannot delete Loader instances.
 	 *     // You don't need to do that anyway since Loader instances delete themselves.
@@ -322,9 +322,9 @@ namespace RSS
 			 * the case if you intend to call getPixmap() on Document::image()!
 			 * @param status A status byte telling whether there were any problems
 			 * while retrieving or parsing the data.
-			 * @see Document, tqStatus
+			 * @see Document, Status
 			 */
-			void loadingComplete(Loader *loader, Document doc, tqStatus status);
+			void loadingComplete(Loader *loader, Document doc, Status status);
 
 		private slots:
 			void slotRetrieverDone(const TQByteArray &data, bool success);
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index 571717ae..7d88c3d1 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -19,12 +19,12 @@ static const KCmdLineOptions options[] =
 void Tester::test( const TQString &url )
 {
 	Loader *loader = Loader::create();
-	connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ),
-	         this, TQT_SLOT( slotLoadingComplete( Loader *, Document, tqStatus ) ) );
+	connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
+	         this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
 	loader->loadFrom( url, new FileRetriever );
 }
 
-void Tester::slotLoadingComplete( Loader *loader, Document doc, tqStatus status )
+void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
 {
 	if ( status == Success )
 	{
diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h
index 18e18327..3d3e963b 100644
--- a/akregator/src/librss/testlibrss.h
+++ b/akregator/src/librss/testlibrss.h
@@ -10,7 +10,7 @@
 
 using RSS::Loader;
 using RSS::Document;
-using RSS::tqStatus;
+using RSS::Status;
 
 class Tester : public TQObject
 {
@@ -20,7 +20,7 @@ class Tester : public TQObject
 		void test( const TQString &url );
 
 	private slots:
-		void slotLoadingComplete( Loader *loader, Document doc, tqStatus status );
+		void slotLoadingComplete( Loader *loader, Document doc, Status status );
 };
 
 #endif
diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp
index a12442fa..04799fca 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::tqfromLatin1("title"))).isNull())
+	if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
 		d->title = elemText;
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
+	if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
 		d->description = elemText;
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("name"))))
+	if (!(elemText = extractNode(node, TQString::fromLatin1("name"))))
 		d->name = elemText;
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
+	if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
 		d->link = elemText;
 }
 
diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp
index c4daa056..bd8ce39b 100644
--- a/akregator/src/librss/tools_p.cpp
+++ b/akregator/src/librss/tools_p.cpp
@@ -69,8 +69,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
         return HTML;
     
     if (type == TQString::fromUtf8("text")
-        || (type.tqstartsWith(TQString::fromUtf8("text/"), false)
-        && !type.tqstartsWith(TQString::fromUtf8("text/xml"), false))
+        || (type.startsWith(TQString::fromUtf8("text/"), false)
+        && !type.startsWith(TQString::fromUtf8("text/xml"), false))
        )
         return Text;
     
@@ -85,8 +85,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
     
     
     if (xmltypes.contains(type)
-        || type.tqendsWith(TQString::fromUtf8("+xml"), false)
-        || type.tqendsWith(TQString::fromUtf8("/xml"), false))
+        || type.endsWith(TQString::fromUtf8("+xml"), false)
+        || type.endsWith(TQString::fromUtf8("/xml"), false))
         return XML;
     
     return Binary;
@@ -145,7 +145,7 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI
 
 TQString extractTitle(const TQDomNode & parent)
 {
-    TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title"));
+    TQDomNode node = parent.namedItem(TQString::fromLatin1("title"));
     if (node.isNull())
         return TQString();
 
@@ -239,7 +239,7 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver
         name = email;
     
     if (!email.isNull())
-        return TQString("<a href=\"mailto:%1\">%2</a>").tqarg(email).tqarg(name);
+        return TQString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name);
     else
         return name;
 }
diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp
index a137f1fe..59e713b5 100644
--- a/akregator/src/listtabwidget.cpp
+++ b/akregator/src/listtabwidget.cpp
@@ -30,7 +30,7 @@
 #include <kmultitabbar.h>
 
 #include <tqiconset.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
@@ -52,7 +52,7 @@ public:
     int currentID;
     TQValueList<NodeListView*> views;
     TQMap<int, NodeListView*> idToView;
-    TQHBoxLayout* tqlayout;
+    TQHBoxLayout* layout;
     ViewMode viewMode;
     TQMap<TQWidget*, TQString> captions;
 };
@@ -125,7 +125,7 @@ void ListTabWidget::slotRootNodeChanged(NodeListView* view, TreeNode* node)
     if (unread > 0)
     {
         //uncomment this to append unread count
-        //d->tabWidget->changeTab(view,  TQString("<qt>%1 (%2)").tqarg(d->captions[view]).tqarg(node->unread()));
+        //d->tabWidget->changeTab(view,  TQString("<qt>%1 (%2)").arg(d->captions[view]).arg(node->unread()));
         d->tabWidget->changeTab(view, d->captions[view]);
     }
     else
@@ -158,17 +158,17 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare
     d->current = 0;
     d->currentID = -1;
     d->viewMode = verticalTabs;
-    d->tqlayout = new TQHBoxLayout(this);
-    //d->tqlayout = new TQGridLayout(this, 1, 2);
+    d->layout = new TQHBoxLayout(this);
+    //d->layout = 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->tqlayout->addWidget(d->tabBar/*, 0, 0*/);
+    d->layout->addWidget(d->tabBar/*, 0, 0*/);
 
     d->stack = new TQWidgetStack(this);
-    d->tqlayout->addWidget(d->stack/*, 0, 1*/);
+    d->layout->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 2a820128..77260872 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(TQt::RichText);
-    m_statusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+    m_statusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
     m_statusLabel->setMinimumWidth( 0 );
     m_statusLabel->setFixedHeight( statH );
     statusBar()->addWidget (m_statusLabel, 1, false);
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index 75ee1e2f..32af9096 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid)
     return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0;
 }
 
-void FeedStorageMK4Impl::setqStatus(const TQString& guid, int status)
+void FeedStorageMK4Impl::seStatus(const TQString& guid, int status)
 {
     int findidx = findArticle(guid);
     if (findidx == -1)
@@ -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));
-    setqStatus(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 057ba2e7..6dff8283 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.h
+++ b/akregator/src/mk4storage/feedstoragemk4impl.h
@@ -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 setqStatus(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/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index 4f167afb..160c4bad 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -211,9 +211,9 @@
    One was in SCXX, PWONumber.h - ouch and apologies (jcw).  Changed
    comparison logic in mk4too.cpp (64-bit ints, new code).
 
-2003-02-28    Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes
+2003-02-28    Fixed relaxed layout in Mk4tcl, several Mk4py fixes
 
-   Use list operators to convert a Tcl tqlayout to MK format.  This used
+   Use list operators to convert a Tcl layout to MK format.  This used
    to crash, Tcl test 6.7 added to verify the fix.  Changed test 3.1 to
    use a different notation for nested defs (^).
 
@@ -605,13 +605,13 @@
    c4_Storage::SaveTo function, memo's would sometimes not be written,
    leading to a *damaged* datafile (and incorrect free-space tracking).
 
-2002-03-15    Better configure logic, "mk::view tqlayout" fix
+2002-03-15    Better configure logic, "mk::view layout" fix
 
    Many tweaks to configures, makes, and libtool setup.  Get rid of the
    library version numbers and the special Mk4*.so targets.  Instead of
    Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so).
 
-   Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change.
+   Fixed "mk::view layout", it was broken by the 10-2-2002 change.
 
 2002-03-13    Extend partial access 'B' usage
 
@@ -658,9 +658,9 @@
    causing it to detach empty top-level views, even when in use.  Fixed,
    added s39 to test for this case.
 
-2002-02-10    Improve Mk4tcl's "mk::view tqlayout"
+2002-02-10    Improve Mk4tcl's "mk::view layout"
 
-   Avoid crash when asking for the tqlayout of a non-existent view.  Now
+   Avoid crash when asking for the layout of a non-existent view.  Now
    returns an error instead.
 
 2002-02-07    Fast commit with many empty subviews
@@ -996,9 +996,9 @@
     M-solaris.sh and M-dyn.sh scripts need to be manually edited when
     choosing between CC and gcc.
 
-2001-03-27    Double-tqalignment bug on Solaris
+2001-03-27    Double-alignment bug on Solaris
 
-    Two changes (c4_Bytes in mk4.h and src/column.h) to fix an tqalignment
+    Two changes (c4_Bytes in mk4.h and src/column.h) to fix an alignment
     problem for 8-byte doubles on Solaris.  This caused tests b17, b23,
     b24, s22, and s28 to fail.
 
@@ -1084,7 +1084,7 @@
 
 2000-10-03    Fixes for Alpha Unix
 
-    Moved _item in column.h up to fix tqalignment sensitivity.  Config.h
+    Moved _item in column.h up to fix alignment sensitivity.  Config.h
     did not get SIZE_LONG right on Alpha Unix (0?).
 
 2000-09-27    Contributed fixes and Python 2.0b2
@@ -1614,7 +1614,7 @@
     new version in c4_Sequence allocate the c4_Bytes object lazily.
     Faster, and decreases sequence object size (for lots of subviews).
 
-    Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views
+    Mk4tcl, mk::layout now returns the proper layout even if the views
     are empty.  Solved by adding extra arg to c4_Storage::Description,
     to return structure of a single top-level view.  Fixes "mk8basic.1",
     and the returned string now has one bogus list layer stripped off.
diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README
index 314c956b..21edd0fc 100644
--- a/akregator/src/mk4storage/metakit/README
+++ b/akregator/src/mk4storage/metakit/README
@@ -40,7 +40,7 @@ WEBSITE URLS - The main pages on the world wide web, for news and downloads:
     License info:   http://www.equi4.com/mklicense.html
     Contact info:   http://www.equi4.com/contact.html
 
-ACKNOWLEDGEMENTS - Thanks to everyone who has helped tqshape and extend Metakit,
+ACKNOWLEDGEMENTS - Thanks to everyone who has helped shape and extend Metakit,
     including Kyrill Denisenko, Mark Roseman, Gordon McMillan, Matt Newman,
     Christian Tismer, John Bushakra, Steve Landers, Jacob Levy, John Barnard,
     Nicholas Riley, Brian Kelley, and many more people who have reported bugs
diff --git a/akregator/src/mk4storage/metakit/src/column.h b/akregator/src/mk4storage/metakit/src/column.h
index 96d1622e..3f6e4f15 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 tqalignment!)
+  t4_byte _item[8]; // holds temp result (careful with alignment!)
   double _aligner;  // needed for SPARC
   };
 
diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp
index 2cd5f084..0725f57f 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 tqlayout (free space, file positions, flat vs. on-demand).
+// depend on file layout (free space, file positions, flat vs. on-demand).
 
 static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0)
 {
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index e2b8c63a..c5c837a5 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -46,7 +46,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -74,7 +74,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -90,7 +90,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>140</width>
                             <height>20</height>
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index 6bcee5f6..e79acb20 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -165,9 +165,9 @@ void NodeList::clear()
 {
     Q_ASSERT(rootNode());
     
-    TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren();
+    TQValueList<TreeNode*> children = rootNode()->children();
 
-    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
+    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it)
         delete *it; // emits signal "emitSignalDestroyed"
 }
 
diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp
index ce4251b8..6220e97c 100644
--- a/akregator/src/notificationmanager.cpp
+++ b/akregator/src/notificationmanager.cpp
@@ -76,7 +76,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds)
     if (feeds.count() == 1)
     {
         KNotifyClient::Instance inst(m_instance);
-        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").tqarg(feeds[0]));
+        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").arg(feeds[0]));
     }
     else if (feeds.count() > 1)
     {
@@ -84,7 +84,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds)
         for (TQStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it)
             message += *it + "\n";
         KNotifyClient::Instance inst(m_instance);
-        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").tqarg(message));
+        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message));
     }
 }
 
@@ -99,7 +99,7 @@ void NotificationManager::doNotify()
         if (feedTitle != (*it).feed()->title())
         {
             feedTitle = (*it).feed()->title();
-            message += TQString("<p><b>%1:</b></p>").tqarg(feedTitle);
+            message += TQString("<p><b>%1:</b></p>").arg(feedTitle);
         }
         message += (*it).title() + "<br>";
     }
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 7a042391..df96d80f 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -44,7 +44,7 @@
 #include <kstdaccel.h>
 #include <kparts/browserinterface.h>
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tqdatetime.h>
@@ -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.tqstartsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
+    if (url.startsWith(TQString::fromLatin1( "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->tqmetaObject()->findSlot("reparseConfiguration()");
+    int id = obj->metaObject()->findSlot("reparseConfiguration()");
     if (id == -1)
         return;
     TQUObject o[1];
@@ -430,7 +430,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
     if (isLink)
     {
         idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab()));
-        popup.tqsetWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
+        popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
         popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser()));
                 
         popup.insertSeparator();
diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp
index 108fcf9b..d12016d4 100644
--- a/akregator/src/pluginmanager.cpp
+++ b/akregator/src/pluginmanager.cpp
@@ -92,8 +92,8 @@ PluginManager::createFromService( const KService::Ptr service )
     if ( !lib ) {
         KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>"
                                      "<p>Error message:<br/><i>%2</i></p>" )
-                               .tqarg( service->library() )
-                               .tqarg( loader->lastErrorMessage() ) );
+                               .arg( service->library() )
+                               .arg( loader->lastErrorMessage() ) );
         return 0;
     }
     //look up address of init function and cast it to pointer-to-function
@@ -167,12 +167,12 @@ PluginManager::showAbout( const TQString &constraint )
 
     TQString str  = "<html><body><table width=\"100%\" border=\"1\">";
 
-    str += body.tqarg( i18n( "Name" ),                s->name() );
-    str += body.tqarg( i18n( "Library" ),             s->library() );
-    str += body.tqarg( i18n( "Authors" ),             s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) );
-    str += body.tqarg( i18n( "Email" ),               s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) );
-    str += body.tqarg( i18n( "Version" ),             s->property( "X-KDE-akregator-version" ).toString() );
-    str += body.tqarg( i18n( "Framework Version" ),   s->property( "X-KDE-akregator-framework-version" ).toString() );
+    str += body.arg( i18n( "Name" ),                s->name() );
+    str += body.arg( i18n( "Library" ),             s->library() );
+    str += body.arg( i18n( "Authors" ),             s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) );
+    str += body.arg( i18n( "Email" ),               s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) );
+    str += body.arg( i18n( "Version" ),             s->property( "X-KDE-akregator-version" ).toString() );
+    str += body.arg( i18n( "Framework Version" ),   s->property( "X-KDE-akregator-framework-version" ).toString() );
 
     str += "</table></body></html>";
 
diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp
index 7831a24f..b83faca3 100644
--- a/akregator/src/progressmanager.cpp
+++ b/akregator/src/progressmanager.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <tqmap.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <klocale.h>
 #include <kstaticdeleter.h>
@@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted()
 {
     if (d->progressItem)
     {
-        d->progressItem->setqStatus(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->setqStatus(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->setqStatus(i18n("Fetch aborted"));
+        d->progressItem->seStatus(i18n("Fetch aborted"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp
index b5b732ba..a0f13c47 100644
--- a/akregator/src/propertiesdialog.cpp
+++ b/akregator/src/propertiesdialog.cpp
@@ -102,7 +102,7 @@ void FeedPropertiesDialog::slotSetCaption(const TQString& c)
     if(c.isEmpty())
         setCaption(i18n("Feed Properties"));
     else
-        setCaption(i18n("Properties of %1").tqarg(c));
+        setCaption(i18n("Properties of %1").arg(c));
 
 }
 
diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui
index 14adeb00..4ab1ea91 100644
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@@ -39,7 +39,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -100,7 +100,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="2" column="0">
                         <property name="name">
-                            <cstring>tqlayout9</cstring>
+                            <cstring>layout9</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -116,7 +116,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>31</width>
                                         <height>20</height>
@@ -282,7 +282,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>99</width>
                                         <height>20</height>
@@ -299,7 +299,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>100</width>
                                         <height>20</height>
@@ -362,7 +362,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout4</cstring>
+                            <cstring>layout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -396,7 +396,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>71</height>
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index 60e5f6fa..6fc5a6bd 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);
-    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+    setSizePolicy( 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::slotSetqStatus(int status)
+void SearchBar::slotSeStatus(int status)
 {
      d->searchCombo->setCurrentItem(status);
      slotSearchComboChanged(status);
@@ -194,15 +194,15 @@ void SearchBar::slotActivateSearch()
         {
             case 1: // Unread
             {
-                Criterion crit1( Criterion::tqStatus, Criterion::Equals, Article::New);
-                Criterion crit2( Criterion::tqStatus, Criterion::Equals, Article::Unread);
+                Criterion crit1( Criterion::Status, Criterion::Equals, Article::New);
+                Criterion crit2( Criterion::Status, Criterion::Equals, Article::Unread);
                 statusCriteria << crit1;
                 statusCriteria << crit2;
                 break;
             }
             case 2: // New
             {
-                Criterion crit( Criterion::tqStatus, Criterion::Equals, Article::New);
+                Criterion crit( Criterion::Status, Criterion::Equals, Article::New);
                 statusCriteria << crit;
                 break;
             }
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index 6aff87b5..a13a78ca 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -59,7 +59,7 @@ class SearchBar : public TQHBox
 
     public slots:
         void slotClearSearch();
-        void slotSetqStatus(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 5943f79a..352fbaf5 100644
--- a/akregator/src/settings_advancedbase.ui
+++ b/akregator/src/settings_advancedbase.ui
@@ -89,7 +89,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>174</width>
                             <height>20</height>
@@ -133,7 +133,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>260</height>
diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui
index fc7f39b0..c049638d 100644
--- a/akregator/src/settings_appearance.ui
+++ b/akregator/src/settings_appearance.ui
@@ -197,7 +197,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui
index 26faba49..68107e39 100644
--- a/akregator/src/settings_archive.ui
+++ b/akregator/src/settings_archive.ui
@@ -25,7 +25,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -143,7 +143,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>
diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui
index 97dbcca1..b40d1c27 100644
--- a/akregator/src/settings_browser.ui
+++ b/akregator/src/settings_browser.ui
@@ -87,7 +87,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>16</height>
@@ -96,7 +96,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui
index 4634e539..4632f724 100644
--- a/akregator/src/settings_general.ui
+++ b/akregator/src/settings_general.ui
@@ -139,7 +139,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index 5370bebe..1bceb672 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -31,7 +31,7 @@
 #include <klistview.h>
 #include <klocale.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 #include <tqwidget.h>
 
@@ -102,9 +102,9 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
     virtual bool visitFolder(Folder* node)
     {
         visitTreeNode(node);
-        TQValueList<TreeNode*> tqchildren = node->tqchildren();
+        TQValueList<TreeNode*> children = node->children();
         m_view->d->nodeToItem[node]->setExpandable(true);
-        for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
+        for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it)
              createItems(*it);
         return true;
     }
@@ -142,8 +142,8 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con
     
     connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
 
-    TQGridLayout* tqlayout = new TQGridLayout(this, 1, 1);
-    tqlayout->addWidget(d->view, 0, 0);
+    TQGridLayout* layout = new TQGridLayout(this, 1, 1);
+    layout->addWidget(d->view, 0, 0);
 
     d->visitor = new NodeVisitor(this);
 
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index be7857b6..7132bcec 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -27,7 +27,7 @@
 #include <tqstyle.h>
 #include <tqapplication.h>
 #include <tqiconset.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqmap.h>
 #include <tqptrdict.h>
 #include <tqstring.h>
@@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f)
 uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
 {
     int hframe, overlap;
-    hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
-    overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+    hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+    overlap = tabBar()->tqstyle().pixelMetric( 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()->tqsizeHint().height();
+    int tabBarHeight = tabBar()->sizeHint().height();
     if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
         lcw = TQMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
     if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
@@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress()
 
     url = view->part()->url();
     
-    kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Selection);
-    kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
+    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
+    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
 }
 
 void TabWidget::slotCloseTab()
diff --git a/akregator/src/tag.h b/akregator/src/tag.h
index d215eb8f..4e1e0222 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 tqunicode 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 unicode 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 d9c29a98..ec05f57b 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->tqcolorGroup()), item, -1, index);
+    int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index);
    
     
     popup->connectItem (id, this, TQT_SLOT(slotActivated()));
diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp
index 55273f72..4c4789df 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).setqStatus(Article::Read);
+        (*it).seStatus(Article::Read);
     setNotificationMode(true);
 }
     
diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui
index 85f3ae94..e6b4c34b 100644
--- a/akregator/src/tagpropertieswidgetbase.ui
+++ b/akregator/src/tagpropertieswidgetbase.ui
@@ -22,7 +22,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -53,7 +53,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
@@ -62,7 +62,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -91,7 +91,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>40</width>
                             <height>40</height>
@@ -117,7 +117,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>200</width>
                             <height>21</height>
diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp
index fd1cd42f..66fb70aa 100644
--- a/akregator/src/tagset.cpp
+++ b/akregator/src/tagset.cpp
@@ -99,21 +99,21 @@ void TagSet::readFromXML(const TQDomDocument& doc)
     if (root.isNull())
         return;
 
-    TQDomNodeList list = root.elementsByTagName(TQString::tqfromLatin1("tag"));
+    TQDomNodeList list = root.elementsByTagName(TQString::fromLatin1("tag"));
 
     for (uint i = 0; i < list.length(); ++i)
     {
         TQDomElement e = list.item(i).toElement();
         if (!e.isNull())
         {
-            if (e.hasAttribute(TQString::tqfromLatin1("id")))
+            if (e.hasAttribute(TQString::fromLatin1("id")))
             {
-                TQString id = e.attribute(TQString::tqfromLatin1("id"));
+                TQString id = e.attribute(TQString::fromLatin1("id"));
                 TQString name = e.text();
-                TQString scheme = e.attribute(TQString::tqfromLatin1("scheme"));
+                TQString scheme = e.attribute(TQString::fromLatin1("scheme"));
                 Tag tag(id, name, scheme);
                 
-                TQString icon = e.attribute(TQString::tqfromLatin1("icon"));
+                TQString icon = e.attribute(TQString::fromLatin1("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::tqfromLatin1("id"),(*it).id());
+        tn.setAttribute(TQString::fromLatin1("id"),(*it).id());
         if (!(*it).scheme().isEmpty())
-            tn.setAttribute(TQString::tqfromLatin1("scheme"),(*it).scheme());
+            tn.setAttribute(TQString::fromLatin1("scheme"),(*it).scheme());
         if (!(*it).icon().isEmpty())
-            tn.setAttribute(TQString::tqfromLatin1("icon"),(*it).icon());
+            tn.setAttribute(TQString::fromLatin1("icon"),(*it).icon());
         tn.appendChild(text);
         root.appendChild(tn);
     }
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 8bfb7895..31ced17a 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -116,7 +116,7 @@ TQPixmap TrayIcon::takeScreenshot() const
     // Paint the border
     const int BORDER = 1;
     TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER);
-    finalShot.fill(KApplication::tqpalette().active().foreground());
+    finalShot.fill(KApplication::palette().active().foreground());
     painter.begin(&finalShot);
     painter.drawPixmap(BORDER, BORDER, shot);
     painter.end();
diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp
index 9cc716b4..a4ae0936 100644
--- a/akregator/src/treenode.cpp
+++ b/akregator/src/treenode.cpp
@@ -93,23 +93,23 @@ TreeNode* TreeNode::nextSibling() const
 {
     if (!d->parent)
         return 0;
-    TQValueList<TreeNode*> tqchildren = d->parent->tqchildren();
+    TQValueList<TreeNode*> children = d->parent->children();
     TreeNode* me = (TreeNode*)this;
         
-    int idx = tqchildren.findIndex(me);
+    int idx = children.findIndex(me);
     
-    return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L;
+    return idx+1 < children.size() ? *(children.at(idx+1)) : 0L;
 }
 
 TreeNode* TreeNode::prevSibling() const
 {
     if (!d->parent)
         return 0;
-    TQValueList<TreeNode*> tqchildren = d->parent->tqchildren();
+    TQValueList<TreeNode*> children = d->parent->children();
     TreeNode* me = (TreeNode*)this;
     
-    int idx = tqchildren.findIndex(me);
-    return idx > 0 ? *(d->parent->tqchildren().at(idx-1)) : 0L;
+    int idx = children.findIndex(me);
+    return idx > 0 ? *(d->parent->children().at(idx-1)) : 0L;
 }
 
 Folder* TreeNode::parent() const
diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp
index 32b12c9c..3299e278 100644
--- a/akregator/src/treenodeitem.cpp
+++ b/akregator/src/treenodeitem.cpp
@@ -105,7 +105,7 @@ FolderItem* TreeNodeItem::parent() const
 } 
     
 
-// TODO: reverse for reverse tqlayout
+// TODO: reverse for reverse layout
 void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
                                int column, int width, int align )
 
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index d24e715f..d108d263 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -38,7 +38,7 @@
 #include <kparts/browserextension.h>
 
 #include <tqaccel.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpaintdevicemetrics.h>
 
 #include "viewer.h"
@@ -203,7 +203,7 @@ void Viewer::slotCopy()
 {
     TQString text = selectedText();
     text.replace( TQChar( 0xa0 ), ' ' );
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
     cb->setText(text);
     connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
@@ -212,7 +212,7 @@ void Viewer::slotCopy()
 void Viewer::slotCopyLinkAddress()
 {
    if(m_url.isEmpty()) return;
-   TQClipboard *cb = TQApplication::tqclipboard();
+   TQClipboard *cb = TQApplication::clipboard();
    cb->setText(m_url.prettyURL(), TQClipboard::Clipboard);
    cb->setText(m_url.prettyURL(), TQClipboard::Selection);
 }
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:50:21 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:50:21 -0600
commit	3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (patch)
tree	89de88213bd261e4ccaade899ab2d6ec34b3a5a7 /akregator/src
parent	1dad5f662a09dfc5cc041caffe0f674044a4dcec (diff)
download	tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.tar.gz tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.zip