1 files changed, 27 insertions, 27 deletions

diff --git a/akregator/src/librss/feeddetector.cpp b/akregator/src/librss/feeddetector.cpp
index a45b1877..4407ff09 100644
--- a/akregator/src/librss/feeddetector.cpp
+++ b/akregator/src/librss/feeddetector.cpp
@@ -22,10 +22,10 @@
     without including the source code for Qt in the source distribution.
 */
  
-#include <qregexp.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
 #include <kcharsets.h>
 #include <kurl.h>
 
@@ -34,26 +34,26 @@
 
 using namespace RSS;
 
-FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s)	
+FeedDetectorEntryList FeedDetector::extractFromLinkTags(const TQString& s)	
 {
     //reduce all sequences of spaces, newlines etc. to one space:
-    QString str = s.simplifyWhiteSpace();
+    TQString str = s.simplifyWhiteSpace();
 
     // extracts <link> tags
-    QRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false);
+    TQRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false);
 
     // extracts the URL (href="url")
-    QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
+    TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
     // extracts type attribute
-    QRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
+    TQRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
     // extracts the title (title="title")
-    QRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
+    TQRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
 
     int pos = 0;
     int matchpos = 0;
 
     // get all <link> tags
-    QStringList linkTags;
+    TQStringList linkTags;
     //int strlength = str.length();
     while ( matchpos != -1 )
     {
@@ -67,9 +67,9 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s)
 
     FeedDetectorEntryList list;
 
-    for ( QStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it )
+    for ( TQStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it )
     {
-        QString type;
+        TQString type;
         int pos = reType.search(*it, 0);
         if (pos != -1)
             type = reType.cap(1).lower();
@@ -79,14 +79,14 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s)
 	      && type != "application/atom+xml" && type != "text/xml" )
             continue;
                 
-        QString title;
+        TQString title;
         pos = reTitle.search(*it, 0);
         if (pos != -1)
         title = reTitle.cap(1);
 
         title = KCharsets::resolveEntities(title);
 
-        QString url;
+        TQString url;
         pos = reHref.search(*it, 0);
         if (pos != -1)
             url = reHref.cap(1);
@@ -105,33 +105,33 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s)
     return list;
 }
 
-QStringList FeedDetector::extractBruteForce(const QString& s)
+TQStringList FeedDetector::extractBruteForce(const TQString& s)
 {
-    QString str = s.simplifyWhiteSpace();
+    TQString str = s.simplifyWhiteSpace();
     
-    QRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false);
+    TQRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false);
     
     // extracts the URL (href="url")
-    QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
+    TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
 
-    QRegExp rssrdfxml(".*(RSS|RDF|XML)", false);
+    TQRegExp rssrdfxml(".*(RSS|RDF|XML)", false);
 
     int pos = 0;
     int matchpos = 0;
     
     // get all <a href> tags and capture url
-    QStringList list;
+    TQStringList list;
     //int strlength = str.length();
     while ( matchpos != -1 )
     {
         matchpos = reAhrefTag.search(str, pos);
         if ( matchpos != -1 )
         {
-            QString ahref = str.mid(matchpos, reAhrefTag.matchedLength());
+            TQString ahref = str.mid(matchpos, reAhrefTag.matchedLength());
             int hrefpos = reHref.search(ahref, 0);
             if ( hrefpos != -1 )
             {
-                QString url = reHref.cap(1);
+                TQString url = reHref.cap(1);
 
                 url = KCharsets::resolveEntities(url);
 
@@ -146,9 +146,9 @@ QStringList FeedDetector::extractBruteForce(const QString& s)
     return list;
 }
 
-QString FeedDetector::fixRelativeURL(const QString &s, const KURL &baseurl)
+TQString FeedDetector::fixRelativeURL(const TQString &s, const KURL &baseurl)
 {
-    QString s2=s;
+    TQString s2=s;
     KURL u;
     if (KURL::isRelativeURL(s2))
     {
@@ -160,8 +160,8 @@ QString FeedDetector::fixRelativeURL(const QString &s, const KURL &baseurl)
         else if (s2.startsWith("/"))
         {
             KURL b2(baseurl);
-            b2.setPath(QString()); // delete path and query, so that only protocol://host remains
-            b2.setQuery(QString());
+            b2.setPath(TQString()); // delete path and query, so that only protocol://host remains
+            b2.setQuery(TQString());
             u = KURL(b2, s2.remove(0,1)); // remove leading "/" 
         }
         else