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/wpprotocol.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'kopete/protocols/winpopup/wpprotocol.cpp') diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 71d4a76a..66ef7fac 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -48,17 +48,17 @@ typedef KGenericFactory WPProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_wp, WPProtocolFactory( "kopete_wp" ) ) // WP Protocol -WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ ) -: Kopete::Protocol( WPProtocolFactory::instance(), parent, name ), - WPOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, i18n("Online"), i18n("Online")), +WPProtocol::WPProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) +: Kopete::Protocol( WPProtocolFactory::instance(), tqparent, name ), + WPOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n("Online"), i18n("Online")), WPAway( Kopete::OnlineStatus::Away, 20, this, 1, "wp_away", i18n("Away"), i18n("Away")), - WPOffline( Kopete::OnlineStatus::Offline, 0, this, 2, TQString::null, i18n("Offline"), i18n("Offline")) + WPOffline( Kopete::OnlineStatus::Offline, 0, this, 2, TQString(), i18n("Offline"), i18n("Offline")) { // kdDebug(14170) << "WPProtocol::WPProtocol()" << endl; sProtocol = this; - // Load Status Actions + // Load tqStatus Actions // initActions(); // TODO: Maybe use this in the future? @@ -79,11 +79,11 @@ WPProtocol::~WPProtocol() sProtocol = 0; } -AddContactPage *WPProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *theAccount) +AddContactPage *WPProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *theAccount) { -// kdDebug(14170) << "WPProtocol::createAddContactWidget(, " << theAccount << ")" << endl; +// kdDebug(14170) << "WPProtocol::createAddContactWidget(, " << theAccount << ")" << endl; - return new WPAddContact(parent, dynamic_cast(theAccount)); + return new WPAddContact(tqparent, dynamic_cast(theAccount)); } Kopete::Contact *WPProtocol::deserializeContact( Kopete::MetaContact *metaContact, @@ -108,9 +108,9 @@ Kopete::Contact *WPProtocol::deserializeContact( Kopete::MetaContact *metaContac return theAccount->contacts()[contactId]; } -KopeteEditAccountWidget *WPProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget *WPProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return new WPEditAccount(parent, account); + return new WPEditAccount(tqparent, account); } Kopete::Account *WPProtocol::createNewAccount(const TQString &accountId) @@ -152,7 +152,7 @@ void WPProtocol::installSamba() void WPProtocol::slotReceivedMessage(const TQString &Body, const TQDateTime &Time, const TQString &From) { bool foundContact = false; - TQString accountKey = TQString::null; + TQString accountKey = TQString(); TQDict Accounts = Kopete::AccountManager::self()->accounts(protocol()); for (TQDictIterator it(Accounts); it.current(); ++it) { TQDict Contacts = it.current()->contacts(); @@ -184,4 +184,4 @@ void WPProtocol::sendMessage(const TQString &Body, const TQString &Destination) #include "wpprotocol.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