diff options
Diffstat (limited to 'kopete/protocols/jabber')
114 files changed, 349 insertions, 349 deletions
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 4f22a622..f3212f93 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -87,12 +87,12 @@ -JabberAccount::JabberAccount (JabberProtocol * tqparent, const TQString & accountId, const char *name) - :Kopete::PasswordedAccount ( tqparent, accountId, 0, name ) +JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountId, const char *name) + :Kopete::PasswordedAccount ( parent, accountId, 0, name ) { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Instantiating new account " << accountId << endl; - m_protocol = tqparent; + m_protocol = parent; m_jabberClient = 0L; diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h index 04b79770..17286a90 100644 --- a/kopete/protocols/jabber/jabberaccount.h +++ b/kopete/protocols/jabber/jabberaccount.h @@ -60,7 +60,7 @@ class JabberAccount : public Kopete::PasswordedAccount TQ_OBJECT public: - JabberAccount (JabberProtocol * tqparent, const TQString & accountID, const char *name = 0L); + JabberAccount (JabberProtocol * parent, const TQString & accountID, const char *name = 0L); ~JabberAccount (); /* Returns the action menu for this account. */ diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index 5b69d489..661f0974 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -26,7 +26,7 @@ #include "xmpp_tasks.h" -JabberBookmarks::JabberBookmarks(JabberAccount *tqparent) : TQObject(tqparent) , m_account(tqparent) +JabberBookmarks::JabberBookmarks(JabberAccount *parent) : TQObject(parent) , m_account(parent) { connect( m_account , TQT_SIGNAL( isConnectedChanged() ) , this , TQT_SLOT( accountConnected() ) ); } @@ -127,9 +127,9 @@ void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) m_conferencesJID += jid.full(); } -KAction * JabberBookmarks::bookmarksAction(TQObject *tqparent) +KAction * JabberBookmarks::bookmarksAction(TQObject *parent) { - KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , tqparent , "actionBookMark" ); + KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" ); groupchatBM->setItems(m_conferencesJID); TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&))); return groupchatBM; diff --git a/kopete/protocols/jabber/jabberbookmarks.h b/kopete/protocols/jabber/jabberbookmarks.h index 55165a1e..65ea8e36 100644 --- a/kopete/protocols/jabber/jabberbookmarks.h +++ b/kopete/protocols/jabber/jabberbookmarks.h @@ -41,7 +41,7 @@ class JabberBookmarks : public TQObject /** * Constructor */ - JabberBookmarks(JabberAccount *tqparent); + JabberBookmarks(JabberAccount *parent); ~JabberBookmarks(){} /** @@ -53,7 +53,7 @@ class JabberBookmarks : public TQObject /** * return an action that will be added in the jabber popup menu */ - KAction *bookmarksAction(TQObject * tqparent); + KAction *bookmarksAction(TQObject * parent); private slots: void accountConnected(); void slotReceivedBookmarks(); diff --git a/kopete/protocols/jabber/jabberbytestream.cpp b/kopete/protocols/jabber/jabberbytestream.cpp index 4629eef2..1021757d 100644 --- a/kopete/protocols/jabber/jabberbytestream.cpp +++ b/kopete/protocols/jabber/jabberbytestream.cpp @@ -24,8 +24,8 @@ #include <kresolver.h> #include "jabberprotocol.h" -JabberByteStream::JabberByteStream ( TQObject *tqparent, const char */*name*/ ) - : ByteStream ( tqparent ) +JabberByteStream::JabberByteStream ( TQObject *parent, const char */*name*/ ) + : ByteStream ( parent ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Instantiating new Jabber byte stream." << endl; diff --git a/kopete/protocols/jabber/jabberbytestream.h b/kopete/protocols/jabber/jabberbytestream.h index 0bc2e204..91351160 100644 --- a/kopete/protocols/jabber/jabberbytestream.h +++ b/kopete/protocols/jabber/jabberbytestream.h @@ -34,7 +34,7 @@ Q_OBJECT TQ_OBJECT public: - JabberByteStream ( TQObject *tqparent = 0, const char *name = 0 ); + JabberByteStream ( TQObject *parent = 0, const char *name = 0 ); ~JabberByteStream (); diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index 6161099e..bb637870 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -483,7 +483,7 @@ void JabberCapabilitiesManager::discoRequestFinished() } else { - TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->tqparent()); + TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->parent()); if( jidAccountPair.second ) { kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl; diff --git a/kopete/protocols/jabber/jabberconnector.cpp b/kopete/protocols/jabber/jabberconnector.cpp index 4653803f..f2d74eab 100644 --- a/kopete/protocols/jabber/jabberconnector.cpp +++ b/kopete/protocols/jabber/jabberconnector.cpp @@ -22,8 +22,8 @@ #include "jabberbytestream.h" #include "jabberprotocol.h" -JabberConnector::JabberConnector ( TQObject *tqparent, const char */*name*/ ) - : XMPP::Connector ( tqparent ) +JabberConnector::JabberConnector ( TQObject *parent, const char */*name*/ ) + : XMPP::Connector ( parent ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "New Jabber connector." << endl; diff --git a/kopete/protocols/jabber/jabberconnector.h b/kopete/protocols/jabber/jabberconnector.h index e6f12988..f4a561e9 100644 --- a/kopete/protocols/jabber/jabberconnector.h +++ b/kopete/protocols/jabber/jabberconnector.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - JabberConnector ( TQObject *tqparent = 0, const char *name = 0 ); + JabberConnector ( TQObject *parent = 0, const char *name = 0 ); ~JabberConnector (); diff --git a/kopete/protocols/jabber/jabberformlineedit.cpp b/kopete/protocols/jabber/jabberformlineedit.cpp index 235faffe..991d4a56 100644 --- a/kopete/protocols/jabber/jabberformlineedit.cpp +++ b/kopete/protocols/jabber/jabberformlineedit.cpp @@ -17,8 +17,8 @@ #include "jabberformlineedit.h" -JabberFormLineEdit::JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent, const char *name):TQLineEdit (value, - tqparent, +JabberFormLineEdit::JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent, const char *name):TQLineEdit (value, + parent, name) { @@ -38,7 +38,7 @@ JabberFormLineEdit::~JabberFormLineEdit () { } -JabberFormPasswordEdit::JabberFormPasswordEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent, const char *name):KPasswordEdit(tqparent, name) +JabberFormPasswordEdit::JabberFormPasswordEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent, const char *name):KPasswordEdit(parent, name) { setText(value); diff --git a/kopete/protocols/jabber/jabberformlineedit.h b/kopete/protocols/jabber/jabberformlineedit.h index 8ed1defc..d4f0de39 100644 --- a/kopete/protocols/jabber/jabberformlineedit.h +++ b/kopete/protocols/jabber/jabberformlineedit.h @@ -35,7 +35,7 @@ class JabberFormLineEdit:public TQLineEdit TQ_OBJECT public: - JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent = 0, const char *name = 0); + JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0); ~JabberFormLineEdit (); public slots:void slotGatherData (XMPP::Form & form); @@ -53,7 +53,7 @@ class JabberFormPasswordEdit:public KPasswordEdit TQ_OBJECT public: - JabberFormPasswordEdit(const int type, const TQString & realName, const TQString & value, TQWidget * tqparent = 0, const char *name = 0); + JabberFormPasswordEdit(const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0); public slots:void slotGatherData (XMPP::Form & form); diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp index 08fd3cfe..de789f44 100644 --- a/kopete/protocols/jabber/jabberformtranslator.cpp +++ b/kopete/protocols/jabber/jabberformtranslator.cpp @@ -22,7 +22,7 @@ #include "jabberformlineedit.h" #include "jabberformtranslator.h" -JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * tqparent, const char *name):TQWidget (tqparent, name) +JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * parent, const char *name):TQWidget (parent, name) { /* Copy basic form values. */ privForm.setJid (form.jid ()); diff --git a/kopete/protocols/jabber/jabberformtranslator.h b/kopete/protocols/jabber/jabberformtranslator.h index 1718ec4b..2ee316d6 100644 --- a/kopete/protocols/jabber/jabberformtranslator.h +++ b/kopete/protocols/jabber/jabberformtranslator.h @@ -34,7 +34,7 @@ Q_OBJECT TQ_OBJECT public: - JabberFormTranslator (const XMPP::Form & form, TQWidget * tqparent = 0, const char *name = 0); + JabberFormTranslator (const XMPP::Form & form, TQWidget * parent = 0, const char *name = 0); ~JabberFormTranslator (); XMPP::Form & resultData (); diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index 87b797c3..abb119df 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -69,8 +69,8 @@ typedef KGenericFactory<JabberProtocol> JabberProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_jabber, JabberProtocolFactory( "kopete_jabber" ) ) -JabberProtocol::JabberProtocol (TQObject * tqparent, const char *name, const TQStringList &) -: Kopete::Protocol( JabberProtocolFactory::instance(), tqparent, name ), +JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStringList &) +: Kopete::Protocol( JabberProtocolFactory::instance(), parent, name ), JabberKOSChatty(Kopete::OnlineStatus::Online, 100, this, JabberFreeForChat, "jabber_chatty", i18n ("Free for Chat"), i18n ("Free for Chat"), Kopete::OnlineStatusManager::FreeForChat, Kopete::OnlineStatusManager::HasAwayMessage ), JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this, JabberOnline, TQString(), i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), JabberKOSAway(Kopete::OnlineStatus::Away, 80, this, JabberAway, "contact_away_overlay", i18n ("Away"), i18n ("Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage), @@ -155,18 +155,18 @@ JabberProtocol::~JabberProtocol () -AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * tqparent, Kopete::Account * i) +AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * parent, Kopete::Account * i) { kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Create Add Contact Widget\n" << endl; - return new JabberAddContactPage (i, tqparent); + return new JabberAddContactPage (i, parent); } -KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * tqparent) +KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * parent) { kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Edit Account Widget\n" << endl; JabberAccount *ja=dynamic_cast < JabberAccount * >(account); if(ja || !account) - return new JabberEditAccountWidget (this,ja , tqparent); + return new JabberEditAccountWidget (this,ja , parent); else { JabberTransport *transport = dynamic_cast < JabberTransport * >(account); diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h index 696d572b..0e79c357 100644 --- a/kopete/protocols/jabber/jabberprotocol.h +++ b/kopete/protocols/jabber/jabberprotocol.h @@ -56,14 +56,14 @@ public: /** * Object constructor and destructor */ - JabberProtocol (TQObject * tqparent, const char *name, const TQStringList &); + JabberProtocol (TQObject * parent, const char *name, const TQStringList &); ~JabberProtocol (); /** * Creates the "add contact" dialog specific to this protocol */ - virtual AddContactPage *createAddContactWidget (TQWidget * tqparent, Kopete::Account * i); - virtual KopeteEditAccountWidget *createEditAccountWidget (Kopete::Account * account, TQWidget * tqparent); + virtual AddContactPage *createAddContactWidget (TQWidget * parent, Kopete::Account * i); + virtual KopeteEditAccountWidget *createEditAccountWidget (Kopete::Account * account, TQWidget * parent); virtual Kopete::Account *createNewAccount (const TQString & accountId); /** diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h index 3f14fcc5..f0a2ab81 100644 --- a/kopete/protocols/jabber/jabbertransport.h +++ b/kopete/protocols/jabber/jabbertransport.h @@ -45,7 +45,7 @@ class JabberTransport : public Kopete::Account public: /** * constructor called when the transport is created by info from server (i.e not when loading kopete) - * @param parentAccount is the tqparent jabber account. + * @param parentAccount is the parent jabber account. * @param item is the roster item of the gateway * @param gateway_type eg: "msn" or "icq" only used when the account is not loaded from config file for determining the icon */ @@ -53,7 +53,7 @@ public: /** * constructor called when the transport is loaded from config - * @param parentAccount is the tqparent jabber account. + * @param parentAccount is the parent jabber account. * @param accountId is the accountId */ JabberTransport (JabberAccount * parentAccount, const TQString &accountId ); @@ -63,7 +63,7 @@ public: /** Returns the action menu for this account. */ virtual KActionMenu *actionMenu (); - /** the tqparent account */ + /** the parent account */ JabberAccount *account() const { return m_account; } diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp index 766da28e..c9979411 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp @@ -55,8 +55,8 @@ class JingleSessionManager; class JingleSessionManager::SlotsProxy : public sigslot::has_slots<> { public: - SlotsProxy(JingleSessionManager *tqparent) - : sessionManager(tqparent) + SlotsProxy(JingleSessionManager *parent) + : sessionManager(parent) {} void OnSignalingRequest() diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index 594be2d4..4208e0d8 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -55,7 +55,7 @@ public: * \brief A task that responds to jingle candidate queries with an empty reply. */ -JingleITQResponder::JingleITQResponder(Task *tqparent) :Task(tqparent) +JingleITQResponder::JingleITQResponder(Task *parent) :Task(parent) { } diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index 0225b177..c5bc775d 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -74,8 +74,8 @@ static bool hasPeer(const JingleVoiceSession::JidList &jidList, const XMPP::Jid class JingleVoiceSession::SlotsProxy : public sigslot::has_slots<> { public: - SlotsProxy(JingleVoiceSession *tqparent) - : voiceSession(tqparent) + SlotsProxy(JingleVoiceSession *parent) + : voiceSession(parent) {} void OnCallCreated(cricket::Call* call) @@ -167,7 +167,7 @@ public: * \brief A task that responds to jingle candidate queries with an empty reply. */ -JingleVoiceSession::JingleITQResponder::JingleITQResponder(Task *tqparent) :Task(tqparent) +JingleVoiceSession::JingleITQResponder::JingleITQResponder(Task *parent) :Task(parent) { } diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index d5086a1a..a389730b 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -40,8 +40,8 @@ using namespace XMPP; -JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *tqparent, const char *name) - : JingleVoiceSessionDialogBase(tqparent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) +JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *parent, const char *name) + : JingleVoiceSessionDialogBase(parent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) { TQString contactJid = m_peerJid.full(); setCaption( i18n("Voice session with %1").tqarg(contactJid) ); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h index e782af03..738b2cb4 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h @@ -34,7 +34,7 @@ class JingleVoiceSessionDialog : public JingleVoiceSessionDialogBase public: enum SessionState { Incoming, Waiting, Accepted, Declined, Started, Terminated }; - JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *tqparent = 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 f37bc6d6..571f9ff6 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp @@ -23,8 +23,8 @@ #define JINGLE_NS "http://www.google.com/session" -JingleWatchSessionTask::JingleWatchSessionTask(XMPP::Task *tqparent) - : Task(tqparent) +JingleWatchSessionTask::JingleWatchSessionTask(XMPP::Task *parent) + : Task(parent) {} JingleWatchSessionTask::~JingleWatchSessionTask() diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h index 0b53280e..8c37b0c8 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h @@ -28,7 +28,7 @@ class JingleWatchSessionTask : public XMPP::Task Q_OBJECT TQ_OBJECT public: - JingleWatchSessionTask(XMPP::Task *tqparent); + JingleWatchSessionTask(XMPP::Task *parent); ~JingleWatchSessionTask(); bool take(const TQDomElement &element); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc index 09655472..6d85cb0d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc @@ -32,9 +32,9 @@ namespace buzz { -Task::Task(Task * tqparent) : +Task::Task(Task * parent) : state_(STATE_INIT), - parent_(tqparent), + parent_(parent), blocked_(false), done_(false), aborted_(false), @@ -42,7 +42,7 @@ Task::Task(Task * tqparent) : error_(false), child_error_(false), start_time_(0) { - runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner()); + runner_ = ((parent == NULL) ? (TaskRunner *)this : parent->GetRunner()); if (parent_ != NULL) { parent_->AddChild(this); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h index c583bda8..7140b691 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h @@ -61,12 +61,12 @@ // might be working on something as you send it infomration, you may want // to have a queue in the task. // -// (3) Finally it helps manage tqparent tasks and tqchildren. If a tqparent +// (3) Finally it helps manage parent tasks and tqchildren. If a parent // task gets aborted, all the tqchildren tasks are too. The nice thing -// about this, for example, is if you have one tqparent task that +// about this, for example, is if you have one parent task that // represents, say, and Xmpp connection, then you can spawn a whole bunch // of infinite lifetime child tasks and now worry about cleaning them up. -// When the tqparent task goes to STATE_DONE, the task engine will make +// When the parent task goes to STATE_DONE, the task engine will make // sure all those tqchildren are aborted and get deleted. // // Notice that Task has a few built-in states, e.g., @@ -103,7 +103,7 @@ class RootTask; class Task { public: - Task(Task * tqparent); + Task(Task * parent); virtual ~Task() {} void Start(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h index 7307a522..47660514 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h @@ -28,7 +28,7 @@ namespace buzz { class PresenceOutTask : public XmppTask { public: - PresenceOutTask(Task * tqparent) : XmppTask(tqparent) {} + PresenceOutTask(Task * parent) : XmppTask(parent) {} virtual ~PresenceOutTask() {} XmppReturntqStatus Send(const tqStatus & s); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h index 2ed5ac46..06c68015 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h @@ -30,7 +30,7 @@ namespace buzz { class PresencePushTask : public XmppTask { public: - PresencePushTask(Task * tqparent) : XmppTask(tqparent, XmppEngine::HL_TYPE) {} + PresencePushTask(Task * parent) : XmppTask(parent, XmppEngine::HL_TYPE) {} virtual int ProcessStart(); sigslot::signal1<const tqStatus &>SignalStatusUpdate; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h index fe6f0f6c..fa07d2ec 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h @@ -50,7 +50,7 @@ class MediaEngine { bool operator <(const Codec& c) const { return preference > c.preference; } }; - // Bittqmask flags for options that may be supported by the media engine implementation + // Bitmask flags for options that may be supported by the media engine implementation enum MediaEngineOptions { AUTO_GAIN_CONTROL = 1 << 1, }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h index 5b75af3c..a5326893 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h @@ -36,8 +36,8 @@ namespace cricket { class Receiver : public buzz::XmppTask { public: - Receiver(Task *tqparent, SessionClient *session_client) - : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_TYPE) { + Receiver(Task *parent, SessionClient *session_client) + : buzz::XmppTask(parent, buzz::XmppEngine::HL_TYPE) { session_client_ = session_client; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h index 5f67d58b..57564ad0 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h @@ -45,8 +45,8 @@ namespace cricket { // session_client is guaranteed to outlive the xmpp session. class SessionSendTask : public buzz::XmppTask { public: - SessionSendTask(Task *tqparent, SessionClient *session_client) - : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_SINGLE), + SessionSendTask(Task *parent, SessionClient *session_client) + : buzz::XmppTask(parent, buzz::XmppEngine::HL_SINGLE), session_client_(session_client), timed_out_(false) { } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c index 6d8868d6..24cc5a3f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c @@ -279,7 +279,7 @@ int __alsa_card_read(AlsaCard *obj,char *buf,int bsize) sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigproctqmask(SIG_BLOCK,&set,NULL); + sigprocmask(SIG_BLOCK,&set,NULL); err=snd_pcm_readi(obj->read_handle,buf,bsize/obj->frame_size); if (err<0) { if (err!=-EPIPE){ @@ -289,7 +289,7 @@ int __alsa_card_read(AlsaCard *obj,char *buf,int bsize) err=snd_pcm_readi(obj->read_handle,buf,bsize/obj->frame_size); if (err<0) g_warning("alsa_card_read: snd_pcm_readi() failed:%s.",snd_strerror(err)); } - sigproctqmask(SIG_UNBLOCK,&set,NULL); + sigprocmask(SIG_UNBLOCK,&set,NULL); return err*obj->frame_size; } @@ -322,7 +322,7 @@ int __alsa_card_write(AlsaCard *obj,char *buf,int size) sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigproctqmask(SIG_BLOCK,&set,NULL); + sigprocmask(SIG_BLOCK,&set,NULL); if ((err=snd_pcm_writei(obj->write_handle,buf,size/obj->frame_size))<0){ if (err!=-EPIPE){ g_warning("alsa_card_write: snd_pcm_writei() failed:%s.",snd_strerror(err)); @@ -332,7 +332,7 @@ int __alsa_card_write(AlsaCard *obj,char *buf,int size) if (err<0) g_warning("alsa_card_write: Error writing sound buffer (size=%i):%s",size,snd_strerror(err)); } - sigproctqmask(SIG_UNBLOCK,&set,NULL); + sigprocmask(SIG_UNBLOCK,&set,NULL); return err; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h index 9ee33ef4..1d7ba3a0 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h @@ -27,7 +27,7 @@ #include <alsa/asoundlib.h> struct _AlsaCard { - SndCard tqparent; + SndCard parent; gchar *pcmdev; gchar *mixdev; snd_pcm_t *read_handle; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h index 30128191..3f5ad16f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h @@ -44,14 +44,14 @@ static inline int val_seg(int val) static inline unsigned char s16_to_alaw(int pcm_val) { - int tqmask; + int mask; int seg; unsigned char aval; if (pcm_val >= 0) { - tqmask = 0xD5; + mask = 0xD5; } else { - tqmask = 0x55; + mask = 0x55; pcm_val = -pcm_val; if (pcm_val > 0x7fff) pcm_val = 0x7fff; @@ -64,7 +64,7 @@ static inline unsigned char s16_to_alaw(int pcm_val) seg = val_seg(pcm_val); aval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f); } - return aval ^ tqmask; + return aval ^ mask; } /* @@ -119,16 +119,16 @@ static inline int alaw_to_s16(unsigned char a_val) static inline unsigned char s16_to_ulaw(int pcm_val) /* 2's complement (16-bit range) */ { - int tqmask; + int mask; int seg; unsigned char uval; if (pcm_val < 0) { pcm_val = 0x84 - pcm_val; - tqmask = 0x7f; + mask = 0x7f; } else { pcm_val += 0x84; - tqmask = 0xff; + mask = 0xff; } if (pcm_val > 0x7fff) pcm_val = 0x7fff; @@ -141,7 +141,7 @@ static inline unsigned char s16_to_ulaw(int pcm_val) /* 2's complement (16-bit r * and complement the code word. */ uval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f); - return uval ^ tqmask; + return uval ^ mask; } /* diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c index fe98df74..8a636c99 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c @@ -194,7 +194,7 @@ void hpux_snd_card_set_level(HpuxSndCard *obj,gint way,gint a) g_warning("hpux_snd_card_set_level: unsupported command."); return; } - gain.channel_tqmask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; + gain.channel_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; mix_fd = open(obj->mixdev_name, O_WRONLY); g_return_if_fail(mix_fd>0); error=ioctl(mix_fd,AUDIO_SET_GAINS,&gain); @@ -210,7 +210,7 @@ gint hpux_snd_card_get_level(HpuxSndCard *obj,gint way) int p=0,mix_fd,error; g_return_if_fail(obj->mixdev_name!=NULL); - gain.channel_tqmask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; + gain.channel_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; mix_fd = open(obj->mixdev_name, O_RDONLY); g_return_if_fail(mix_fd>0); error=ioctl(mix_fd,AUDIO_GET_GAINS,&gain); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h index ae6f1c7c..0118e035 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h @@ -54,7 +54,7 @@ typedef struct { struct _JackCard { - SndCard tqparent; + SndCard parent; jack_client_t *client; gboolean jack_running; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h index 9c7d5ab3..0ce08618 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h @@ -36,7 +36,7 @@ struct _MSSdlOut { - MSFilter tqparent; + MSFilter parent; MSQueue *input[2]; gint width,height; const gchar *format; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h index 9c7f7fc4..370af69e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h @@ -27,7 +27,7 @@ struct _MSSpeexDec { - MSFilter tqparent; + MSFilter parent; MSQueue *inq[1]; /* speex has an input q because it can be variable bit rate */ MSFifo *outf[1]; void *speex_state; @@ -42,7 +42,7 @@ typedef struct _MSSpeexDec MSSpeexDec; struct _MSSpeexDecClass { - MSFilterClass tqparent; + MSFilterClass parent; }; typedef struct _MSSpeexDecClass MSSpeexDecClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h index 2325ba23..f63edfcd 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h @@ -27,7 +27,7 @@ struct _MSSpeexEnc { - MSFilter tqparent; + MSFilter parent; MSFifo *inf[1]; MSQueue *outq[1]; /* speex has an output q because it can be variable bit rate */ void *speex_state; @@ -42,7 +42,7 @@ typedef struct _MSSpeexEnc MSSpeexEnc; struct _MSSpeexEncClass { - MSFilterClass tqparent; + MSFilterClass parent; }; typedef struct _MSSpeexEncClass MSSpeexEncClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h index 950187b8..3dc5ee04 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h @@ -27,7 +27,7 @@ struct _MSV4l { - MSVideoSource tqparent; + MSVideoSource parent; int fd; char *device; struct video_capability cap; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h index 6413c682..0f1e09ab 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h @@ -27,7 +27,7 @@ #define OSS_CARD_BUFFERS 3 struct _OssCard { - SndCard tqparent; + SndCard parent; gchar *dev_name; /* /dev/dsp0 for example */ gchar *mixdev_name; /* /dev/mixer0 for example */ gint fd; /* the file descriptor of the open soundcard, 0 if not open*/ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h index caf906df..2ffc6cd1 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h @@ -24,7 +24,7 @@ typedef struct _PortAudioCard { - SndCard tqparent; + SndCard parent; PortAudioStream* stream; char *out_buffer, *out_buffer_read, *out_buffer_write, *out_buffer_end; char *in_buffer, *in_buffer_read, *in_buffer_write, *in_buffer_end; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c index 1ac35d9c..80e07682 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c @@ -101,7 +101,7 @@ void ortp_scheduler_init() sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigproctqmask(SIG_BLOCK,&set,NULL); + sigprocmask(SIG_BLOCK,&set,NULL); #endif /* __hpux */ if (!g_thread_supported()) g_thread_init(NULL); __ortp_scheduler=rtp_scheduler_new(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h index 7518e075..e7702000 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h @@ -177,7 +177,7 @@ struct _RtpSession RtpSessionMode mode; struct _RtpScheduler *sched; guint32 flags; - gint mask_pos; /* the position in the scheduler tqmask of RtpSession */ + gint mask_pos; /* the position in the scheduler mask of RtpSession */ gpointer user_data; /* telephony events extension */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c index bee787a2..17ff6748 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c @@ -148,7 +148,7 @@ gpointer rtp_scheduler_schedule(gpointer psched) g_mutex_unlock(sched->lock); /* now while the scheduler is going to sleep, the other threads can compute their - result tqmask and see if they have to leave, or to wait for next tick*/ + result mask and see if they have to leave, or to wait for next tick*/ //g_message("scheduler: sleeping."); timer->timer_do(); sched->time_+=sched->timer_inc; @@ -174,7 +174,7 @@ void rtp_scheduler_add_session(RtpScheduler *sched, RtpSession *session) if (sched->max_sessions==0){ g_error("rtp_scheduler_add_session: max_session=0 !"); } - /* find a free pos in the session tqmask*/ + /* find a free pos in the session mask*/ for (i=0;i<sched->max_sessions;i++){ if (!ORTP_FD_ISSET(i,&sched->all_sessions.rtpset)){ session->mask_pos=i; @@ -229,7 +229,7 @@ void rtp_scheduler_remove_session(RtpScheduler *sched, RtpSession *session) } } rtp_session_unset_flag(session,RTP_SESSION_IN_SCHEDULER); - /* delete the bit in the tqmask */ + /* delete the bit in the mask */ session_set_clr(&sched->all_sessions,session); rtp_scheduler_unlock(sched); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h index 4dcd9afb..91cde6a9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h @@ -29,13 +29,13 @@ struct _RtpScheduler { RtpSession *list; /* list of scheduled sessions*/ - SessionSet all_sessions; /* tqmask of scheduled sessions */ - gint all_max; /* the highest pos in the all tqmask */ - SessionSet r_sessions; /* tqmask of sessions that have a recv event */ + SessionSet all_sessions; /* mask of scheduled sessions */ + gint all_max; /* the highest pos in the all mask */ + SessionSet r_sessions; /* mask of sessions that have a recv event */ gint r_max; - SessionSet w_sessions; /* tqmask of sessions that have a send event */ + SessionSet w_sessions; /* mask of sessions that have a send event */ gint w_max; - SessionSet e_sessions; /* tqmask of session that have error event */ + SessionSet e_sessions; /* mask of session that have error event */ gint e_max; gint max_sessions; /* the number of position in the masks */ /* GMutex *unblock_select_mutex; */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c index 36856a99..7b5ad921 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c @@ -60,27 +60,27 @@ void session_set_destroy(SessionSet *set) gint session_set_and(SessionSet *sched_set, gint maxs, SessionSet *user_set, SessionSet *result_set) { - guint32 *tqmask1,*tqmask2,*tqmask3; + guint32 *mask1,*mask2,*mask3; gint i=0; gint j,ret=0; - tqmask1=(guint32*)&sched_set->rtpset; - tqmask2=(guint32*)&user_set->rtpset; - tqmask3=(guint32*)&result_set->rtpset; + mask1=(guint32*)&sched_set->rtpset; + mask2=(guint32*)&user_set->rtpset; + mask3=(guint32*)&result_set->rtpset; while(i<maxs+1){ - *tqmask3=(*tqmask1) & (*tqmask2); /* computes the AND between the two masks*/ + *mask3=(*mask1) & (*mask2); /* computes the AND between the two masks*/ /* and unset the sessions that have been found from the sched_set */ - *tqmask1=(*tqmask1) & (~(*tqmask3)); - if ((*tqmask3)!=0){ + *mask1=(*mask1) & (~(*mask3)); + if ((*mask3)!=0){ for (j=0;j<32;j++){ - if ( ((*tqmask3)>>j) & 1){ + if ( ((*mask3)>>j) & 1){ ret++; } } } i+=32; - tqmask1++; - tqmask2++; - tqmask3++; + mask1++; + mask2++; + mask3++; } //printf("session_set_and: ret=%i\n",ret); return ret; @@ -120,8 +120,8 @@ int session_set_select(SessionSet *recvs, SessionSet *sends, SessionSet *errors) rtp_scheduler_lock(sched); while(1){ - /* computes the SessionSet intersection (in the other words tqmask intersection) between - the tqmask given by the user and scheduler masks */ + /* computes the SessionSet intersection (in the other words mask intersection) between + the mask given by the user and scheduler masks */ if (recvs!=NULL){ bits=session_set_and(&sched->r_sessions,sched->all_max,recvs,&temp); if (bits>0){ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h index 8d166222..623b9d10 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h @@ -45,7 +45,7 @@ typedef fd_set ortp_fd_set; do { \ unsigned int __i; \ ortp_fd_set *__arr = (s); \ - for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_tqmask); ++__i) \ + for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_mask); ++__i) \ ORTP__FDS_BITS (__arr)[__i] = 0; \ } while (0) #define ORTP_FD_SET(d, s) (ORTP__FDS_BITS (s)[ORTP__FDELT(d)] |= ORTP__FDMASK(d)) @@ -55,22 +55,22 @@ typedef fd_set ortp_fd_set; /* The fd_set member is required to be an array of longs. */ -typedef long int ortp__fd_tqmask; +typedef long int ortp__fd_mask; /* Number of bits per word of `fd_set' (some code assumes this is 32). */ #define ORTP__FD_SETSIZE 1024 /* It's easier to assume 8-bit bytes than to get CHAR_BIT. */ -#define ORTP__NFDBITS (8 * sizeof (ortp__fd_tqmask)) +#define ORTP__NFDBITS (8 * sizeof (ortp__fd_mask)) #define ORTP__FDELT(d) ((d) / ORTP__NFDBITS) -#define ORTP__FDMASK(d) ((ortp__fd_tqmask) 1 << ((d) % ORTP__NFDBITS)) +#define ORTP__FDMASK(d) ((ortp__fd_mask) 1 << ((d) % ORTP__NFDBITS)) /* fd_set for select and pselect. */ typedef struct { - ortp__fd_tqmask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS]; + ortp__fd_mask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS]; # define ORTP__FDS_BITS(set) ((set)->fds_bits) } ortp_fd_set; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc index f5b9d0b4..fa6a14a6 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc @@ -245,7 +245,7 @@ XmppClient::Disconnect() { return XMPP_RETURN_OK; } -XmppClient::XmppClient(Task * tqparent) : Task(tqparent), +XmppClient::XmppClient(Task * parent) : Task(parent), delivering_signal_(false) { d_.reset(new Private(this)); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h index 540d774d..fd65c39c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h @@ -51,9 +51,9 @@ class CaptchaChallenge; // ///////////////////////////////////////////////////////////////////// // -// See Task first. XmppClient is a tqparent task for XmppTasks. +// See Task first. XmppClient is a parent task for XmppTasks. // -// XmppClient is a task which is designed to be the tqparent task for +// XmppClient is a task which is designed to be the parent task for // all tasks that depend on a single Xmpp connection. If you want to, // for example, listen for subscription requests forever, then your // listener should be a task that is a child of the XmppClient that owns @@ -71,7 +71,7 @@ class CaptchaChallenge; class XmppClient : public Task, public sigslot::has_slots<> { public: - XmppClient(Task * tqparent); + XmppClient(Task * parent); ~XmppClient(); XmppReturntqStatus Connect(const XmppClientSettings & settings, diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc index 38ed1994..e7ac0e04 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc @@ -32,9 +32,9 @@ namespace buzz { -XmppTask::XmppTask(Task * tqparent, XmppEngine::HandlerLevel level) - : Task(tqparent), client_(NULL) { - XmppClient * client = (XmppClient*)tqparent->GetParent(XMPP_CLIENT_TASK_CODE); +XmppTask::XmppTask(Task * parent, XmppEngine::HandlerLevel level) + : Task(parent), client_(NULL) { + XmppClient * client = (XmppClient*)parent->GetParent(XMPP_CLIENT_TASK_CODE); client_ = client; id_ = client->NextId(); client->AddXmppTask(this, level); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h index d84019a2..a1ed3dd3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h @@ -45,7 +45,7 @@ namespace buzz { // See Task and XmppClient first. // // XmppTask is a task that is designed to go underneath XmppClient and be -// useful there. It has a way of finding its XmppClient tqparent so you +// useful there. It has a way of finding its XmppClient parent so you // can have it nested arbitrarily deep under an XmppClient and it can // still find the XMPP services. // @@ -69,7 +69,7 @@ class XmppTask : public sigslot::has_slots<> { public: - XmppTask(Task * tqparent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); + XmppTask(Task * parent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); virtual ~XmppTask(); virtual XmppClient * GetClient() const { return client_; } diff --git a/kopete/protocols/jabber/libiris/001_last_activity.patch b/kopete/protocols/jabber/libiris/001_last_activity.patch index 4e91b8ef..24673e80 100644 --- a/kopete/protocols/jabber/libiris/001_last_activity.patch +++ b/kopete/protocols/jabber/libiris/001_last_activity.patch @@ -51,8 +51,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + QString message; +}; + -+JT_GetLastActivity::JT_GetLastActivity(Task *tqparent) -+:Task(tqparent) ++JT_GetLastActivity::JT_GetLastActivity(Task *parent) ++:Task(parent) +{ + d = new Private; +} @@ -110,4 +110,4 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +//---------------------------------------------------------------------------- // JT_GetServices //---------------------------------------------------------------------------- - JT_GetServices::JT_GetServices(Task *tqparent) + JT_GetServices::JT_GetServices(Task *parent) diff --git a/kopete/protocols/jabber/libiris/004_xhtml_im.patch b/kopete/protocols/jabber/libiris/004_xhtml_im.patch index feba04bb..990ab4f7 100644 --- a/kopete/protocols/jabber/libiris/004_xhtml_im.patch +++ b/kopete/protocols/jabber/libiris/004_xhtml_im.patch @@ -127,17 +127,17 @@ Index: iris/xmpp-im/types.cpp } - + if ( !d->xHTMLBody.isEmpty()) { -+ QDomElement tqparent = s.createElement(s.xhtmlImNS(), "html"); ++ QDomElement parent = s.createElement(s.xhtmlImNS(), "html"); + for(it = d->xHTMLBody.begin(); it != d->xHTMLBody.end(); ++it) { + const QString &str = it.data(); + if(!str.isEmpty()) { + QDomElement child = s.createXHTMLElement(str); + if(!it.key().isEmpty()) + child.setAttributeNS(NS_XML, "xml:lang", it.key()); -+ tqparent.appendChild(child); ++ parent.appendChild(child); + } + } -+ s.appendChild(tqparent); ++ s.appendChild(parent); + } if(d->type == "error") s.setError(d->error); diff --git a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch index 844d5e3f..4632af45 100644 --- a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch +++ b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch @@ -63,7 +63,7 @@ Index: iris/xmpp-im/xmpp_tasks.h + { + Q_OBJECT + public: -+ JT_MucPresence(Task *tqparent); ++ JT_MucPresence(Task *parent); + ~JT_MucPresence(); + + void pres(const tqStatus &); @@ -92,8 +92,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +//---------------------------------------------------------------------------- +// JT_MucPresence +//---------------------------------------------------------------------------- -+JT_MucPresence::JT_MucPresence(Task *tqparent) -+:Task(tqparent) ++JT_MucPresence::JT_MucPresence(Task *parent) ++:Task(parent) +{ + type = -1; +} diff --git a/kopete/protocols/jabber/libiris/006_private_storage.patch b/kopete/protocols/jabber/libiris/006_private_storage.patch index 35031fec..288d24c5 100644 --- a/kopete/protocols/jabber/libiris/006_private_storage.patch +++ b/kopete/protocols/jabber/libiris/006_private_storage.patch @@ -11,7 +11,7 @@ Index: iris/xmpp-im/xmpp_tasks.h + { + Q_OBJECT + public: -+ JT_PrivateStorage(Task *tqparent); ++ JT_PrivateStorage(Task *parent); + ~JT_PrivateStorage(); + + void set(const QDomElement &); @@ -53,8 +53,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + int type; +}; + -+JT_PrivateStorage::JT_PrivateStorage(Task *tqparent) -+ :Task(tqparent) ++JT_PrivateStorage::JT_PrivateStorage(Task *parent) ++ :Task(parent) +{ + d = new Private; +} diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp index 3d54cc16..27184748 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp @@ -58,8 +58,8 @@ public: SafeDelete sd; }; -BSocket::BSocket(TQObject *tqparent) -:ByteStream(tqparent) +BSocket::BSocket(TQObject *parent) +:ByteStream(parent) { d = new Private; #ifndef NO_NDNS diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h index 246f61a0..25e33c04 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h @@ -34,7 +34,7 @@ class BSocket : public ByteStream public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound }; enum State { Idle, HostLookup, Connecting, Connected, Closing }; - BSocket(TQObject *tqparent=0); + BSocket(TQObject *parent=0); ~BSocket(); void connectToHost(const TQString &host, TQ_UINT16 port); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp index ca3b804c..6abeb556 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp @@ -96,8 +96,8 @@ public: bool active; }; -HttpConnect::HttpConnect(TQObject *tqparent) -:ByteStream(tqparent) +HttpConnect::HttpConnect(TQObject *parent) +:ByteStream(parent) { d = new Private; connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h index 2f2ed13f..6c73acd5 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h @@ -31,7 +31,7 @@ class HttpConnect : public ByteStream TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpConnect(TQObject *tqparent=0); + HttpConnect(TQObject *parent=0); ~HttpConnect(); void setAuth(const TQString &user, const TQString &pass=""); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp index fbc9a39f..cd5b2f64 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp @@ -82,8 +82,8 @@ public: int polltime; }; -HttpPoll::HttpPoll(TQObject *tqparent) -:ByteStream(tqparent) +HttpPoll::HttpPoll(TQObject *parent) +:ByteStream(parent) { d = new Private; @@ -438,8 +438,8 @@ public: TQString host; }; -HttpProxyPost::HttpProxyPost(TQObject *tqparent) -:TQObject(tqparent) +HttpProxyPost::HttpProxyPost(TQObject *parent) +:TQObject(parent) { d = new Private; connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h index 02034fee..a4c542f6 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h @@ -31,7 +31,7 @@ class HttpPoll : public ByteStream TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpPoll(TQObject *tqparent=0); + HttpPoll(TQObject *parent=0); ~HttpPoll(); void setAuth(const TQString &user, const TQString &pass=""); @@ -74,7 +74,7 @@ class HttpProxyPost : public TQObject TQ_OBJECT public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpProxyPost(TQObject *tqparent=0); + HttpProxyPost(TQObject *parent=0); ~HttpProxyPost(); void setAuth(const TQString &user, const TQString &pass=""); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp index b94399ce..7db5defb 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp @@ -256,9 +256,9 @@ void NDnsManager::app_aboutToQuit() //! This signal is emitted when the DNS resolution succeeds or fails. //! -//! Constructs an NDns object with tqparent \a tqparent. -NDns::NDns(TQObject *tqparent) -:TQObject(tqparent) +//! Constructs an NDns object with parent \a parent. +NDns::NDns(TQObject *parent) +:TQObject(parent) { } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h index b48ff75e..3b000d9b 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h @@ -37,7 +37,7 @@ class NDns : public TQObject Q_OBJECT TQ_OBJECT public: - NDns(TQObject *tqparent=0); + NDns(TQObject *parent=0); ~NDns(); void resolve(const TQString &); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp index 2968968c..0e0b5337 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp @@ -33,8 +33,8 @@ public: ServSockSignal *serv; }; -ServSock::ServSock(TQObject *tqparent) -:TQObject(tqparent) +ServSock::ServSock(TQObject *parent) +:TQObject(parent) { d = new Private; d->serv = 0; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h index 0fddf2e0..fe63abef 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h @@ -30,7 +30,7 @@ class ServSock : public TQObject Q_OBJECT TQ_OBJECT public: - ServSock(TQObject *tqparent=0); + ServSock(TQObject *parent=0); ~ServSock(); bool isActive() const; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp index 7948dcd7..16f02e07 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp @@ -527,16 +527,16 @@ public: int udpPort; }; -SocksClient::SocksClient(TQObject *tqparent) -:ByteStream(tqparent) +SocksClient::SocksClient(TQObject *parent) +:ByteStream(parent) { init(); d->incoming = false; } -SocksClient::SocksClient(int s, TQObject *tqparent) -:ByteStream(tqparent) +SocksClient::SocksClient(int s, TQObject *parent) +:ByteStream(parent) { init(); @@ -1102,8 +1102,8 @@ public: TQSocketNotifier *sn; }; -SocksServer::SocksServer(TQObject *tqparent) -:TQObject(tqparent) +SocksServer::SocksServer(TQObject *parent) +:TQObject(parent) { d = new Private; d->sd = 0; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h index d61fef1a..14c2a176 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h @@ -61,8 +61,8 @@ public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; enum Method { AuthNone=0x0001, AuthUsername=0x0002 }; enum Request { ReqConnect, ReqUDPAssociate }; - SocksClient(TQObject *tqparent=0); - SocksClient(int, TQObject *tqparent=0); + SocksClient(TQObject *parent=0); + SocksClient(int, TQObject *parent=0); ~SocksClient(); bool isIncoming() const; @@ -132,7 +132,7 @@ class SocksServer : public TQObject Q_OBJECT TQ_OBJECT public: - SocksServer(TQObject *tqparent=0); + SocksServer(TQObject *parent=0); ~SocksServer(); bool isActive() const; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp index 68f260ca..987de66c 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp @@ -78,8 +78,8 @@ public: SafeDelete sd; }; -SrvResolver::SrvResolver(TQObject *tqparent) -:TQObject(tqparent) +SrvResolver::SrvResolver(TQObject *parent) +:TQObject(parent) { d = new Private; d->qdns = 0; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h index 5533790e..8ef15684 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h @@ -31,7 +31,7 @@ class SrvResolver : public TQObject Q_OBJECT TQ_OBJECT public: - SrvResolver(TQObject *tqparent=0); + SrvResolver(TQObject *parent=0); ~SrvResolver(); void resolve(const TQString &server, const TQString &type, const TQString &proto); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp index 76d4a799..e78c2f9a 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp @@ -63,9 +63,9 @@ public: }; //! -//! Constructs a ByteStream object with tqparent \a tqparent. -ByteStream::ByteStream(TQObject *tqparent) -:TQObject(tqparent) +//! Constructs a ByteStream object with parent \a parent. +ByteStream::ByteStream(TQObject *parent) +:TQObject(parent) { d = new Private; } diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h index 5706fff6..b72fad78 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h @@ -33,7 +33,7 @@ class ByteStream : public TQObject TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *tqparent=0); + ByteStream(TQObject *parent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp index 2b9407ce..0c8b46df 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp @@ -27,8 +27,8 @@ #include<tqtextstream.h> -ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *tqparent, const char *name) -:TQDialog(tqparent, name, FALSE, WDestructiveClose) +ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, const char *name) +:TQDialog(parent, name, FALSE, WDestructiveClose) { TQString text; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h index 408699f7..8c84be12 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h @@ -28,7 +28,7 @@ class ShowTextDlg : public TQDialog Q_OBJECT TQ_OBJECT public: - ShowTextDlg(const TQString &fname, bool rich=FALSE, TQWidget *tqparent=0, const char *name=0); + ShowTextDlg(const TQString &fname, bool rich=FALSE, TQWidget *parent=0, const char *name=0); }; #endif diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h index 3e52c5d2..8387d48a 100644 --- a/kopete/protocols/jabber/libiris/iris/include/im.h +++ b/kopete/protocols/jabber/libiris/iris/include/im.h @@ -498,11 +498,11 @@ namespace XMPP TQ_OBJECT public: enum { ErrDisc }; - Task(Task *tqparent); + Task(Task *parent); Task(Client *, bool isRoot); virtual ~Task(); - Task *tqparent() const; + Task *parent() const; Client *client() const; TQDomDocument *doc() const; TQString id() const; @@ -546,7 +546,7 @@ namespace XMPP TQ_OBJECT public: - Client(TQObject *tqparent=0); + Client(TQObject *parent=0); ~Client(); bool isActive() const; diff --git a/kopete/protocols/jabber/libiris/iris/include/xmpp.h b/kopete/protocols/jabber/libiris/iris/include/xmpp.h index a59a4827..ef5604a1 100644 --- a/kopete/protocols/jabber/libiris/iris/include/xmpp.h +++ b/kopete/protocols/jabber/libiris/iris/include/xmpp.h @@ -65,7 +65,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - Connector(TQObject *tqparent=0); + Connector(TQObject *parent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; @@ -99,7 +99,7 @@ namespace XMPP TQ_OBJECT public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream }; - AdvancedConnector(TQObject *tqparent=0); + AdvancedConnector(TQObject *parent=0); virtual ~AdvancedConnector(); class Proxy @@ -173,7 +173,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - TLSHandler(TQObject *tqparent=0); + TLSHandler(TQObject *parent=0); virtual ~TLSHandler(); virtual void reset()=0; @@ -194,7 +194,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - QCATLSHandler(QCA::TLS *tqparent); + QCATLSHandler(QCA::TLS *parent); ~QCATLSHandler(); QCA::TLS *tls() const; @@ -375,7 +375,7 @@ namespace XMPP SystemShutdown }; - Stream(TQObject *tqparent=0); + Stream(TQObject *parent=0); virtual ~Stream(); virtual TQDomDocument & doc() const=0; @@ -456,8 +456,8 @@ namespace XMPP BindConflict // resource in-use }; - ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *tqparent=0); - ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls=0, TQObject *tqparent=0); // server + ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *parent=0); + ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls=0, TQObject *parent=0); // server ~ClientStream(); Jid jid() const; diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp index 2a9553a2..86bc65b0 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp @@ -67,8 +67,8 @@ public: bool sender; }; -FileTransfer::FileTransfer(FileTransferManager *m, TQObject *tqparent) -:TQObject(tqparent) +FileTransfer::FileTransfer(FileTransferManager *m, TQObject *parent) +:TQObject(parent) { d = new Private; d->m = m; @@ -450,8 +450,8 @@ public: TQStringList streamTypes; }; -JT_FT::JT_FT(Task *tqparent) -:Task(tqparent) +JT_FT::JT_FT(Task *parent) +:Task(parent) { d = new Private; } @@ -619,8 +619,8 @@ bool JT_FT::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_PushFT //---------------------------------------------------------------------------- -JT_PushFT::JT_PushFT(Task *tqparent) -:Task(tqparent) +JT_PushFT::JT_PushFT(Task *parent) +:Task(parent) { } diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h index 6ad8f7ff..f3688768 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h @@ -81,7 +81,7 @@ namespace XMPP void reset(); friend class FileTransferManager; - FileTransfer(FileTransferManager *, TQObject *tqparent=0); + FileTransfer(FileTransferManager *, TQObject *parent=0); void man_waitForAccept(const FTRequest &req); void takeConnection(S5BConnection *c); }; @@ -123,7 +123,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_FT(Task *tqparent); + JT_FT(Task *parent); ~JT_FT(); void request(const Jid &to, const TQString &id, const TQString &fname, TQ_LLONG size, const TQString &desc, const TQStringList &streamTypes); @@ -154,7 +154,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushFT(Task *tqparent); + JT_PushFT(Task *parent); ~JT_PushFT(); void respondSuccess(const Jid &to, const TQString &id, TQ_LLONG rangeOffset, TQ_LLONG rangeLength, const TQString &streamType); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp index 1914ad26..9e1f4ccd 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp @@ -185,8 +185,8 @@ public: static int id_conn = 0; static int num_conn = 0; -S5BConnection::S5BConnection(S5BManager *m, TQObject *tqparent) -:ByteStream(tqparent) +S5BConnection::S5BConnection(S5BManager *m, TQObject *parent) +:ByteStream(parent) { d = new Private; d->m = m; @@ -575,15 +575,15 @@ public: JT_PushS5B *ps; }; -S5BManager::S5BManager(Client *tqparent) -:TQObject(tqparent) +S5BManager::S5BManager(Client *parent) +:TQObject(parent) { // S5B needs SHA1 if(!QCA::isSupported(QCA::CAP_SHA1)) QCA::insertProvider(createProviderHash()); d = new Private; - d->client = tqparent; + d->client = parent; d->serv = 0; d->activeList.setAutoDelete(true); @@ -1865,8 +1865,8 @@ public: TQTimer t; }; -S5BConnector::S5BConnector(TQObject *tqparent) -:TQObject(tqparent) +S5BConnector::S5BConnector(TQObject *parent) +:TQObject(parent) { d = new Private; d->active = 0; @@ -2054,8 +2054,8 @@ public: TQPtrList<Item> itemList; }; -S5BServer::S5BServer(TQObject *tqparent) -:TQObject(tqparent) +S5BServer::S5BServer(TQObject *parent) +:TQObject(parent) { d = new Private; d->itemList.setAutoDelete(true); @@ -2195,8 +2195,8 @@ public: TQTimer t; }; -JT_S5B::JT_S5B(Task *tqparent) -:Task(tqparent) +JT_S5B::JT_S5B(Task *parent) +:Task(parent) { d = new Private; d->mode = -1; @@ -2356,8 +2356,8 @@ StreamHost JT_S5B::proxyInfo() const //---------------------------------------------------------------------------- // JT_PushS5B //---------------------------------------------------------------------------- -JT_PushS5B::JT_PushS5B(Task *tqparent) -:Task(tqparent) +JT_PushS5B::JT_PushS5B(Task *parent) +:Task(parent) { } diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h index d9818503..d925e25f 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h @@ -125,7 +125,7 @@ namespace XMPP void man_clientReady(SocksClient *, SocksUDP *); void man_udpReady(const TQByteArray &buf); void man_failed(int); - S5BConnection(S5BManager *, TQObject *tqparent=0); + S5BConnection(S5BManager *, TQObject *parent=0); }; class S5BManager : public TQObject @@ -203,7 +203,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - S5BConnector(TQObject *tqparent=0); + S5BConnector(TQObject *parent=0); ~S5BConnector(); void reset(); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp index 6bf15aa2..2ca012c1 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp @@ -346,11 +346,11 @@ public: JT_IBB *ibb; }; -IBBManager::IBBManager(Client *tqparent) -:TQObject(tqparent) +IBBManager::IBBManager(Client *parent) +:TQObject(parent) { d = new Private; - d->client = tqparent; + d->client = parent; d->ibb = new JT_IBB(d->client->rootTask(), true); connect(d->ibb, TQT_SIGNAL(incomingRequest(const Jid &, const TQString &, const TQDomElement &)), TQT_SLOT(ibb_incomingRequest(const Jid &, const TQString &, const TQDomElement &))); @@ -479,8 +479,8 @@ public: TQString streamid; }; -JT_IBB::JT_IBB(Task *tqparent, bool serve) -:Task(tqparent) +JT_IBB::JT_IBB(Task *parent, bool serve) +:Task(parent) { d = new Private; d->serve = serve; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp index ab2a5d5c..6e73799d 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp @@ -55,8 +55,8 @@ using namespace XMPP; //---------------------------------------------------------------------------- // Connector //---------------------------------------------------------------------------- -Connector::Connector(TQObject *tqparent) -:TQObject(tqparent) +Connector::Connector(TQObject *parent) +:TQObject(parent) { setUseSSL(false); setPeerAddressNone(); @@ -223,8 +223,8 @@ public: SafeDelete sd; }; -AdvancedConnector::AdvancedConnector(TQObject *tqparent) -:Connector(tqparent) +AdvancedConnector::AdvancedConnector(TQObject *parent) +:Connector(parent) { d = new Private; d->bs = 0; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index 59b28f8b..0e324cb1 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp @@ -488,8 +488,8 @@ void Stanza::clearError() // Stream //---------------------------------------------------------------------------- static XmlProtocol *foo = 0; -Stream::Stream(TQObject *tqparent) -:TQObject(tqparent) +Stream::Stream(TQObject *parent) +:TQObject(parent) { } @@ -612,8 +612,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tqparent) -:Stream(tqparent) +ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *parent) +:Stream(parent) { d = new Private; d->mode = Client; @@ -627,8 +627,8 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tq d->tlsHandler = tlsHandler; } -ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *tqparent) -:Stream(tqparent) +ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *parent) +:Stream(parent) { d = new Private; d->mode = Server; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp index 996727ea..313c6b6a 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp @@ -28,8 +28,8 @@ using namespace XMPP; //---------------------------------------------------------------------------- // TLSHandler //---------------------------------------------------------------------------- -TLSHandler::TLSHandler(TQObject *tqparent) -:TQObject(tqparent) +TLSHandler::TLSHandler(TQObject *parent) +:TQObject(parent) { } @@ -48,11 +48,11 @@ public: int state, err; }; -QCATLSHandler::QCATLSHandler(QCA::TLS *tqparent) -:TLSHandler(tqparent) +QCATLSHandler::QCATLSHandler(QCA::TLS *parent) +:TLSHandler(parent) { d = new Private; - d->tls = tqparent; + d->tls = parent; connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp index 91111ea9..d1650842 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -32,7 +32,7 @@ using namespace XMPP; // redundant namespaces. static TQDomElement stripExtraNS(const TQDomElement &e) { - // find closest tqparent with a namespace + // find closest parent with a namespace TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) par = par.parentNode(); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 7b425696..9d5ee471 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -34,7 +34,7 @@ //! Client, you will need to manually invoke Tasks. Fortunately, the //! process is very simple. //! -//! The entire Task system is heavily founded on TQt. All Tasks have a tqparent, +//! The entire Task system is heavily founded on TQt. All Tasks have a parent, //! except for the root Task, and are considered TQObjects. By using TQt's RTTI //! facilities (TQObject::sender(), TQObject::isA(), etc), you can use a //! "fire and forget" approach with Tasks. @@ -469,7 +469,7 @@ void Client::streamCloseFinished() static TQDomElement oldStyleNS(const TQDomElement &e) { - // find closest tqparent with a namespace + // find closest parent with a namespace TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) par = par.parentNode(); @@ -1155,22 +1155,22 @@ public: bool done; }; -Task::Task(Task *tqparent) -:TQObject(tqparent) +Task::Task(Task *parent) +:TQObject(parent) { init(); - d->client = tqparent->client(); + d->client = parent->client(); d->id = client()->genUniqueId(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Client *tqparent, bool) +Task::Task(Client *parent, bool) :TQObject(0) { init(); - d->client = tqparent; + d->client = parent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -1189,9 +1189,9 @@ void Task::init() d->done = false; } -Task *Task::tqparent() const +Task *Task::parent() const { - return (Task *)TQObject::tqparent(); + return (Task *)TQObject::parent(); } Client *Task::client() const diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index 522e52f9..9e742d10 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -503,17 +503,17 @@ Stanza Message::toStanza(Stream *stream) const } } if ( !d->xHTMLBody.isEmpty()) { - TQDomElement tqparent = s.createElement(s.xhtmlImNS(), "html"); + TQDomElement parent = s.createElement(s.xhtmlImNS(), "html"); for(it = d->xHTMLBody.begin(); it != d->xHTMLBody.end(); ++it) { const TQString &str = it.data(); if(!str.isEmpty()) { TQDomElement child = s.createXHTMLElement(str); if(!it.key().isEmpty()) child.setAttributeNS(NS_XML, "xml:lang", it.key()); - tqparent.appendChild(child); + parent.appendChild(child); } } - s.appendChild(tqparent); + s.appendChild(parent); } if(d->type == "error") s.setError(d->error); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index 45ef7a04..4e4c96d1 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -103,8 +103,8 @@ public: int type; }; -JT_Register::JT_Register(Task *tqparent) -:Task(tqparent) +JT_Register::JT_Register(Task *parent) +:Task(parent) { d = new Private; d->type = -1; @@ -246,8 +246,8 @@ public: JT_Register *jt_reg; }; -JT_UnRegister::JT_UnRegister(Task *tqparent) -: Task(tqparent) +JT_UnRegister::JT_UnRegister(Task *parent) +: Task(parent) { d = new Private; d->jt_reg = 0; @@ -306,8 +306,8 @@ public: TQValueList<TQDomElement> itemList; }; -JT_Roster::JT_Roster(Task *tqparent) -:Task(tqparent) +JT_Roster::JT_Roster(Task *parent) +:Task(parent) { type = -1; d = new Private; @@ -448,8 +448,8 @@ bool JT_Roster::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_PushRoster //---------------------------------------------------------------------------- -JT_PushRoster::JT_PushRoster(Task *tqparent) -:Task(tqparent) +JT_PushRoster::JT_PushRoster(Task *parent) +:Task(parent) { } @@ -475,8 +475,8 @@ bool JT_PushRoster::take(const TQDomElement &e) //---------------------------------------------------------------------------- // JT_Presence //---------------------------------------------------------------------------- -JT_Presence::JT_Presence(Task *tqparent) -:Task(tqparent) +JT_Presence::JT_Presence(Task *parent) +:Task(parent) { type = -1; } @@ -554,8 +554,8 @@ void JT_Presence::onGo() //---------------------------------------------------------------------------- // JT_PushPresence //---------------------------------------------------------------------------- -JT_PushPresence::JT_PushPresence(Task *tqparent) -:Task(tqparent) +JT_PushPresence::JT_PushPresence(Task *parent) +:Task(parent) { } @@ -653,7 +653,7 @@ bool JT_PushPresence::take(const TQDomElement &e) //---------------------------------------------------------------------------- static TQDomElement oldStyleNS(const TQDomElement &e) { - // find closest tqparent with a namespace + // find closest parent with a namespace TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) par = par.parentNode(); @@ -688,8 +688,8 @@ static TQDomElement oldStyleNS(const TQDomElement &e) return i; } -JT_Message::JT_Message(Task *tqparent, const Message &msg) -:Task(tqparent) +JT_Message::JT_Message(Task *parent, const Message &msg) +:Task(parent) { m = msg; m.setId(id()); @@ -756,8 +756,8 @@ static TQDomElement addCorrectNS(const TQDomElement &e) return i; } -JT_PushMessage::JT_PushMessage(Task *tqparent) -:Task(tqparent) +JT_PushMessage::JT_PushMessage(Task *parent) +:Task(parent) { } @@ -799,8 +799,8 @@ public: TQString message; }; -JT_GetLastActivity::JT_GetLastActivity(Task *tqparent) -:Task(tqparent) +JT_GetLastActivity::JT_GetLastActivity(Task *parent) +:Task(parent) { d = new Private; } @@ -858,8 +858,8 @@ bool JT_GetLastActivity::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_GetServices //---------------------------------------------------------------------------- -JT_GetServices::JT_GetServices(Task *tqparent) -:Task(tqparent) +JT_GetServices::JT_GetServices(Task *parent) +:Task(parent) { } @@ -955,8 +955,8 @@ public: VCard vcard; }; -JT_VCard::JT_VCard(Task *tqparent) -:Task(tqparent) +JT_VCard::JT_VCard(Task *parent) +:Task(parent) { type = -1; d = new Private; @@ -1055,8 +1055,8 @@ public: TQValueList<SearchResult> resultList; }; -JT_Search::JT_Search(Task *tqparent) -:Task(tqparent) +JT_Search::JT_Search(Task *parent) +:Task(parent) { d = new Private; type = -1; @@ -1187,8 +1187,8 @@ bool JT_Search::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_ClientVersion //---------------------------------------------------------------------------- -JT_ClientVersion::JT_ClientVersion(Task *tqparent) -:Task(tqparent) +JT_ClientVersion::JT_ClientVersion(Task *parent) +:Task(parent) { } @@ -1258,8 +1258,8 @@ const TQString & JT_ClientVersion::os() const //---------------------------------------------------------------------------- // JT_ClientTime //---------------------------------------------------------------------------- -/*JT_ClientTime::JT_ClientTime(Task *tqparent, const Jid &_j) -:Task(tqparent) +/*JT_ClientTime::JT_ClientTime(Task *parent, const Jid &_j) +:Task(parent) { j = _j; iq = createIQ("get", j.full(), id()); @@ -1307,8 +1307,8 @@ bool JT_ClientTime::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_ServInfo //---------------------------------------------------------------------------- -JT_ServInfo::JT_ServInfo(Task *tqparent) -:Task(tqparent) +JT_ServInfo::JT_ServInfo(Task *parent) +:Task(parent) { } @@ -1444,8 +1444,8 @@ bool JT_ServInfo::take(const TQDomElement &e) //---------------------------------------------------------------------------- // JT_Gateway //---------------------------------------------------------------------------- -JT_Gateway::JT_Gateway(Task *tqparent) -:Task(tqparent) +JT_Gateway::JT_Gateway(Task *parent) +:Task(parent) { type = -1; } @@ -1539,8 +1539,8 @@ public: AgentItem root; }; -JT_Browse::JT_Browse (Task *tqparent) -:Task (tqparent) +JT_Browse::JT_Browse (Task *parent) +:Task (parent) { d = new Private; } @@ -1664,8 +1664,8 @@ public: DiscoList items; }; -JT_DiscoItems::JT_DiscoItems(Task *tqparent) -: Task(tqparent) +JT_DiscoItems::JT_DiscoItems(Task *parent) +: Task(parent) { d = new Private; } @@ -1753,8 +1753,8 @@ public: DiscoItem item; }; -JT_DiscoInfo::JT_DiscoInfo(Task *tqparent) -: Task(tqparent) +JT_DiscoInfo::JT_DiscoInfo(Task *parent) +: Task(parent) { d = new Private; } @@ -1895,8 +1895,8 @@ public: DiscoList list; }; -JT_DiscoPublish::JT_DiscoPublish(Task *tqparent) -: Task(tqparent) +JT_DiscoPublish::JT_DiscoPublish(Task *parent) +: Task(parent) { d = new Private; } @@ -1959,8 +1959,8 @@ bool JT_DiscoPublish::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_MucPresence //---------------------------------------------------------------------------- -JT_MucPresence::JT_MucPresence(Task *tqparent) -:Task(tqparent) +JT_MucPresence::JT_MucPresence(Task *parent) +:Task(parent) { type = -1; } @@ -2043,8 +2043,8 @@ class JT_PrivateStorage::Private int type; }; -JT_PrivateStorage::JT_PrivateStorage(Task *tqparent) - :Task(tqparent) +JT_PrivateStorage::JT_PrivateStorage(Task *parent) + :Task(parent) { d = new Private; } diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h index 9d5125d9..97d68964 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h @@ -37,7 +37,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Register(Task *tqparent); + JT_Register(Task *parent); ~JT_Register(); void reg(const TQString &user, const TQString &pass); @@ -64,7 +64,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_UnRegister(Task *tqparent); + JT_UnRegister(Task *parent); ~JT_UnRegister(); void unreg(const Jid &); @@ -85,7 +85,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Roster(Task *tqparent); + JT_Roster(Task *parent); ~JT_Roster(); void get(); @@ -114,7 +114,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushRoster(Task *tqparent); + JT_PushRoster(Task *parent); ~JT_PushRoster(); bool take(const TQDomElement &); @@ -132,7 +132,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Presence(Task *tqparent); + JT_Presence(Task *parent); ~JT_Presence(); void pres(const tqStatus &); @@ -154,7 +154,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushPresence(Task *tqparent); + JT_PushPresence(Task *parent); ~JT_PushPresence(); bool take(const TQDomElement &); @@ -173,7 +173,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Message(Task *tqparent, const Message &); + JT_Message(Task *parent, const Message &); ~JT_Message(); void onGo(); @@ -190,7 +190,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushMessage(Task *tqparent); + JT_PushMessage(Task *parent); ~JT_PushMessage(); bool take(const TQDomElement &); @@ -255,7 +255,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_VCard(Task *tqparent); + JT_VCard(Task *parent); ~JT_VCard(); void get(const Jid &); @@ -279,7 +279,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Search(Task *tqparent); + JT_Search(Task *parent); ~JT_Search(); const Form & form() const; @@ -465,7 +465,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_MucPresence(Task *tqparent); + JT_MucPresence(Task *parent); ~JT_MucPresence(); void pres(const tqStatus &); @@ -486,7 +486,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PrivateStorage(Task *tqparent); + JT_PrivateStorage(Task *parent); ~JT_PrivateStorage(); void set(const TQDomElement &); diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/qca.cpp index ee51335f..1996b103 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp +++ b/kopete/protocols/jabber/libiris/qca/src/qca.cpp @@ -859,8 +859,8 @@ public: TQPtrList<QCA_CertContext> store; }; -TLS::TLS(TQObject *tqparent) -:TQObject(tqparent) +TLS::TLS(TQObject *parent) +:TQObject(parent) { d = new Private; } @@ -1127,8 +1127,8 @@ public: TQByteArray inbuf, outbuf; }; -SASL::SASL(TQObject *tqparent) -:TQObject(tqparent) +SASL::SASL(TQObject *parent) +:TQObject(parent) { d = new Private; reset(); diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.h b/kopete/protocols/jabber/libiris/qca/src/qca.h index dab99d5a..79b028bf 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qca.h +++ b/kopete/protocols/jabber/libiris/qca/src/qca.h @@ -333,7 +333,7 @@ namespace QCA }; enum Error { ErrHandshake, ErrCrypt }; - TLS(TQObject *tqparent=0); + TLS(TQObject *parent=0); ~TLS(); void setCertificate(const Cert &cert, const RSAKey &key); @@ -392,7 +392,7 @@ namespace QCA NoUser, RemoteUnavail }; - SASL(TQObject *tqparent=0); + SASL(TQObject *parent=0); ~SASL(); static void setAppName(const TQString &name); diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index 22c228c7..d130fa97 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp @@ -30,7 +30,7 @@ #include "jabberformtranslator.h" #include "dlgjabberbrowse.h" -dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent, const char *name):dlgBrowse (tqparent, name) +dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent, const char *name):dlgBrowse (parent, name) { m_account = account; diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.h b/kopete/protocols/jabber/ui/dlgjabberbrowse.h index 85b67fb9..57549852 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.h +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.h @@ -38,7 +38,7 @@ class dlgJabberBrowse:public dlgBrowse TQ_OBJECT public: - dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent = 0, const char *name = 0); + dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); ~dlgJabberBrowse (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp index ec7d1d10..948a594e 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp @@ -30,8 +30,8 @@ #include "jabberaccount.h" #include "dlgchangepassword.h" -DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, TQWidget *tqparent, const char *name ) - : KDialogBase ( tqparent, name, true, i18n("Change Jabber Password"), +DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent, const char *name ) + : KDialogBase ( parent, name, true, i18n("Change Jabber Password"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { @@ -116,7 +116,7 @@ void DlgJabberChangePassword::slotChangePasswordDone () if ( task->success () ) { - KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(tqparent()), KMessageBox::Information, + KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(parent()), KMessageBox::Information, i18n ( "Your password has been changed successfully. Please note that the change may not be instantaneous. If you have problems logging in with your new password, please contact the administrator." ), i18n ( "Jabber Password Change" ) ); @@ -124,7 +124,7 @@ void DlgJabberChangePassword::slotChangePasswordDone () } else { - KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(tqparent()), KMessageBox::Sorry, + KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(parent()), KMessageBox::Sorry, i18n ( "Your password could not be changed. Either your server does not support this feature or the administrator does not allow you to change your password." ) ); } diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h index 2dd8d8dd..ffeed22b 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - DlgJabberChangePassword ( JabberAccount *account, TQWidget *tqparent = 0, const char *name = 0); + DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent = 0, const char *name = 0); ~DlgJabberChangePassword(); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp index e24815d5..9d69beae 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp @@ -27,8 +27,8 @@ #include "dlgjabberchatjoin.h" -dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, TQWidget* tqparent, const char* name) : -dlgChatJoin(tqparent, name), +dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, TQWidget* parent, const char* name) : +dlgChatJoin(parent, name), m_account(account) { setCaption(i18n("Join Jabber Groupchat")); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h index 6263fd32..1327ba47 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h @@ -28,7 +28,7 @@ class dlgJabberChatJoin : public dlgChatJoin TQ_OBJECT public: - dlgJabberChatJoin(JabberAccount *account, TQWidget* tqparent = 0, const char* name = 0); + dlgJabberChatJoin(JabberAccount *account, TQWidget* parent = 0, const char* name = 0); ~dlgJabberChatJoin(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp index 838eb84f..1803a013 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp @@ -21,8 +21,8 @@ #include "dlgjabberchatroomslist.h" #include "jabberprotocol.h" -dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const TQString& server, const TQString &nick, TQWidget *tqparent, const char *name) : -dlgChatRoomsList(tqparent, name), +dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const TQString& server, const TQString &nick, TQWidget *parent, const char *name) : +dlgChatRoomsList(parent, name), m_account(account) , m_selectedRow(-1) , m_nick(nick) { if (!server.isNull()) diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h index 5bb8b4a9..f16802cc 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h @@ -24,7 +24,7 @@ class dlgJabberChatRoomsList : public dlgChatRoomsList TQ_OBJECT public: - dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString(), const TQString& nick = TQString(), TQWidget* tqparent = 0, const char* name = 0); + dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString(), const TQString& nick = TQString(), TQWidget* parent = 0, const char* name = 0); ~dlgJabberChatRoomsList(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index 5f6b05a2..8d1324ca 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -26,7 +26,7 @@ #include "jabberclient.h" #include "dlgjabberregister.h" -dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent, const char *name):dlgRegister (tqparent, name) +dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent, const char *name):dlgRegister (parent, name) { m_account = account; diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h index 86100852..bc0bfe44 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.h +++ b/kopete/protocols/jabber/ui/dlgjabberregister.h @@ -42,7 +42,7 @@ class dlgJabberRegister:public dlgRegister TQ_OBJECT public: - dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent = 0, const char *name = 0); + dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); ~dlgJabberRegister (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp index f16d927a..4b9192dc 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp @@ -24,8 +24,8 @@ #include <kdebug.h> #include "jabberclient.h" -dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *tqparent, const char *name ) - : DlgSendRaw (tqparent, name) +dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *parent, const char *name ) + : DlgSendRaw (parent, name) { // Connect the GUI elements to things that do stuff connect (btnSend, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSend ())); diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.h b/kopete/protocols/jabber/ui/dlgjabbersendraw.h index 8a16f3e7..cafd9b94 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.h +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - dlgJabberSendRaw ( JabberClient *client, TQWidget * tqparent = 0, const char *name = 0); + dlgJabberSendRaw ( JabberClient *client, TQWidget * parent = 0, const char *name = 0); virtual ~ dlgJabberSendRaw (); public slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index e0e1a315..29b2b617 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -32,7 +32,7 @@ #include "dlgjabberservices.moc" -dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *tqparent, const char *name):dlgServices (tqparent, name) +dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *parent, const char *name):dlgServices (parent, name) { m_account = account; diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.h b/kopete/protocols/jabber/ui/dlgjabberservices.h index 9672cc55..4ef09d9e 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.h +++ b/kopete/protocols/jabber/ui/dlgjabberservices.h @@ -37,7 +37,7 @@ class dlgJabberServices:public dlgServices TQ_OBJECT public: - dlgJabberServices (JabberAccount *account, TQWidget *tqparent = 0, const char *name = 0); + dlgJabberServices (JabberAccount *account, TQWidget *parent = 0, const char *name = 0); ~dlgJabberServices (); private slots: @@ -62,8 +62,8 @@ class dlgJabberServies_item : protected TQObject, public TQListViewItem Q_OBJECT TQ_OBJECT public: - dlgJabberServies_item( TQListView *tqparent , const TQString &s1 , const TQString &s2 ) - : TQListViewItem(tqparent,s1,s2), can_browse(false) , can_register(false) {} + dlgJabberServies_item( TQListView *parent , const TQString &s1 , const TQString &s2 ) + : TQListViewItem(parent,s1,s2), can_browse(false) , can_register(false) {} bool can_browse, can_register; XMPP::Jid jid; diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index e4139786..2e81801d 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -56,12 +56,12 @@ #include "dlgvcard.h" /* - * Constructs a dlgJabberVCard which is a child of 'tqparent', with the + * Constructs a dlgJabberVCard which is a child of 'parent', with the * name 'name' * */ -dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * tqparent, const char *name) - : KDialogBase (tqparent, name, false, i18n("Jabber vCard"), Close | User1 | User2, Close, false, i18n("&Save User Info"), i18n("&Fetch vCard") ) +dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * parent, const char *name) + : KDialogBase (parent, name, false, i18n("Jabber vCard"), Close | User1 | User2, Close, false, i18n("&Save User Info"), i18n("&Fetch vCard") ) { m_account = account; diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.h b/kopete/protocols/jabber/ui/dlgjabbervcard.h index 0ab95193..a20f2812 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.h +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.h @@ -56,7 +56,7 @@ public: * @param widget Parent widget. * @param name widget name. */ - dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * tqparent = 0, const char *name = 0); + dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * parent = 0, const char *name = 0); ~dlgJabberVCard (); private slots: diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index 0f86a79b..076b92b8 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -35,7 +35,7 @@ #include "jabberclient.h" #include "xmpp_tasks.h" -JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent, const char *name):AddContactPage (tqparent, name) +JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * parent, const char *name):AddContactPage (parent, name) { (new TQVBoxLayout (this))->setAutoAdd (true); diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.h b/kopete/protocols/jabber/ui/jabberaddcontactpage.h index bb4e0271..f7c328c2 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.h +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.h @@ -35,7 +35,7 @@ class JabberAddContactPage:public AddContactPage TQ_OBJECT public: - JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent = 0, const char *name = 0); + JabberAddContactPage (Kopete::Account * owner, TQWidget * parent = 0, const char *name = 0); ~JabberAddContactPage (); virtual bool validateData (); virtual bool apply (Kopete::Account *, Kopete::MetaContact *); @@ -57,7 +57,7 @@ class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : p { Q_OBJECT TQ_OBJECT public: - JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *tqparent); + JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *parent); Kopete::MetaContact *metacontact; JabberTransport *transport; public slots: diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index b5fef8f3..95272833 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -30,12 +30,12 @@ #include "dlgjabberchooseserver.h" #include "jabberregisteraccount.h" -JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *tqparent, const char *name ) - : KDialogBase ( tqparent, name, true, i18n("Choose Jabber Server"), +JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const char *name ) + : KDialogBase ( parent, name, true, i18n("Choose Jabber Server"), KDialogBase::Ok | KDialogBase::Cancel ) { - mParentWidget = tqparent; + mParentWidget = parent; mSelectedRow = -1; mMainWidget = new DlgJabberChooseServer ( this ); diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h index bd74575d..aee2668e 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.h +++ b/kopete/protocols/jabber/ui/jabberchooseserver.h @@ -42,7 +42,7 @@ Q_OBJECT TQ_OBJECT public: - JabberChooseServer ( JabberRegisterAccount *tqparent = 0, const char *name = 0); + JabberChooseServer ( JabberRegisterAccount *parent = 0, const char *name = 0); ~JabberChooseServer(); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 2b5ad749..758322cf 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -40,8 +40,8 @@ #include "jabberregisteraccount.h" #include "dlgjabberchangepassword.h" -JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, TQWidget * tqparent, const char *name) - : DlgJabberEditAccountWidget (tqparent, name), KopeteEditAccountWidget (ident) +JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, TQWidget * parent, const char *name) + : DlgJabberEditAccountWidget (parent, name), KopeteEditAccountWidget (ident) { m_protocol = proto; diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h index e1ce2d30..82f56215 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * tqparent = 0, const char *name = 0); + JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * parent = 0, const char *name = 0); ~JabberEditAccountWidget (); virtual bool validateData (); virtual Kopete::Account *apply (); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index cc7cd0fc..2641ed41 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -47,12 +47,12 @@ #include "jabberchooseserver.h" #include "dlgjabberregisteraccount.h" -JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent, const char *name ) - : KDialogBase ( tqparent, name, true, i18n("Register New Jabber Account"), +JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, const char *name ) + : KDialogBase ( parent, name, true, i18n("Register New Jabber Account"), KDialogBase::Ok | KDialogBase::Cancel ) { - mParentWidget = tqparent; + mParentWidget = parent; // setup main dialog mMainWidget = new DlgJabberRegisterAccount ( this ); @@ -78,12 +78,12 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent mSuccess = false; // get all settings from the main dialog - mMainWidget->leServer->setText ( tqparent->mServer->text () ); - mMainWidget->leJID->setText ( tqparent->mID->text () ); - mMainWidget->lePassword->setText ( tqparent->mPass->password () ); - // mMainWidget->lePasswordVerify->setText ( tqparent->mPass->password () ); //BUG 114631 - mMainWidget->sbPort->setValue ( tqparent->mPort->value () ); - mMainWidget->cbUseSSL->setChecked ( tqparent->cbUseSSL->isChecked () ); + mMainWidget->leServer->setText ( parent->mServer->text () ); + mMainWidget->leJID->setText ( parent->mID->text () ); + mMainWidget->lePassword->setText ( parent->mPass->password () ); + // mMainWidget->lePasswordVerify->setText ( parent->mPass->password () ); //BUG 114631 + mMainWidget->sbPort->setValue ( parent->mPort->value () ); + mMainWidget->cbUseSSL->setChecked ( parent->cbUseSSL->isChecked () ); // connect buttons to slots, ok is already connected by default connect ( this, TQT_SIGNAL ( cancelClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); @@ -341,7 +341,7 @@ void JabberRegisterAccount::slotRegisterUserDone () { mMainWidget->lblStatusMessage->setText ( i18n ( "Registration successful." ) ); - // save settings to tqparent + // save settings to parent mParentWidget->mServer->setText ( mMainWidget->leServer->text () ); mParentWidget->mID->setText ( mMainWidget->leJID->text () ); mParentWidget->mPass->setPassword ( mMainWidget->lePassword->password () ); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.h b/kopete/protocols/jabber/ui/jabberregisteraccount.h index 5d8b9b5f..74de6387 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.h +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - JabberRegisterAccount ( JabberEditAccountWidget *tqparent = 0, const char *name = 0 ); + JabberRegisterAccount ( JabberEditAccountWidget *parent = 0, const char *name = 0 ); ~JabberRegisterAccount (); |