Rename old tq methods that no longer need a unique name

12 files changed, 214 insertions, 214 deletions

diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp
index 59949244b..244130535 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 c020655ce..7f6c70c2e 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 610cec4c8..6d6e10577 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 666162683..e048fa887 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 c714f5663..091018cb8 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 98074be37..cb8d7c86b 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 edc384323..5fad14094 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 2129bc792..59f47c9cd 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 571717ae3..7d88c3d1f 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 18e18327d..3d3e963b8 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 a12442fa3..04799fcaa 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 c4daa0561..909d95805 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();