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/jabber/jabberbookmarks.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kopete/protocols/jabber/jabberbookmarks.cpp') diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index 661f0974..39011f81 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -26,7 +26,7 @@ #include "xmpp_tasks.h" -JabberBookmarks::JabberBookmarks(JabberAccount *parent) : TQObject(parent) , m_account(parent) +JabberBookmarks::JabberBookmarks(JabberAccount *tqparent) : TQObject(tqparent) , m_account(tqparent) { connect( m_account , TQT_SIGNAL( isConnectedChanged() ) , this , TQT_SLOT( accountConnected() ) ); } @@ -96,7 +96,7 @@ void JabberBookmarks::slotReceivedBookmarks( ) void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) { - if(m_conferencesJID.contains(jid.full()) || !m_account->isConnected()) + if(m_conferencesJID.tqcontains(jid.full()) || !m_account->isConnected()) { return; } @@ -127,9 +127,9 @@ void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) m_conferencesJID += jid.full(); } -KAction * JabberBookmarks::bookmarksAction(TQObject *parent) +KAction * JabberBookmarks::bookmarksAction(TQObject *tqparent) { - KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" ); + KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , tqparent , "actionBookMark" ); groupchatBM->setItems(m_conferencesJID); TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&))); return groupchatBM; -- cgit v1.2.1