From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/protocols/jabber/jingle/jinglesession.cpp | 4 +- kopete/protocols/jabber/jingle/jinglesession.h | 12 +++--- .../jabber/jingle/jinglesessionmanager.cpp | 16 ++++---- .../protocols/jabber/jingle/jinglesessionmanager.h | 14 +++---- .../protocols/jabber/jingle/jinglevoicecaller.cpp | 48 +++++++++++----------- kopete/protocols/jabber/jingle/jinglevoicecaller.h | 6 +-- .../protocols/jabber/jingle/jinglevoicesession.cpp | 32 +++++++-------- .../protocols/jabber/jingle/jinglevoicesession.h | 8 ++-- .../jabber/jingle/jinglevoicesessiondialog.cpp | 46 ++++++++++----------- .../jabber/jingle/jinglevoicesessiondialog.h | 2 +- .../jabber/jingle/jinglewatchsessiontask.cpp | 12 +++--- .../jabber/jingle/jinglewatchsessiontask.h | 4 +- 12 files changed, 102 insertions(+), 102 deletions(-) (limited to 'kopete/protocols/jabber/jingle') diff --git a/kopete/protocols/jabber/jingle/jinglesession.cpp b/kopete/protocols/jabber/jingle/jinglesession.cpp index 6c370fca..9bebb3b8 100644 --- a/kopete/protocols/jabber/jingle/jinglesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglesession.cpp @@ -34,7 +34,7 @@ public: }; JingleSession::JingleSession(JabberAccount *account, const JidList &peers) - : QObject(account, 0), d(new Private(account, peers)) + : TQObject(account, 0), d(new Private(account, peers)) { d->myself = account->client()->jid(); } @@ -64,7 +64,7 @@ JabberAccount *JingleSession::account() return d->account; } -void JingleSession::sendStanza(const QString &stanza) +void JingleSession::sendStanza(const TQString &stanza) { account()->client()->send( stanza ); } diff --git a/kopete/protocols/jabber/jingle/jinglesession.h b/kopete/protocols/jabber/jingle/jinglesession.h index 00c192bd..a9d73440 100644 --- a/kopete/protocols/jabber/jingle/jinglesession.h +++ b/kopete/protocols/jabber/jingle/jinglesession.h @@ -17,11 +17,11 @@ #ifndef JINGLESESSION_H #define JINGLESESSION_H -#include -#include +#include +#include #include // XMPP::Jid -#include +#include class JabberAccount; /** @@ -33,7 +33,7 @@ class JingleSession : public QObject { Q_OBJECT public: - typedef QValueList JidList; + typedef TQValueList JidList; JingleSession(JabberAccount *account, const JidList &peers); virtual ~JingleSession(); @@ -52,7 +52,7 @@ public: * Note that you must return the XML namespace that define * the session: ex:(http://jabber.org/protocol/jingle/sessions/audio) */ - virtual QString sessionType() = 0; + virtual TQString sessionType() = 0; public slots: /** @@ -74,7 +74,7 @@ public slots: virtual void terminate() = 0; protected slots: - void sendStanza(const QString &stanza); + void sendStanza(const TQString &stanza); signals: /** diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp index aeec2889..54fc7274 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp @@ -90,7 +90,7 @@ public: } JabberAccount *account; - QValueList sessionList; + TQValueList sessionList; JingleWatchSessionTask *watchSessionTask; cricket::NetworkManager *networkManager; @@ -101,18 +101,18 @@ public: //END JingleSessionManager::Private JingleSessionManager::JingleSessionManager(JabberAccount *account) - : QObject(account, 0), d(new Private(account)) + : TQObject(account, 0), d(new Private(account)) { // Create slots proxy for libjingle slotsProxy = new SlotsProxy(this); // Create watch incoming session task. d->watchSessionTask = new JingleWatchSessionTask(account->client()->rootTask()); - connect(d->watchSessionTask, SIGNAL(watchSession(const QString &, const QString &)), this, SLOT(slotIncomingSession(const QString &, const QString &))); + connect(d->watchSessionTask, TQT_SIGNAL(watchSession(const TQString &, const TQString &)), this, TQT_SLOT(slotIncomingSession(const TQString &, const TQString &))); // Create global cricket variables common to all sessions. // Seed random generation with the JID of the account. - QString accountJid = account->client()->jid().full(); + TQString accountJid = account->client()->jid().full(); cricket::InitRandom( accountJid.ascii(), accountJid.length() ); // Create the libjingle NetworkManager that manager local network connections @@ -137,7 +137,7 @@ JingleSessionManager::~JingleSessionManager() kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << endl; kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Cleaning up Jingle sessions." << endl; - QValueList::Iterator it, itEnd = d->sessionList.end(); + TQValueList::Iterator it, itEnd = d->sessionList.end(); for(it = d->sessionList.begin(); it != itEnd; ++it) { JingleSession *deletedSession = *it; @@ -162,7 +162,7 @@ JabberAccount *JingleSessionManager::account() return d->account; } -JingleSession *JingleSessionManager::createSession(const QString &sessionType, const JidList &peers) +JingleSession *JingleSessionManager::createSession(const TQString &sessionType, const JidList &peers) { JingleSession *newSession = 0L; @@ -178,7 +178,7 @@ JingleSession *JingleSessionManager::createSession(const QString &sessionType, c return newSession; } -JingleSession *JingleSessionManager::createSession(const QString &sessionType, const XMPP::Jid &user) +JingleSession *JingleSessionManager::createSession(const TQString &sessionType, const XMPP::Jid &user) { JingleSessionManager::JidList jidList; jidList.append(user); @@ -194,7 +194,7 @@ void JingleSessionManager::removeSession(JingleSession *session) delete session; } -void JingleSessionManager::slotIncomingSession(const QString &sessionType, const QString &initiator) +void JingleSessionManager::slotIncomingSession(const TQString &sessionType, const TQString &initiator) { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Incoming session: " << sessionType << ". Initiator: " << initiator << endl; diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.h b/kopete/protocols/jabber/jingle/jinglesessionmanager.h index 06951c2f..f9bb82b9 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.h +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.h @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include namespace cricket { @@ -40,7 +40,7 @@ class JingleSessionManager : public QObject { Q_OBJECT public: - typedef QValueList JidList; + typedef TQValueList JidList; JingleSessionManager(JabberAccount *account); ~JingleSessionManager(); @@ -61,22 +61,22 @@ public slots: * @param sessionType the session you want to create. You must pass its XML namespace(ex: http://jabber.org/protocol/sessions/audio) * @param peers Lists of participants of the session. */ - JingleSession *createSession(const QString &sessionType, const JidList &peers); + JingleSession *createSession(const TQString &sessionType, const JidList &peers); /** * Override method that create a session for a one-to-one session. * It behave like createSession method. * @param sessionType the sesion you want to create. You must pass its XML namespace(ex: http://jabber.org/protocol/sessions/audio) * @param user The JID of the user you want to begin a session with. */ - JingleSession *createSession(const QString &sessionType, const XMPP::Jid &user); + JingleSession *createSession(const TQString &sessionType, const XMPP::Jid &user); void removeSession(JingleSession *session); signals: - void incomingSession(const QString &sessionType, JingleSession *session); + void incomingSession(const TQString &sessionType, JingleSession *session); private slots: - void slotIncomingSession(const QString &sessionType, const QString &initiator); + void slotIncomingSession(const TQString &sessionType, const TQString &initiator); private: class Private; diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index 3ad6a89a..dd809cea 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -20,8 +20,8 @@ -#include -#include +#include +#include @@ -47,7 +47,7 @@ public: JingleIQResponder(XMPP::Task *); ~JingleIQResponder(); - bool take(const QDomElement &); + bool take(const TQDomElement &); }; /** @@ -63,14 +63,14 @@ JingleIQResponder::~JingleIQResponder() { } -bool JingleIQResponder::take(const QDomElement &e) +bool JingleIQResponder::take(const TQDomElement &e) { if(e.tagName() != "iq") return false; - QDomElement first = e.firstChild().toElement(); + TQDomElement first = e.firstChild().toElement(); if (!first.isNull() && first.attribute("xmlns") == JINGLE_NS) { - QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id")); + TQDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id")); send(iq); return true; } @@ -114,7 +114,7 @@ void JingleClientSlots::callDestroyed(cricket::Call *call) qDebug("JingleClientSlots: Call destroyed"); Jid jid(call->sessions()[0]->remote_address().c_str()); if (voiceCaller_->calling(jid)) { - qDebug(QString("Removing unterminated call to %1").arg(jid.full())); + qDebug(TQString("Removing unterminated call to %1").arg(jid.full())); voiceCaller_->removeCall(jid); emit voiceCaller_->terminated(jid); } @@ -122,7 +122,7 @@ void JingleClientSlots::callDestroyed(cricket::Call *call) void JingleClientSlots::sendStanza(cricket::SessionClient*, const buzz::XmlElement *stanza) { - QString st(stanza->Str().c_str()); + TQString st(stanza->Str().c_str()); st.replace("cli:iq","iq"); st.replace(":cli=","="); fprintf(stderr,"bling\n"); @@ -138,7 +138,7 @@ void JingleClientSlots::requestSignaling() void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *session, cricket::Session::State state) { - qDebug(QString("jinglevoicecaller.cpp: State changed (%1)").arg(state)); + qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").arg(state)); // Why is c_str() stuff needed to make it compile on OS X ? Jid jid(session->remote_address().c_str()); @@ -156,7 +156,7 @@ void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *sess } else if (state == cricket::Session::STATE_SENTMODIFY) { } else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - qWarning(QString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); + qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) { } else if (state == cricket::Session::STATE_RECEIVEDREJECT) { @@ -194,8 +194,8 @@ void JingleVoiceCaller::initialize() if (initialized_) return; - QString jid = ((ClientStream&) account()->client()->client()->stream()).jid().full(); - qDebug(QString("jinglevoicecaller.cpp: Creating new caller for %1").arg(jid)); + TQString jid = ((ClientStream&) account()->client()->client()->stream()).jid().full(); + qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").arg(jid)); if (jid.isEmpty()) { qWarning("jinglevoicecaller.cpp: Empty JID"); return; @@ -233,7 +233,7 @@ void JingleVoiceCaller::initialize() new JingleIQResponder(account()->client()->rootTask()); // Listen to incoming packets - connect(account()->client()->client(),SIGNAL(xmlIncoming(const QString&)),SLOT(receiveStanza(const QString&))); + connect(account()->client()->client(),TQT_SIGNAL(xmlIncoming(const TQString&)),TQT_SLOT(receiveStanza(const TQString&))); initialized_ = true; } @@ -245,7 +245,7 @@ void JingleVoiceCaller::deinitialize() return; // Stop listening to incoming packets - disconnect(account()->client(),SIGNAL(xmlIncoming(const QString&)),this,SLOT(receiveStanza(const QString&))); + disconnect(account()->client(),TQT_SIGNAL(xmlIncoming(const TQString&)),this,TQT_SLOT(receiveStanza(const TQString&))); // Disconnect signals (is this needed) //phone_client_->SignalCallCreate.disconnect(slots_); @@ -271,7 +271,7 @@ bool JingleVoiceCaller::calling(const Jid& jid) void JingleVoiceCaller::call(const Jid& jid) { - qDebug(QString("jinglevoicecaller.cpp: Calling %1").arg(jid.full())); + qDebug(TQString("jinglevoicecaller.cpp: Calling %1").arg(jid.full())); cricket::Call *c = ((cricket::PhoneSessionClient*)(phone_client_))->CreateCall(); c->InitiateSession(buzz::Jid(jid.full().ascii())); phone_client_->SetFocus(c); @@ -299,7 +299,7 @@ void JingleVoiceCaller::reject(const Jid& j) void JingleVoiceCaller::terminate(const Jid& j) { - qDebug(QString("jinglevoicecaller.cpp: Terminating call to %1").arg(j.full())); + qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").arg(j.full())); cricket::Call* call = calls_[j.full()]; if (call != NULL) { call->Terminate(); @@ -309,7 +309,7 @@ void JingleVoiceCaller::terminate(const Jid& j) void JingleVoiceCaller::sendStanza(const char* stanza) { - account()->client()->send(QString(stanza)); + account()->client()->send(TQString(stanza)); } void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call) @@ -327,19 +327,19 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call) void JingleVoiceCaller::removeCall(const Jid& j) { - qDebug(QString("JingleVoiceCaller: Removing call to %1").arg(j.full())); + qDebug(TQString("JingleVoiceCaller: Removing call to %1").arg(j.full())); calls_.remove(j.full()); } -void JingleVoiceCaller::receiveStanza(const QString& stanza) +void JingleVoiceCaller::receiveStanza(const TQString& stanza) { - QDomDocument doc; + TQDomDocument doc; doc.setContent(stanza); // Check if it is offline presence from an open chat if (doc.documentElement().tagName() == "presence") { Jid from = Jid(doc.documentElement().attribute("from")); - QString type = doc.documentElement().attribute("type"); + TQString type = doc.documentElement().attribute("type"); if (type == "unavailable" && calls_.contains(from.full())) { qDebug("JingleVoiceCaller: User went offline without closing a call."); removeCall(from); @@ -351,10 +351,10 @@ void JingleVoiceCaller::receiveStanza(const QString& stanza) // Check if the packet is destined for libjingle. // We could use Session::IsClientStanza to check this, but this one crashes // for some reason. - QDomNode n = doc.documentElement().firstChild(); + TQDomNode n = doc.documentElement().firstChild(); bool ok = false; while (!n.isNull() && !ok) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if (!e.isNull() && e.attribute("xmlns") == JINGLE_NS) { ok = true; } @@ -363,7 +363,7 @@ void JingleVoiceCaller::receiveStanza(const QString& stanza) // Spread the word if (ok) { - qDebug(QString("jinglevoicecaller.cpp: Handing down %1").arg(stanza)); + qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").arg(stanza)); buzz::XmlElement *e = buzz::XmlElement::ForStr(stanza.ascii()); phone_client_->OnIncomingStanza(e); } diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.h b/kopete/protocols/jabber/jingle/jinglevoicecaller.h index 4448d530..50070289 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.h +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.h @@ -3,7 +3,7 @@ #ifndef JINGLEVOICECALLER_H #define JINGLEVOICECALLER_H -#include +#include #include "im.h" #include "voicecaller.h" @@ -54,7 +54,7 @@ protected: void removeCall(const Jid&); protected slots: - void receiveStanza(const QString&); + void receiveStanza(const TQString&); private: bool initialized_; @@ -66,7 +66,7 @@ private: cricket::SessionManager *session_manager_; cricket::PhoneSessionClient *phone_client_; JingleClientSlots *slots_; - QMap calls_; + TQMap calls_; }; #endif diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index 09019ce4..91fa1a77 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -39,7 +39,7 @@ #include "jinglesessionmanager.h" // Qt includes -#include +#include // KDE includes #include @@ -115,7 +115,7 @@ public: {} else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - //qWarning(QString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); + //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) {} @@ -141,7 +141,7 @@ public: void OnSendingStanza(cricket::SessionClient*, const buzz::XmlElement *buzzStanza) { - QString irisStanza(buzzStanza->Str().c_str()); + TQString irisStanza(buzzStanza->Str().c_str()); irisStanza.replace("cli:iq","iq"); irisStanza.replace(":cli=","="); @@ -159,7 +159,7 @@ public: JingleIQResponder(XMPP::Task *); ~JingleIQResponder(); - bool take(const QDomElement &); + bool take(const TQDomElement &); }; /** @@ -175,14 +175,14 @@ JingleVoiceSession::JingleIQResponder::~JingleIQResponder() { } -bool JingleVoiceSession::JingleIQResponder::take(const QDomElement &e) +bool JingleVoiceSession::JingleIQResponder::take(const TQDomElement &e) { if(e.tagName() != "iq") return false; - QDomElement first = e.firstChild().toElement(); + TQDomElement first = e.firstChild().toElement(); if (!first.isNull() && first.attribute("xmlns") == JINGLE_NS) { - QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id")); + TQDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id")); send(iq); return true; } @@ -224,7 +224,7 @@ JingleVoiceSession::JingleVoiceSession(JabberAccount *account, const JidList &pe d->phoneSessionClient->SignalCallCreate.connect(slotsProxy, &JingleVoiceSession::SlotsProxy::OnCallCreated); // Listen to incoming packets - connect(account->client()->client(), SIGNAL(xmlIncoming(const QString&)), this, SLOT(receiveStanza(const QString&))); + connect(account->client()->client(), TQT_SIGNAL(xmlIncoming(const TQString&)), this, TQT_SLOT(receiveStanza(const TQString&))); new JingleIQResponder(account->client()->rootTask()); } @@ -236,9 +236,9 @@ JingleVoiceSession::~JingleVoiceSession() delete d; } -QString JingleVoiceSession::sessionType() +TQString JingleVoiceSession::sessionType() { - return QString(JINGLE_VOICE_SESSION_NS); + return TQString(JINGLE_VOICE_SESSION_NS); } void JingleVoiceSession::start() @@ -246,7 +246,7 @@ void JingleVoiceSession::start() kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Starting a voice session..." << endl; d->currentCall = d->phoneSessionClient->CreateCall(); - QString firstPeerJid = ((XMPP::Jid)peers().first()).full(); + TQString firstPeerJid = ((XMPP::Jid)peers().first()).full(); kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "With peer: " << firstPeerJid << endl; d->currentCall->InitiateSession( buzz::Jid(firstPeerJid.ascii()) ); @@ -287,16 +287,16 @@ void JingleVoiceSession::setCall(cricket::Call *call) d->phoneSessionClient->SetFocus(d->currentCall); } -void JingleVoiceSession::receiveStanza(const QString &stanza) +void JingleVoiceSession::receiveStanza(const TQString &stanza) { - QDomDocument doc; + TQDomDocument doc; doc.setContent(stanza); // Check if it is offline presence from an open chat if( doc.documentElement().tagName() == "presence" ) { XMPP::Jid from = XMPP::Jid(doc.documentElement().attribute("from")); - QString type = doc.documentElement().attribute("type"); + TQString type = doc.documentElement().attribute("type"); if( type == "unavailable" && hasPeer(peers(), from) ) { //qDebug("JingleVoiceCaller: User went offline without closing a call."); @@ -309,11 +309,11 @@ void JingleVoiceSession::receiveStanza(const QString &stanza) // Check if the packet is destined for libjingle. // We could use Session::IsClientStanza to check this, but this one crashes // for some reason. - QDomNode node = doc.documentElement().firstChild(); + TQDomNode node = doc.documentElement().firstChild(); bool ok = false; while( !node.isNull() && !ok ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if( !element.isNull() && element.attribute("xmlns") == JINGLE_NS) { ok = true; diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.h b/kopete/protocols/jabber/jingle/jinglevoicesession.h index e70d3b54..2769d351 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.h @@ -20,7 +20,7 @@ #include #include // XMPP::Jid -#include +#include namespace cricket { @@ -39,12 +39,12 @@ class JingleVoiceSession : public JingleSession { Q_OBJECT public: - typedef QValueList JidList; + typedef TQValueList JidList; JingleVoiceSession(JabberAccount *account, const JidList &peers); virtual ~JingleVoiceSession(); - virtual QString sessionType(); + virtual TQString sessionType(); public slots: virtual void accept(); @@ -53,7 +53,7 @@ public slots: virtual void terminate(); protected slots: - void receiveStanza(const QString &stanza); + void receiveStanza(const TQString &stanza); private: void setCall(cricket::Call *call); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index 9fb61274..b017cdfd 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -17,9 +17,9 @@ #include "jinglevoicesessiondialog.h" // Qt includes -#include -#include -#include +#include +#include +#include // Jingle includes // #include "jinglevoicesession.h" @@ -40,27 +40,27 @@ using namespace XMPP; -JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, QWidget *parent, const char *name) +JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *parent, const char *name) : JingleVoiceSessionDialogBase(parent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) { - QString contactJid = m_peerJid.full(); + TQString contactJid = m_peerJid.full(); setCaption( i18n("Voice session with %1").arg(contactJid) ); - connect(buttonAccept, SIGNAL(clicked()), this, SLOT(slotAcceptClicked())); - connect(buttonDecline, SIGNAL(clicked()), this, SLOT(slotDeclineClicked())); - connect(buttonTerminate, SIGNAL(clicked()), this, SLOT(slotTerminateClicked())); + connect(buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAcceptClicked())); + connect(buttonDecline, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeclineClicked())); + connect(buttonTerminate, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTerminateClicked())); // NOTE: Disabled for 0.12 #if 0 - connect(m_session, SIGNAL(sessionStarted()), this, SLOT(sessionStarted())); - connect(m_session, SIGNAL(accepted()), this, SLOT(sessionAccepted())); - connect(m_session, SIGNAL(declined()), this, SLOT(sessionDeclined())); - connect(m_session, SIGNAL(terminated()), this, SLOT(sessionTerminated())); + connect(m_session, TQT_SIGNAL(sessionStarted()), this, TQT_SLOT(sessionStarted())); + connect(m_session, TQT_SIGNAL(accepted()), this, TQT_SLOT(sessionAccepted())); + connect(m_session, TQT_SIGNAL(declined()), this, TQT_SLOT(sessionDeclined())); + connect(m_session, TQT_SIGNAL(terminated()), this, TQT_SLOT(sessionTerminated())); #endif - connect(m_session, SIGNAL(accepted( const Jid & )), this, SLOT( sessionAccepted(const Jid &) )); - connect(m_session, SIGNAL(in_progress( const Jid & )), this, SLOT( sessionStarted(const Jid &) )); - connect(m_session, SIGNAL(rejected( const Jid& )), this, SLOT( sessionDeclined(const Jid &) )); - connect(m_session, SIGNAL(terminated( const Jid& )), this, SLOT( sessionTerminated(const Jid &) )); + connect(m_session, TQT_SIGNAL(accepted( const Jid & )), this, TQT_SLOT( sessionAccepted(const Jid &) )); + connect(m_session, TQT_SIGNAL(in_progress( const Jid & )), this, TQT_SLOT( sessionStarted(const Jid &) )); + connect(m_session, TQT_SIGNAL(rejected( const Jid& )), this, TQT_SLOT( sessionDeclined(const Jid &) )); + connect(m_session, TQT_SIGNAL(terminated( const Jid& )), this, TQT_SLOT( sessionTerminated(const Jid &) )); // Find JabberContact for the peer and fill this dialog with contact information. JabberContact *peerContact = static_cast( m_session->account()->contactPool()->findRelevantRecipient( m_peerJid ) ); @@ -84,12 +84,12 @@ void JingleVoiceSessionDialog::setContactInformation(JabberContact *contact) if( contact->metaContact() ) { labelDisplayName->setText( contact->metaContact()->displayName() ); - labelContactPhoto->setPixmap( QPixmap(contact->metaContact()->photo()) ); + labelContactPhoto->setPixmap( TQPixmap(contact->metaContact()->photo()) ); } else { labelDisplayName->setText( contact->nickName() ); - labelDisplayName->setPixmap( QPixmap(contact->property(Kopete::Global::Properties::self()->photo()).value().toString()) ); + labelDisplayName->setPixmap( TQPixmap(contact->property(Kopete::Global::Properties::self()->photo()).value().toString()) ); } } @@ -194,15 +194,15 @@ void JingleVoiceSessionDialog::sessionTerminated(const Jid &jid) void JingleVoiceSessionDialog::reject() { finalize(); - QDialog::reject(); + TQDialog::reject(); } void JingleVoiceSessionDialog::finalize() { - disconnect(m_session, SIGNAL(accepted( const Jid & )), this, SLOT( sessionAccepted(const Jid &) )); - disconnect(m_session, SIGNAL(in_progress( const Jid & )), this, SLOT( sessionStarted(const Jid &) )); - disconnect(m_session, SIGNAL(rejected( const Jid& )), this, SLOT( sessionDeclined(const Jid &) )); - disconnect(m_session, SIGNAL(terminated( const Jid& )), this, SLOT( sessionTerminated(const Jid &) )); + disconnect(m_session, TQT_SIGNAL(accepted( const Jid & )), this, TQT_SLOT( sessionAccepted(const Jid &) )); + disconnect(m_session, TQT_SIGNAL(in_progress( const Jid & )), this, TQT_SLOT( sessionStarted(const Jid &) )); + disconnect(m_session, TQT_SIGNAL(rejected( const Jid& )), this, TQT_SLOT( sessionDeclined(const Jid &) )); + disconnect(m_session, TQT_SIGNAL(terminated( const Jid& )), this, TQT_SLOT( sessionTerminated(const Jid &) )); } #include "jinglevoicesessiondialog.moc" diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h index 29d0c091..1a911bae 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h @@ -33,7 +33,7 @@ class JingleVoiceSessionDialog : public JingleVoiceSessionDialogBase public: enum SessionState { Incoming, Waiting, Accepted, Declined, Started, Terminated }; - JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, QWidget *parent = 0, const char *name = 0); + JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *parent = 0, const char *name = 0); ~JingleVoiceSessionDialog(); public slots: diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp index fc7de053..571f9ff6 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp @@ -31,30 +31,30 @@ JingleWatchSessionTask::~JingleWatchSessionTask() {} //NOTE: This task watch for pre-JEP session. -bool JingleWatchSessionTask::take(const QDomElement &element) +bool JingleWatchSessionTask::take(const TQDomElement &element) { if(element.tagName() != "iq") return false; - QString sessionType, initiator; + TQString sessionType, initiator; - QDomElement first = element.firstChild().toElement(); + TQDomElement first = element.firstChild().toElement(); if( !first.isNull() && first.attribute("xmlns") == JINGLE_NS && first.tagName() == "session" ) { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Checking for incoming sesssion." << endl; initiator = first.attribute("initiator"); // Only proceed initiate type Jingle XMPP call. - if( first.attribute("type") != QString::fromUtf8("initiate") ) + if( first.attribute("type") != TQString::fromUtf8("initiate") ) return false; int nodeIndex; - QDomNodeList nodeList = first.childNodes(); + TQDomNodeList nodeList = first.childNodes(); // Do not check first child for(nodeIndex = 0; nodeIndex < nodeList.length(); nodeIndex++) { - QDomElement nodeElement = nodeList.item(nodeIndex).toElement(); + TQDomElement nodeElement = nodeList.item(nodeIndex).toElement(); if(nodeElement.tagName() == "description") { sessionType = nodeElement.attribute("xmlns"); diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h index 99b76661..09dbdbce 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h @@ -30,10 +30,10 @@ public: JingleWatchSessionTask(XMPP::Task *parent); ~JingleWatchSessionTask(); - bool take(const QDomElement &element); + bool take(const TQDomElement &element); signals: - void watchSession(const QString &sessionType, const QString &initiator); + void watchSession(const TQString &sessionType, const TQString &initiator); }; #endif -- cgit v1.2.1