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, 13 insertions, 13 deletions

diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp
index 9dba56f2..91ad1a0f 100644
--- a/kopete/protocols/meanwhile/meanwhileaccount.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp
@@ -35,17 +35,17 @@
 #include <tqdict.h>
 
 MeanwhileAccount::MeanwhileAccount(
-                        MeanwhileProtocol *parent,
+                        MeanwhileProtocol *tqparent,
                         const TQString &accountID,
                         const char *name)
-    : Kopete::PasswordedAccount(parent, accountID, 0, name)
+    : Kopete::PasswordedAccount(tqparent, accountID, 0, name)
 {
     HERE;
     m_meanwhileId = accountID;
     m_session = 0L;
     setMyself(new MeanwhileContact(m_meanwhileId, m_meanwhileId, this,
                 Kopete::ContactList::self()->myself()));
-    setOnlineStatus(parent->statusOffline);
+    setOnlineStatus(tqparent->statusOffline);
     infoPlugin = new MeanwhilePlugin();
 }
 
@@ -63,15 +63,15 @@ void MeanwhileAccount::setPlugin(MeanwhilePlugin *plugin)
 
 bool MeanwhileAccount::createContact(
                         const TQString & contactId ,
-                        Kopete::MetaContact * parentContact)
+                        Kopete::MetaContact * tqparentContact)
 {
     MeanwhileContact* newContact = new MeanwhileContact(contactId,
-            parentContact->displayName(), this, parentContact);
+            tqparentContact->displayName(), this, tqparentContact);
 
     MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol());
 
     if ((newContact != 0L) && (m_session != 0L)
-        && (myself()->onlineStatus() !=
+        && (myself()->onlinetqStatus() !=
                 p->statusOffline))
         m_session->addContact(newContact);
 
@@ -109,7 +109,7 @@ void MeanwhileAccount::connectWithPassword(const TQString &password)
     if (!m_session->isConnected() && !m_session->isConnecting())
         m_session->connect(password);
 
-    m_session->setStatus(initialStatus());
+    m_session->setStatus(initialtqStatus());
 }
 
 void MeanwhileAccount::disconnect()
@@ -123,7 +123,7 @@ void MeanwhileAccount::disconnect(Kopete::Account::DisconnectReason reason)
         return;
 
     MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol());
-    setAllContactsStatus(p->statusOffline);
+    setAllContactstqStatus(p->statusOffline);
     disconnected(reason);
     emit isConnectedChanged();
 
@@ -138,9 +138,9 @@ KActionMenu * MeanwhileAccount::actionMenu()
     menu->popupMenu()->insertSeparator();
 
 #if 0
-    menu->insert(new KAction(i18n("&Change Status Message"), TQString::null, 0,
-                this, TQT_SLOT(meanwhileChangeStatus()), this,
-                "meanwhileChangeStatus"));
+    menu->insert(new KAction(i18n("&Change tqStatus Message"), TQString(), 0,
+                this, TQT_SLOT(meanwhileChangetqStatus()), this,
+                "meanwhileChangetqStatus"));
     //infoPlugin->addCustomMenus(theMenu);
 #endif
     return menu;
@@ -219,7 +219,7 @@ void MeanwhileAccount::setOnlineStatus(const Kopete::OnlineStatus &status,
         const TQString &reason)
 {
     HERE;
-    Kopete::OnlineStatus oldstatus = myself()->onlineStatus();
+    Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus();
 
     mwDebug() << "From: " << oldstatus.description() << "(" <<
         oldstatus.internalStatus() << "):" << oldstatus.isDefinitelyOnline()
@@ -256,7 +256,7 @@ void MeanwhileAccount::syncContactsToServer()
 void MeanwhileAccount::slotSessionStateChange(Kopete::OnlineStatus status)
 {
     HERE;
-    Kopete::OnlineStatus oldstatus = myself()->onlineStatus();
+    Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus();
     myself()->setOnlineStatus(status);
 
     if (status.isDefinitelyOnline() != oldstatus.isDefinitelyOnline()) {