From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: 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 --- kopete/protocols/winpopup/wpaccount.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'kopete/protocols/winpopup/wpaccount.cpp') diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index d7439628..addb88bb 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -34,8 +34,8 @@ class KPopupMenu; -WPAccount::WPAccount(WPProtocol *parent, const TQString &accountID, const char *name) - : Kopete::Account(parent, accountID, name) +WPAccount::WPAccount(WPProtocol *tqparent, const TQString &accountID, const char *name) + : Kopete::Account(tqparent, accountID, name) { // kdDebug(14170) << "WPAccount::WPAccount()" << endl; @@ -66,7 +66,7 @@ const TQStringList WPAccount::getHosts(const TQString &Group) bool WPAccount::checkHost(const TQString &Name) { // kdDebug() << "WPAccount::checkHost: " << Name << endl; - if (Name.upper() == TQString::fromLatin1("LOCALHOST")) { + if (Name.upper() == TQString::tqfromLatin1("LOCALHOST")) { // Assume localhost is always there, but it will not appear in the samba output. // Should never happen as localhost is now forbidden as contact, just for safety. GF return true; @@ -75,12 +75,12 @@ bool WPAccount::checkHost(const TQString &Name) } } -bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact ) +bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact ) { // kdDebug(14170) << "[WPAccount::createContact] contactId: " << contactId << endl; if (!contacts()[contactId]) { - WPContact *newContact = new WPContact(this, contactId, parentContact->displayName(), parentContact); + WPContact *newContact = new WPContact(this, contactId, tqparentContact->displayName(), tqparentContact); return newContact != 0; } else { kdDebug(14170) << "[WPAccount::addContact] Contact already exists" << endl; @@ -159,8 +159,8 @@ KActionMenu* WPAccount::actionMenu() /// How to remove an action from Kopete::Account::actionMenu()? GF - KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this); - theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId())); + KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlinetqStatus().iconFor(this), this); + theActionMenu->popupMenu()->insertTitle(myself()->onlinetqStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId())); if (mProtocol) { @@ -189,21 +189,21 @@ void WPAccount::slotSendMessage(const TQString &Body, const TQString &Destinatio { kdDebug(14170) << "WPAccount::slotSendMessage(" << Body << ", " << Destination << ")" << endl; - if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline); + if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline); mProtocol->sendMessage(Body, Destination); } void WPAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQString &reason) { - if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online) + if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online) connect( status ); - else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline) + else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline) disconnect(); - else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away) + else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away) setAway( true, reason ); } #include "wpaccount.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; -- cgit v1.2.1