Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 46 insertions, 46 deletions

diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index ea2e8039..df8dba7d 100644
--- a/kopete/protocols/jabber/jabberprotocol.cpp
+++ b/kopete/protocols/jabber/jabberprotocol.cpp
@@ -26,12 +26,12 @@
 #include <kstandarddirs.h>
 #include <klineeditdlg.h>
 
-#include <qapplication.h>
-#include <qcursor.h>
-#include <qmap.h>
-#include <qtimer.h>
-#include <qpixmap.h>
-#include <qstringlist.h>
+#include <tqapplication.h>
+#include <tqcursor.h>
+#include <tqmap.h>
+#include <tqtimer.h>
+#include <tqpixmap.h>
+#include <tqstringlist.h>
 
 #include "im.h"
 #include "xmpp.h"
@@ -69,14 +69,14 @@ typedef KGenericFactory<JabberProtocol> JabberProtocolFactory;
 
 K_EXPORT_COMPONENT_FACTORY( kopete_jabber, JabberProtocolFactory( "kopete_jabber" )  )
 
-JabberProtocol::JabberProtocol (QObject * parent, const char *name, const QStringList &)
+JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStringList &)
 : Kopete::Protocol( JabberProtocolFactory::instance(), parent, name ),
 	JabberKOSChatty(Kopete::OnlineStatus::Online,        100, this, JabberFreeForChat, "jabber_chatty", i18n ("Free for Chat"), i18n ("Free for Chat"), Kopete::OnlineStatusManager::FreeForChat, Kopete::OnlineStatusManager::HasAwayMessage ),
-	JabberKOSOnline(Kopete::OnlineStatus::Online,         90, this, JabberOnline, QString::null, i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ),
+	JabberKOSOnline(Kopete::OnlineStatus::Online,         90, this, JabberOnline, TQString::null, i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ),
 	JabberKOSAway(Kopete::OnlineStatus::Away,             80, this, JabberAway, "contact_away_overlay", i18n ("Away"), i18n ("Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage),
 	JabberKOSXA(Kopete::OnlineStatus::Away,               70, this, JabberXA, "contact_xa_overlay", i18n ("Extended Away"), i18n ("Extended Away"), 0, Kopete::OnlineStatusManager::HasAwayMessage),
 	JabberKOSDND(Kopete::OnlineStatus::Away,              60, this, JabberDND, "contact_busy_overlay", i18n ("Do not Disturb"), i18n ("Do not Disturb"), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage),
-	JabberKOSOffline(Kopete::OnlineStatus::Offline,       50, this, JabberOffline, QString::null, i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasAwayMessage ),
+	JabberKOSOffline(Kopete::OnlineStatus::Offline,       50, this, JabberOffline, TQString::null, i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasAwayMessage ),
 	JabberKOSInvisible(Kopete::OnlineStatus::Invisible,   40, this, JabberInvisible, "contact_invisible_overlay",   i18n ("Invisible") ,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible),
 	JabberKOSConnecting(Kopete::OnlineStatus::Connecting, 30, this, JabberConnecting, "jabber_connecting",  i18n("Connecting")),
 	propLastSeen(Kopete::Global::Properties::self()->lastSeen()),
@@ -90,34 +90,34 @@ JabberProtocol::JabberProtocol (QObject * parent, const char *name, const QStrin
 	propWorkPhone(Kopete::Global::Properties::self()->workPhone()),
 	propWorkMobilePhone(Kopete::Global::Properties::self()->workMobilePhone()),
 	propNickName(Kopete::Global::Properties::self()->nickName()),
-	propSubscriptionStatus("jabberSubscriptionStatus", i18n ("Subscription"), QString::null, true, false),
-	propAuthorizationStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), QString::null, true, false),
+	propSubscriptionStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString::null, true, false),
+	propAuthorizationStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString::null, true, false),
 	propAvailableResources("jabberAvailableResources", i18n ("Available Resources"), "jabber_chatty", false, true),
-	propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), QString::null, true, false, true),
+	propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString::null, true, false, true),
 	propPhoto(Kopete::Global::Properties::self()->photo()),
-	propJid("jabberVCardJid", i18n("Jabber ID"), QString::null, true, false),
-	propBirthday("jabberVCardBirthday", i18n("Birthday"), QString::null, true, false),
-	propTimezone("jabberVCardTimezone", i18n("Timezone"), QString::null, true, false),
-	propHomepage("jabberVCardHomepage", i18n("Homepage"), QString::null, true, false),
-	propCompanyName("jabberVCardCompanyName", i18n("Company name"), QString::null, true, false),
-	propCompanyDepartement("jabberVCardCompanyDepartement", i18n("Company Departement"), QString::null, true, false),
-	propCompanyPosition("jabberVCardCompanyPosition", i18n("Company Position"), QString::null, true, false),
-	propCompanyRole("jabberVCardCompanyRole", i18n("Company Role"), QString::null, true, false),
-	propWorkStreet("jabberVCardWorkStreet", i18n("Work Street"), QString::null, true, false),
-	propWorkExtAddr("jabberVCardWorkExtAddr", i18n("Work Extra Address"), QString::null, true, false),
-	propWorkPOBox("jabberVCardWorkPOBox", i18n("Work PO Box"), QString::null, true, false),
-	propWorkCity("jabberVCardWorkCity", i18n("Work City"), QString::null, true, false),
-	propWorkPostalCode("jabberVCardWorkPostalCode", i18n("Work Postal Code"), QString::null, true, false),
-	propWorkCountry("jabberVCardWorkCountry", i18n("Work Country"), QString::null, true, false),
-	propWorkEmailAddress("jabberVCardWorkEmailAddress", i18n("Work Email Address"), QString::null, true, false),
-	propHomeStreet("jabberVCardHomeStreet", i18n("Home Street"), QString::null, true, false),
-	propHomeExtAddr("jabberVCardHomeExt", i18n("Home Extra Address"), QString::null, true, false),
-	propHomePOBox("jabberVCardHomePOBox", i18n("Home PO Box"), QString::null, true, false),
-	propHomeCity("jabberVCardHomeCity", i18n("Home City"), QString::null, true, false),
-	propHomePostalCode("jabberVCardHomePostalCode", i18n("Home Postal Code"), QString::null, true, false),
-	propHomeCountry("jabberVCardHomeCountry", i18n("Home Country"), QString::null, true, false),
-	propPhoneFax("jabberVCardPhoneFax", i18n("Fax"), QString::null, true, false),
-	propAbout("jabberVCardAbout", i18n("About"), QString::null, true, false)
+	propJid("jabberVCardJid", i18n("Jabber ID"), TQString::null, true, false),
+	propBirthday("jabberVCardBirthday", i18n("Birthday"), TQString::null, true, false),
+	propTimezone("jabberVCardTimezone", i18n("Timezone"), TQString::null, true, false),
+	propHomepage("jabberVCardHomepage", i18n("Homepage"), TQString::null, true, false),
+	propCompanyName("jabberVCardCompanyName", i18n("Company name"), TQString::null, true, false),
+	propCompanyDepartement("jabberVCardCompanyDepartement", i18n("Company Departement"), TQString::null, true, false),
+	propCompanyPosition("jabberVCardCompanyPosition", i18n("Company Position"), TQString::null, true, false),
+	propCompanyRole("jabberVCardCompanyRole", i18n("Company Role"), TQString::null, true, false),
+	propWorkStreet("jabberVCardWorkStreet", i18n("Work Street"), TQString::null, true, false),
+	propWorkExtAddr("jabberVCardWorkExtAddr", i18n("Work Extra Address"), TQString::null, true, false),
+	propWorkPOBox("jabberVCardWorkPOBox", i18n("Work PO Box"), TQString::null, true, false),
+	propWorkCity("jabberVCardWorkCity", i18n("Work City"), TQString::null, true, false),
+	propWorkPostalCode("jabberVCardWorkPostalCode", i18n("Work Postal Code"), TQString::null, true, false),
+	propWorkCountry("jabberVCardWorkCountry", i18n("Work Country"), TQString::null, true, false),
+	propWorkEmailAddress("jabberVCardWorkEmailAddress", i18n("Work Email Address"), TQString::null, true, false),
+	propHomeStreet("jabberVCardHomeStreet", i18n("Home Street"), TQString::null, true, false),
+	propHomeExtAddr("jabberVCardHomeExt", i18n("Home Extra Address"), TQString::null, true, false),
+	propHomePOBox("jabberVCardHomePOBox", i18n("Home PO Box"), TQString::null, true, false),
+	propHomeCity("jabberVCardHomeCity", i18n("Home City"), TQString::null, true, false),
+	propHomePostalCode("jabberVCardHomePostalCode", i18n("Home Postal Code"), TQString::null, true, false),
+	propHomeCountry("jabberVCardHomeCountry", i18n("Home Country"), TQString::null, true, false),
+	propPhoneFax("jabberVCardPhoneFax", i18n("Fax"), TQString::null, true, false),
+	propAbout("jabberVCardAbout", i18n("About"), TQString::null, true, false)
 
 {
 
@@ -155,13 +155,13 @@ JabberProtocol::~JabberProtocol ()
 
 
 
-AddContactPage *JabberProtocol::createAddContactWidget (QWidget * parent, Kopete::Account * i)
+AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * parent, Kopete::Account * i)
 {
 	kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Create Add Contact  Widget\n" << endl;
 	return new JabberAddContactPage (i, parent);
 }
 
-KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, QWidget * parent)
+KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * parent)
 {
 	kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Edit Account Widget\n" << endl;
 	JabberAccount *ja=dynamic_cast < JabberAccount * >(account);
@@ -179,7 +179,7 @@ KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Accoun
 	}
 }
 
-Kopete::Account *JabberProtocol::createNewAccount (const QString & accountId)
+Kopete::Account *JabberProtocol::createNewAccount (const TQString & accountId)
 {
 	kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Create New Account. ID: " << accountId << "\n" << endl;
 	if( Kopete::AccountManager::self()->findAccount( pluginId() , accountId ) )
@@ -188,7 +188,7 @@ Kopete::Account *JabberProtocol::createNewAccount (const QString & accountId)
 	int slash=accountId.find('/');
 	if(slash>=0)
 	{
-		QString realAccountId=accountId.left(slash);
+		TQString realAccountId=accountId.left(slash);
 		JabberAccount *realAccount=dynamic_cast<JabberAccount*>(Kopete::AccountManager::self()->findAccount( pluginId() , realAccountId ));
 		if(!realAccount) //if it doesn't exist yet, create it
 		{
@@ -278,16 +278,16 @@ JabberProtocol *JabberProtocol::protocol ()
 }
 
 Kopete::Contact *JabberProtocol::deserializeContact (Kopete::MetaContact * metaContact,
-										 const QMap < QString, QString > &serializedData, const QMap < QString, QString > & /* addressBookData */ )
+										 const TQMap < TQString, TQString > &serializedData, const TQMap < TQString, TQString > & /* addressBookData */ )
 {
 //  kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Deserializing data for metacontact " << metaContact->displayName () << "\n" << endl;
 
-	QString contactId = serializedData["contactId"];
-	QString displayName = serializedData["displayName"];
-	QString accountId = serializedData["accountId"];
-	QString jid = serializedData["JID"];
+	TQString contactId = serializedData["contactId"];
+	TQString displayName = serializedData["displayName"];
+	TQString accountId = serializedData["accountId"];
+	TQString jid = serializedData["JID"];
 
-	QDict < Kopete::Account > accounts = Kopete::AccountManager::self ()->accounts (this);
+	TQDict < Kopete::Account > accounts = Kopete::AccountManager::self ()->accounts (this);
 	Kopete::Account *account = accounts[accountId];
 	
 	if (!account)
@@ -304,7 +304,7 @@ Kopete::Contact *JabberProtocol::deserializeContact (Kopete::MetaContact * metaC
 	return account->contacts()[contactId];
 }
 
-XMPP::Status JabberProtocol::kosToStatus( const Kopete::OnlineStatus & status , const QString & message )
+XMPP::Status JabberProtocol::kosToStatus( const Kopete::OnlineStatus & status , const TQString & message )
 {
 	XMPP::Status xmppStatus ( "", message );