From 808e453c56036211f57482ed847d54aca01bba68 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:49:40 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 kopete/plugins/cryptography/cryptographyplugin.cpp | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'kopete/plugins/cryptography/cryptographyplugin.cpp')

diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 135cf636..12533044 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqtimer.h>
 #include <tqregexp.h>
 
@@ -45,7 +45,7 @@
 //In Jabber, the JEP says it's not. so we don't use richtext in our message, but some client did.
 //We limit the html to some basis tag to limit security problem (bad links)
 //    - Olivier
-const TQRegExp CryptographyPlugin::isHTML( TQString::tqfromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false );
+const TQRegExp CryptographyPlugin::isHTML( TQString::fromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false );
 
 typedef KGenericFactory<CryptographyPlugin> CryptographyPluginFactory;
 static const KAboutData aboutdata("kopete_cryptography", I18N_NOOP("Cryptography") , "1.0" );
@@ -154,8 +154,8 @@ bool CryptographyPlugin::passphraseHandling()
 void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg )
 {
  	TQString body = msg.plainBody();
-	if( !body.startsWith( TQString::tqfromLatin1("-----BEGIN PGP MESSAGE----") )
-		 || !body.contains( TQString::tqfromLatin1("-----END PGP MESSAGE----") ) )
+	if( !body.startsWith( TQString::fromLatin1("-----BEGIN PGP MESSAGE----") )
+		 || !body.contains( TQString::fromLatin1("-----END PGP MESSAGE----") ) )
 		return;
 
 	if( msg.direction() != Kopete::Message::Inbound )
@@ -179,16 +179,16 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg )
 				plainBody = TQStyleSheet::escape( plainBody );
 
 				//this is the same algoritm as in Kopete::Message::escapedBody();
-				plainBody.replace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br/>" ) )
-					.replace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) )
-					.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "&nbsp; " ) );
+				plainBody.replace( TQString::fromLatin1( "\n" ), TQString::fromLatin1( "<br/>" ) )
+					.replace( TQString::fromLatin1( "\t" ), TQString::fromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) )
+					.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( "&nbsp; " ) );
 			}
 
-			msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
+			msg.setBody( TQString::fromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
 				+ i18n("Outgoing Encrypted Message: ")
-				+ TQString::tqfromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
+				+ TQString::fromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
 				+ plainBody
-				+ TQString::tqfromLatin1(" </td></tr></table>")
+				+ TQString::fromLatin1(" </td></tr></table>")
 				, Kopete::Message::RichText );
 		}
 
@@ -215,11 +215,11 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg )
 			body = Kopete::Message::escape( body );
 		}
 
-		msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
+		msg.setBody( TQString::fromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
 			+ i18n("Incoming Encrypted Message: ")
-			+ TQString::tqfromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
+			+ TQString::fromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
 			+ body
-			+ TQString::tqfromLatin1(" </td></tr></table>")
+			+ TQString::fromLatin1(" </td></tr></table>")
 			, Kopete::Message::RichText );
 	}
 
-- 
cgit v1.2.1