TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 14 insertions, 14 deletions

diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.cpp b/kopete/protocols/meanwhile/meanwhileprotocol.cpp
index b9915e94..b20eb48a 100644
--- a/kopete/protocols/meanwhile/meanwhileprotocol.cpp
+++ b/kopete/protocols/meanwhile/meanwhileprotocol.cpp
@@ -29,17 +29,17 @@ typedef KGenericFactory<MeanwhileProtocol> MeanwhileProtocolFactory;
 K_EXPORT_COMPONENT_FACTORY(kopete_meanwhile,
     MeanwhileProtocolFactory("kopete_meanwhile"))
 
-MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name,
+MeanwhileProtocol::MeanwhileProtocol(TQObject* tqparent, const char *name,
         const TQStringList &/*args*/)
-: Kopete::Protocol(MeanwhileProtocolFactory::instance(), parent, name),
+: Kopete::Protocol(MeanwhileProtocolFactory::instance(), tqparent, name),
 
-    statusOffline(Kopete::OnlineStatus::Offline, 25, this, 0, TQString::null,
+    statusOffline(Kopete::OnlineStatus::Offline, 25, this, 0, TQString(),
             i18n("Offline"), i18n("Offline"),
             Kopete::OnlineStatusManager::Offline,
 	    Kopete::OnlineStatusManager::DisabledIfOffline),
 
     statusOnline(Kopete::OnlineStatus::Online, 25, this, mwStatus_ACTIVE,
-            TQString::null, i18n("Online"), i18n("Online"),
+            TQString(), i18n("Online"), i18n("Online"),
             Kopete::OnlineStatusManager::Online, 0),
 
     statusAway(Kopete::OnlineStatus::Away, 20, this, mwStatus_AWAY,
@@ -57,10 +57,10 @@ MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name,
             Kopete::OnlineStatusManager::Idle, 0),
 
     statusAccountOffline(Kopete::OnlineStatus::Offline, 0, this, 0,
-            TQString::null, i18n("Account Offline")),
+            TQString(), i18n("Account Offline")),
 
-    statusMessage(TQString::fromLatin1("statusMessage"),
-        i18n("Status Message"), TQString::null, false, true),
+    statusMessage(TQString::tqfromLatin1("statusMessage"),
+        i18n("tqStatus Message"), TQString(), false, true),
 
     awayMessage(Kopete::Global::Properties::self()->awayMessage())
 {
@@ -73,16 +73,16 @@ MeanwhileProtocol::~MeanwhileProtocol()
 {
 }
 
-AddContactPage * MeanwhileProtocol::createAddContactWidget(TQWidget *parent,
+AddContactPage * MeanwhileProtocol::createAddContactWidget(TQWidget *tqparent,
         Kopete::Account *account )
 {
-	return new MeanwhileAddContactPage(parent, account);
+	return new MeanwhileAddContactPage(tqparent, account);
 }
 
 KopeteEditAccountWidget * MeanwhileProtocol::createEditAccountWidget(
-        Kopete::Account *account, TQWidget *parent )
+        Kopete::Account *account, TQWidget *tqparent )
 {
-	return new MeanwhileEditAccountWidget(parent, account, this);
+	return new MeanwhileEditAccountWidget(tqparent, account, this);
 }
 
 Kopete::Account *MeanwhileProtocol::createNewAccount(const TQString &accountId)
@@ -113,14 +113,14 @@ Kopete::Contact *MeanwhileProtocol::deserializeContact(
     return theAccount->contacts()[contactId];
 }
 
-const Kopete::OnlineStatus MeanwhileProtocol::accountOfflineStatus()
+const Kopete::OnlineStatus MeanwhileProtocol::accountOfflinetqStatus()
 {
     return statusAccountOffline;
 }
 
-const Kopete::OnlineStatus MeanwhileProtocol::lookupStatus(
+const Kopete::OnlineStatus MeanwhileProtocol::lookuptqStatus(
             enum Kopete::OnlineStatusManager::Categories cats)
 {
-    return Kopete::OnlineStatusManager::self()->onlineStatus(this, cats);
+    return Kopete::OnlineStatusManager::self()->onlinetqStatus(this, cats);
 }
 #include "meanwhileprotocol.moc"