From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:34 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
---
 kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp | 2 +-
 kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp    | 4 ++--
 kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp      | 2 +-
 kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kopete/protocols/jabber/libiris/cutestuff')

diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index f20c054f..cd5b2f64 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -358,7 +358,7 @@ void HttpPoll::resetKey()
 	fprintf(stderr, "HttpPoll: reset key!\n");
 #endif
 	TQByteArray a = randomArray(64);
-	TQString str = TQString::fromLatin1(a.data(), a.size());
+	TQString str = TQString::tqfromLatin1(a.data(), a.size());
 
 	d->key_n = POLL_KEYS;
 	for(int n = 0; n < POLL_KEYS; ++n)
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
index e4e1b182..16f02e07 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
@@ -122,7 +122,7 @@ static int sp_read_udp(TQByteArray *from, SPS_UDP *s)
 			return 0;
 		TQCString cs(host_len+1);
 		memcpy(cs.data(), from->data() + 5, host_len);
-		host = TQString::fromLatin1(cs);
+		host = TQString::tqfromLatin1(cs);
 	}
 	else if(atype == 0x04) {
 		full_len += 16;
@@ -467,7 +467,7 @@ static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s)
 			return 0;
 		TQCString cs(host_len+1);
 		memcpy(cs.data(), from->data() + 5, host_len);
-		host = TQString::fromLatin1(cs);
+		host = TQString::tqfromLatin1(cs);
 	}
 	else if(atype == 0x04) {
 		full_len += 16;
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
index fcdd3d49..c9726d75 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
@@ -146,7 +146,7 @@ TQString Base64::arrayToString(const TQByteArray &a)
 	TQCString c;
 	c.resize(b.size()+1);
 	memcpy(c.data(), b.data(), b.size());
-	return TQString::fromLatin1(c);
+	return TQString::tqfromLatin1(c);
 }
 
 //!
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
index 6339d14a..0c8b46df 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
@@ -20,11 +20,11 @@
 
 #include"showtextdlg.h"
 
-#include<layout.h>
-#include<textedit.h>
+#include<tqlayout.h>
+#include<tqtextedit.h>
 #include<tqpushbutton.h>
 #include<tqfile.h>
-#include<textstream.h>
+#include<tqtextstream.h>
 
 
 ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, const char *name)
-- 
cgit v1.2.1