diff options
Diffstat (limited to 'kopete/protocols/jabber')
279 files changed, 2625 insertions, 2533 deletions
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index bb1c0f2e..f3583f0e 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -87,12 +87,12 @@ -JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountId, const char *name) - :Kopete::PasswordedAccount ( parent, accountId, 0, name ) +JabberAccount::JabberAccount (JabberProtocol * tqparent, const TQString & accountId, const char *name) + :Kopete::PasswordedAccount ( tqparent, accountId, 0, name ) { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Instantiating new account " << accountId << endl; - m_protocol = parent; + m_protocol = tqparent; m_jabberClient = 0L; @@ -111,7 +111,7 @@ JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountI TQObject::connect(Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ) ); - m_initialPresence = XMPP::Status ( "", "", 5, true ); + m_initialPresence = XMPP::tqStatus ( "", "", 5, true ); } @@ -323,8 +323,8 @@ void JabberAccount::connectWithPassword ( const TQString &password ) this, TQT_SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) ); TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ), this, TQT_SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ), - this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::tqStatus & ) ), + this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::tqStatus & ) ) ); TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatError ( const XMPP::Jid &, int, const TQString & ) ), this, TQT_SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const TQString & ) ) ); TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), @@ -414,7 +414,7 @@ void JabberAccount::connectWithPassword ( const TQString &password ) kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Connecting to Jabber server " << server() << ":" << port() << endl; - setPresence( XMPP::Status ("connecting", "", 0, true) ); + setPresence( XMPP::tqStatus ("connecting", "", 0, true) ); switch ( m_jabberClient->connect ( XMPP::Jid ( accountId () + TQString("/") + resource () ), password ) ) { @@ -609,13 +609,13 @@ void JabberAccount::slotIncomingFileTransfer () void JabberAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason) { - XMPP::Status xmppStatus = m_protocol->kosToStatus( status, reason); + XMPP::tqStatus xmpptqStatus = m_protocol->kosTotqStatus( status, reason); if( status.status() == Kopete::OnlineStatus::Offline ) { - xmppStatus.setIsAvailable( false ); + xmpptqStatus.setIsAvailable( false ); kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "CROSS YOUR FINGERS! THIS IS GONNA BE WILD" << endl; - disconnect (Manual, xmppStatus); + disconnect (Manual, xmpptqStatus); return; } @@ -628,12 +628,12 @@ void JabberAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const if ( !isConnected () ) { // we are not connected yet, so connect now - m_initialPresence = xmppStatus; + m_initialPresence = xmpptqStatus; connect ( status ); } else { - setPresence ( xmppStatus ); + setPresence ( xmpptqStatus ); } } @@ -650,8 +650,8 @@ void JabberAccount::disconnect ( Kopete::Account::DisconnectReason reason ) // make sure that the connection animation gets stopped if we're still // in the process of connecting - setPresence ( XMPP::Status ("", "", 0, false) ); - m_initialPresence = XMPP::Status ("", "", 5, true); + setPresence ( XMPP::tqStatus ("", "", 0, false) ); + m_initialPresence = XMPP::tqStatus ("", "", 5, true); /* FIXME: * We should delete the JabberClient instance here, @@ -666,7 +666,7 @@ void JabberAccount::disconnect ( Kopete::Account::DisconnectReason reason ) disconnected ( reason ); } -void JabberAccount::disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status ) +void JabberAccount::disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &status ) { kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "disconnect( reason, status ) called" << endl; @@ -787,7 +787,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was an error in the protocol stream: %1").arg(errorCondition); + errorText = i18n("There was an error in the protocol stream: %1").tqarg(errorCondition); break; case XMPP::ClientStream::ErrConnection: @@ -845,7 +845,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } if(!errorCondition.isEmpty()) - errorText = i18n("There was a connection error: %1").arg(errorCondition); + errorText = i18n("There was a connection error: %1").tqarg(errorCondition); break; case XMPP::ClientStream::ErrNeg: @@ -870,7 +870,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was a negotiation error: %1").arg(errorCondition); + errorText = i18n("There was a negotiation error: %1").tqarg(errorCondition); break; case XMPP::ClientStream::ErrTLS: @@ -887,7 +887,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was a Transport Layer Security (TLS) error: %1").arg(errorCondition); + errorText = i18n("There was a Transport Layer Security (TLS) error: %1").tqarg(errorCondition); break; case XMPP::ClientStream::ErrAuth: @@ -931,7 +931,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was an error authenticating with the server: %1").arg(errorCondition); + errorText = i18n("There was an error authenticating with the server: %1").tqarg(errorCondition); break; case XMPP::ClientStream::ErrSecurityLayer: @@ -948,7 +948,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was an error in the security layer: %1").arg(errorCondition); + errorText = i18n("There was an error in the security layer: %1").tqarg(errorCondition); break; case XMPP::ClientStream::ErrBind: @@ -965,7 +965,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("Could not bind a resource: %1").arg(errorCondition); + errorText = i18n("Could not bind a resource: %1").tqarg(errorCondition); break; default: @@ -981,7 +981,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int if(!errorText.isEmpty()) KMessageBox::error (Kopete::UI::Global::mainWidget (), errorText, - i18n("Connection problem with Jabber server %1").arg(server)); + i18n("Connection problem with Jabber server %1").tqarg(server)); } @@ -1015,27 +1015,27 @@ void JabberAccount::slotCSError ( int error ) } /* Set presence (usually called by dialog widget). */ -void JabberAccount::setPresence ( const XMPP::Status &status ) +void JabberAccount::setPresence ( const XMPP::tqStatus &status ) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Status: " << status.show () << ", Reason: " << status.status () << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "tqStatus: " << status.show () << ", Reason: " << status.status () << endl; // fetch input status - XMPP::Status newStatus = status; + XMPP::tqStatus newtqStatus = status; // TODO: Check if Caps is enabled // Send entity capabilities if( client() ) { - newStatus.setCapsNode( client()->capsNode() ); - newStatus.setCapsVersion( client()->capsVersion() ); - newStatus.setCapsExt( client()->capsExt() ); + newtqStatus.setCapsNode( client()->capsNode() ); + newtqStatus.setCapsVersion( client()->capsVersion() ); + newtqStatus.setCapsExt( client()->capsExt() ); } // make sure the status gets the correct priority - newStatus.setPriority ( configGroup()->readNumEntry ( "Priority", 5 ) ); + newtqStatus.setPriority ( configGroup()->readNumEntry ( "Priority", 5 ) ); XMPP::Jid jid ( myself()->contactId () ); - XMPP::Resource newResource ( resource (), newStatus ); + XMPP::Resource newResource ( resource (), newtqStatus ); // update our resource in the resource pool resourcePool()->addResource ( jid, newResource ); @@ -1057,7 +1057,7 @@ void JabberAccount::setPresence ( const XMPP::Status &status ) XMPP::JT_Presence * task = new XMPP::JT_Presence ( client()->rootTask ()); - task->pres ( newStatus ); + task->pres ( newtqStatus ); task->go ( true ); } else @@ -1103,7 +1103,7 @@ void JabberAccount::slotSubscription (const XMPP::Jid & jid, const TQString & ty hideFlags |= Kopete::UI::ContactAddedNotifyDialog::AddCheckBox | Kopete::UI::ContactAddedNotifyDialog::AddGroupBox ; Kopete::UI::ContactAddedNotifyDialog *dialog= - new Kopete::UI::ContactAddedNotifyDialog( jid.full() ,TQString::null,this, hideFlags ); + new Kopete::UI::ContactAddedNotifyDialog( jid.full() ,TQString(),this, hideFlags ); TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); @@ -1184,11 +1184,11 @@ void JabberAccount::slotContactAddedNotifyDialogClosed( const TQString & contact if(dialog->added()) { - Kopete::MetaContact *parentContact=dialog->addContact(); - if(parentContact) + Kopete::MetaContact *tqparentContact=dialog->addContact(); + if(tqparentContact) { TQStringList groupNames; - Kopete::GroupList groupList = parentContact->groups(); + Kopete::GroupList groupList = tqparentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); @@ -1196,7 +1196,7 @@ void JabberAccount::slotContactAddedNotifyDialogClosed( const TQString & contact // XMPP::Jid jid ( contactId ); item.setJid ( jid ); - item.setName ( parentContact->displayName() ); + item.setName ( tqparentContact->displayName() ); item.setGroups ( groupNames ); // add the new contact to our roster. @@ -1299,11 +1299,11 @@ void JabberAccount::slotContactUpdated (const XMPP::RosterItem & item) */ if ( !item.ask().isEmpty () ) { - contact->setProperty ( protocol()->propAuthorizationStatus, i18n ( "Waiting for authorization" ) ); + contact->setProperty ( protocol()->propAuthorizationtqStatus, i18n ( "Waiting for authorization" ) ); } else { - contact->removeProperty ( protocol()->propAuthorizationStatus ); + contact->removeProperty ( protocol()->propAuthorizationtqStatus ); } } else if(c) //we don't need to add it, and it is in the contactlist @@ -1469,7 +1469,7 @@ void JabberAccount::slotGroupChatLeft (const XMPP::Jid & jid) } -void JabberAccount::slotGroupChatPresence (const XMPP::Jid & jid, const XMPP::Status & status) +void JabberAccount::slotGroupChatPresence (const XMPP::Jid & jid, const XMPP::tqStatus & status) { kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Received groupchat presence for room " << jid.full () << endl; @@ -1512,7 +1512,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T case JabberClient::InvalidPasswordForMUC: { TQCString password; - int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").arg(jid.node())); + int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").tqarg(jid.node())); if (result == KPasswordDialog::Accepted) m_jabberClient->joinGroupChat(jid.domain(), jid.node(), jid.resource(), password); } @@ -1521,7 +1521,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T case JabberClient::NicknameConflict: { bool ok; - TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").arg(jid.node(), jid.resource()), + TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").tqarg(jid.node(), jid.resource()), i18n("Give your nickname"), TQString(), &ok); @@ -1535,14 +1535,14 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T case JabberClient::BannedFromThisMUC: KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (), KMessageBox::Error, - i18n ("You can't join the room %1 because you were banned").arg(jid.node()), + i18n ("You can't join the room %1 because you were banned").tqarg(jid.node()), i18n ("Jabber Group Chat") ); break; case JabberClient::MaxUsersReachedForThisMuc: KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (), KMessageBox::Error, - i18n ("You can't join the room %1 because the maximum users has been reached").arg(jid.node()), + i18n ("You can't join the room %1 because the maximum users has been reached").tqarg(jid.node()), i18n ("Jabber Group Chat") ); break; @@ -1659,7 +1659,7 @@ void JabberAccount::slotIncomingVoiceCall( const Jid &jid ) // if(sessionType == "http://www.google.com/session/phone") // { // TQString from = ((XMPP::Jid)session->peers().first()).full(); -// //KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").arg(from) ); +// //KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").tqarg(from) ); // JingleVoiceSessionDialog *voiceDialog = new JingleVoiceSessionDialog( static_cast<JingleVoiceSession*>(session) ); // voiceDialog->show(); // } @@ -1687,7 +1687,7 @@ bool JabberAccount::removeAccount( ) int result=KMessageBox::warningYesNoCancel( Kopete::UI::Global::mainWidget () , i18n( "Do you want to also unregister \"%1\" from the Jabber server ?\n" "If you unregister, all your contact list may be removed on the server," - "And you will never be able to connect to this account with any client").arg( accountLabel() ), + "And you will never be able to connect to this account with any client").tqarg( accountLabel() ), i18n("Unregister"), KGuiItem(i18n( "Remove and Unregister" ), "editdelete"), KGuiItem(i18n( "Remove from kopete only"), "edittrash"), @@ -1734,7 +1734,7 @@ void JabberAccount::slotUnregisterFinished( ) if ( task && ! task->success ()) { KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error, - i18n ("An error occured when trying to remove the account:\n%1").arg(task->statusString()), + i18n ("An error occured when trying to remove the account:\n%1").tqarg(task->statusString()), i18n ("Jabber Account Unregistration")); m_removing=false; return; diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h index fd1dfc0f..3d174639 100644 --- a/kopete/protocols/jabber/jabberaccount.h +++ b/kopete/protocols/jabber/jabberaccount.h @@ -57,9 +57,10 @@ class VoiceCaller; class JabberAccount : public Kopete::PasswordedAccount { Q_OBJECT + TQ_OBJECT public: - JabberAccount (JabberProtocol * parent, const TQString & accountID, const char *name = 0L); + JabberAccount (JabberProtocol * tqparent, const TQString & accountID, const char *name = 0L); ~JabberAccount (); /* Returns the action menu for this account. */ @@ -146,9 +147,9 @@ public slots: void disconnect ( Kopete::Account::DisconnectReason reason ); /* Disconnect with a reason, and status */ - void disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status ); + void disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &status ); /* Reimplemented from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); void addTransport( JabberTransport *tr , const TQString &jid); void removeTransport( const TQString &jid ); @@ -167,12 +168,12 @@ protected: * method should have the "dirty" flag set. * * This method should simply be used to intantiate the new contact, everything else - * (updating the GUI, parenting to meta contact, etc.) is being taken care of. + * (updating the GUI, tqparenting to meta contact, etc.) is being taken care of. * * @param contactId The unique ID for this protocol - * @param parentContact The metacontact to add this contact to + * @param tqparentContact The metacontact to add this contact to */ - virtual bool createContact (const TQString & contactID, Kopete::MetaContact * parentContact); + virtual bool createContact (const TQString & contactID, Kopete::MetaContact * tqparentContact); @@ -198,13 +199,13 @@ private: void cleanup (); /* Initial presence to set after connecting. */ - XMPP::Status m_initialPresence; + XMPP::tqStatus m_initialPresence; /** * Sets our own presence. Updates our resource in the * resource pool and sends a presence packet to the server. */ - void setPresence ( const XMPP::Status &status ); + void setPresence ( const XMPP::tqStatus &status ); /** * Returns if a connection attempt is currently in progress. @@ -256,7 +257,7 @@ private slots: void slotJoinNewChat (); void slotGroupChatJoined ( const XMPP::Jid &jid ); void slotGroupChatLeft ( const XMPP::Jid &jid ); - void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::Status &status ); + void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &status ); void slotGroupChatError ( const XMPP::Jid &jid, int error, const TQString &reason ); /* Incoming subscription request. */ diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index cffc65f9..a380d3c4 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -129,19 +129,19 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) switch ( item.subscription().type () ) { case XMPP::Subscription::None: - setProperty ( protocol()->propSubscriptionStatus, + setProperty ( protocol()->propSubscriptiontqStatus, i18n ( "You cannot see each others' status." ) ); break; case XMPP::Subscription::To: - setProperty ( protocol()->propSubscriptionStatus, + setProperty ( protocol()->propSubscriptiontqStatus, i18n ( "You can see this contact's status but they cannot see your status." ) ); break; case XMPP::Subscription::From: - setProperty ( protocol()->propSubscriptionStatus, + setProperty ( protocol()->propSubscriptiontqStatus, i18n ( "This contact can see your status but you cannot see their status." ) ); break; case XMPP::Subscription::Both: - setProperty ( protocol()->propSubscriptionStatus, + setProperty ( protocol()->propSubscriptiontqStatus, i18n ( "You can see each others' status." ) ); break; } @@ -164,7 +164,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) // find all groups our contact is in but that are not in the server side roster for ( unsigned i = 0; i < metaContact()->groups().count (); i++ ) { - if ( item.groups().find ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () ) + if ( item.groups().tqfind ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () ) groupsToRemoveFrom.append ( metaContact()->groups().at ( i ) ); } @@ -193,7 +193,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) * risk removing the contact from the visible contact list. In this * case, we need to make sure at least the top level group stays. */ - if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.contains ( Kopete::Group::topLevel () ) ) ) + if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.tqcontains ( Kopete::Group::topLevel () ) ) ) { groupsToRemoveFrom.remove ( Kopete::Group::topLevel () ); } @@ -217,7 +217,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) setDontSync ( false ); //can't do it now because it's called from contructor at a point some virtual function are not available - TQTimer::singleShot(0, this, TQT_SLOT(reevaluateStatus())); + TQTimer::singleShot(0, this, TQT_SLOT(reevaluatetqStatus())); } @@ -295,7 +295,7 @@ void JabberBaseContact::updateResourceList () setProperty ( protocol()->propAvailableResources, resourceListStr ); } -void JabberBaseContact::reevaluateStatus () +void JabberBaseContact::reevaluatetqStatus () { kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Determining new status for " << contactId () << endl; @@ -390,7 +390,7 @@ void JabberBaseContact::serialize (TQMap < TQString, TQString > &serializedData, // Contact id and display name are already set for us, only add the rest serializedData["JID"] = mRosterItem.jid().full(); - serializedData["groups"] = mRosterItem.groups ().join (TQString::fromLatin1 (",")); + serializedData["groups"] = mRosterItem.groups ().join (TQString::tqfromLatin1 (",")); } void JabberBaseContact::slotUserInfo( ) @@ -414,7 +414,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard ) // update vCard cache timestamp if this is not a temporary contact if ( metaContact() && !metaContact()->isTemporary () ) { - setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) ); + setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) ); } @@ -630,9 +630,9 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard ) TQImage contactPhoto; TQString fullJid = mRosterItem.jid().full(); - TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.replace(TQRegExp("[./~]"),"-") +".png"); + TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.tqreplace(TQRegExp("[./~]"),"-") +".png"); - // photo() is a QByteArray + // photo() is a TQByteArray if ( !vCard.photo().isEmpty() ) { kdDebug( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Contact has a photo embedded into his vCard." << endl; diff --git a/kopete/protocols/jabber/jabberbasecontact.h b/kopete/protocols/jabber/jabberbasecontact.h index ef9b7416..c3453344 100644 --- a/kopete/protocols/jabber/jabberbasecontact.h +++ b/kopete/protocols/jabber/jabberbasecontact.h @@ -35,6 +35,7 @@ class JabberBaseContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT friend class JabberAccount; /* Friends can touch each other's private parts. */ public: @@ -157,7 +158,7 @@ public slots: * whenever a resource is added, removed, or * changed in the resource pool. */ - void reevaluateStatus (); + void reevaluatetqStatus (); protected: /** diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index 661f0974..39011f81 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -26,7 +26,7 @@ #include "xmpp_tasks.h" -JabberBookmarks::JabberBookmarks(JabberAccount *parent) : TQObject(parent) , m_account(parent) +JabberBookmarks::JabberBookmarks(JabberAccount *tqparent) : TQObject(tqparent) , m_account(tqparent) { connect( m_account , TQT_SIGNAL( isConnectedChanged() ) , this , TQT_SLOT( accountConnected() ) ); } @@ -96,7 +96,7 @@ void JabberBookmarks::slotReceivedBookmarks( ) void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) { - if(m_conferencesJID.contains(jid.full()) || !m_account->isConnected()) + if(m_conferencesJID.tqcontains(jid.full()) || !m_account->isConnected()) { return; } @@ -127,9 +127,9 @@ void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) m_conferencesJID += jid.full(); } -KAction * JabberBookmarks::bookmarksAction(TQObject *parent) +KAction * JabberBookmarks::bookmarksAction(TQObject *tqparent) { - KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" ); + KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , tqparent , "actionBookMark" ); groupchatBM->setItems(m_conferencesJID); TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&))); return groupchatBM; diff --git a/kopete/protocols/jabber/jabberbookmarks.h b/kopete/protocols/jabber/jabberbookmarks.h index 31675b50..55165a1e 100644 --- a/kopete/protocols/jabber/jabberbookmarks.h +++ b/kopete/protocols/jabber/jabberbookmarks.h @@ -33,14 +33,15 @@ class KAction; * There is one instance of that class by accounts. * @author Olivier Goffart */ -class JabberBookmarks : public QObject +class JabberBookmarks : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - JabberBookmarks(JabberAccount *parent); + JabberBookmarks(JabberAccount *tqparent); ~JabberBookmarks(){} /** @@ -52,7 +53,7 @@ class JabberBookmarks : public QObject /** * return an action that will be added in the jabber popup menu */ - KAction *bookmarksAction(TQObject * parent); + KAction *bookmarksAction(TQObject * tqparent); private slots: void accountConnected(); void slotReceivedBookmarks(); diff --git a/kopete/protocols/jabber/jabberbytestream.cpp b/kopete/protocols/jabber/jabberbytestream.cpp index 1021757d..4629eef2 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 *parent, const char */*name*/ ) - : ByteStream ( parent ) +JabberByteStream::JabberByteStream ( TQObject *tqparent, const char */*name*/ ) + : ByteStream ( tqparent ) { 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 882d3007..0bc2e204 100644 --- a/kopete/protocols/jabber/jabberbytestream.h +++ b/kopete/protocols/jabber/jabberbytestream.h @@ -31,9 +31,10 @@ class JabberByteStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: - JabberByteStream ( TQObject *parent = 0, const char *name = 0 ); + JabberByteStream ( TQObject *tqparent = 0, const char *name = 0 ); ~JabberByteStream (); diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index 9d9dd770..eb5efabf 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -113,11 +113,11 @@ TQStringList JabberCapabilitiesManager::CapabilitiesInformation::jids() const { TQStringList jids; - TQValueList<QPair<TQString,JabberAccount*> >::ConstIterator it = m_jids.constBegin(), itEnd = m_jids.constEnd(); + TQValueList<TQPair<TQString,JabberAccount*> >::ConstIterator it = m_jids.constBegin(), itEnd = m_jids.constEnd(); for( ; it != itEnd; ++it) { TQString jid( (*it).first ); - if( !jids.contains(jid) ) + if( !jids.tqcontains(jid) ) jids.push_back(jid); } @@ -143,12 +143,12 @@ void JabberCapabilitiesManager::CapabilitiesInformation::reset() void JabberCapabilitiesManager::CapabilitiesInformation::removeAccount(JabberAccount *account) { - TQValueList<QPair<TQString,JabberAccount*> >::Iterator it = m_jids.begin(); + TQValueList<TQPair<TQString,JabberAccount*> >::Iterator it = m_jids.begin(); while( it != m_jids.end() ) { if( (*it).second == account) { - TQValueList<QPair<TQString,JabberAccount*> >::Iterator otherIt = it; + TQValueList<TQPair<TQString,JabberAccount*> >::Iterator otherIt = it; it++; m_jids.remove(otherIt); } @@ -161,9 +161,9 @@ void JabberCapabilitiesManager::CapabilitiesInformation::removeAccount(JabberAcc void JabberCapabilitiesManager::CapabilitiesInformation::addJid(const Jid& jid, JabberAccount* account) { - QPair<TQString,JabberAccount*> jidAccountPair(jid.full(),account); + TQPair<TQString,JabberAccount*> jidAccountPair(jid.full(),account); - if( !m_jids.contains(jidAccountPair) ) + if( !m_jids.tqcontains(jidAccountPair) ) { m_jids.push_back(jidAccountPair); updateLastSeen(); @@ -172,14 +172,14 @@ void JabberCapabilitiesManager::CapabilitiesInformation::addJid(const Jid& jid, void JabberCapabilitiesManager::CapabilitiesInformation::removeJid(const Jid& jid) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Unregistering " << TQString(jid.full()).replace('%',"%%") << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Unregistering " << TQString(jid.full()).tqreplace('%',"%%") << endl; - TQValueList<QPair<TQString,JabberAccount*> >::Iterator it = m_jids.begin(); + TQValueList<TQPair<TQString,JabberAccount*> >::Iterator it = m_jids.begin(); while( it != m_jids.end() ) { if( (*it).first == jid.full() ) { - TQValueList<QPair<TQString,JabberAccount*> >::Iterator otherIt = it; + TQValueList<TQPair<TQString,JabberAccount*> >::Iterator otherIt = it; it++; m_jids.remove(otherIt); } @@ -190,11 +190,11 @@ void JabberCapabilitiesManager::CapabilitiesInformation::removeJid(const Jid& ji } } -QPair<Jid,JabberAccount*> JabberCapabilitiesManager::CapabilitiesInformation::nextJid(const Jid& jid, const Task* t) +TQPair<Jid,JabberAccount*> JabberCapabilitiesManager::CapabilitiesInformation::nextJid(const Jid& jid, const Task* t) { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Looking for next JID" << endl; - TQValueList<QPair<TQString,JabberAccount*> >::ConstIterator it = m_jids.constBegin(), itEnd = m_jids.constEnd(); + TQValueList<TQPair<TQString,JabberAccount*> >::ConstIterator it = m_jids.constBegin(), itEnd = m_jids.constEnd(); for( ; it != itEnd; ++it) { if( (*it).first == jid.full() && (*it).second->client()->rootTask() == t) @@ -204,18 +204,18 @@ QPair<Jid,JabberAccount*> JabberCapabilitiesManager::CapabilitiesInformation::ne { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "No more JIDs" << endl; - return QPair<Jid,JabberAccount*>(Jid(),0L); + return TQPair<Jid,JabberAccount*>(Jid(),0L); } else if( (*it).second->isConnected() ) { //qDebug("caps.cpp: Account isn't active"); kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Account isn't connected." << endl; - return QPair<Jid,JabberAccount*>( (*it).first,(*it).second ); + return TQPair<Jid,JabberAccount*>( (*it).first,(*it).second ); } } } - return QPair<Jid,JabberAccount*>(Jid(),0L); + return TQPair<Jid,JabberAccount*>(Jid(),0L); } void JabberCapabilitiesManager::CapabilitiesInformation::setDiscovered(bool value) @@ -240,7 +240,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::setFeatures(const TQStr void JabberCapabilitiesManager::CapabilitiesInformation::updateLastSeen() { - m_lastSeen = TQDate::currentDate(); + m_lastSeen = TQDate::tqcurrentDate(); } TQDomElement JabberCapabilitiesManager::CapabilitiesInformation::toXml(TQDomDocument *doc) const @@ -351,7 +351,7 @@ void JabberCapabilitiesManager::removeAccount(JabberAccount *account) } } -void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::Status &status ) +void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::tqStatus &status ) { if( !account->client() || !account->client()->rootTask() ) return; @@ -400,7 +400,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const { if( !d->capabilitiesInformationMap[*newCapsIt].discovered() && d->capabilitiesInformationMap[*newCapsIt].pendingRequests() == 0 ) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").arg(TQString(jid.full()).replace('%',"%%")).arg(node + "#" + (*newCapsIt).extensions()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(node + "#" + (*newCapsIt).extensions()) << endl; d->capabilitiesInformationMap[*newCapsIt].setPendingRequests(1); requestDiscoInfo(account, jid, node + "#" + (*newCapsIt).extensions()); @@ -410,7 +410,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const else { // Remove all caps specifications - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").arg(TQString(jid.full()).replace('%',"%%")).arg(node).arg(version) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(node).tqarg(version) << endl; d->jidCapabilitiesMap.remove( jid.full() ); } @@ -448,7 +448,7 @@ void JabberCapabilitiesManager::discoRequestFinished() DiscoItem item = discoInfo->item(); Jid jid = discoInfo->jid(); - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").arg(TQString(jid.full()).replace('%',"%%")).arg(discoInfo->node()).arg(discoInfo->success()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl; TQStringList tokens = TQStringList::split("#",discoInfo->node()); @@ -483,10 +483,10 @@ void JabberCapabilitiesManager::discoRequestFinished() } else { - QPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->parent()); + TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->tqparent()); if( jidAccountPair.second ) { - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").arg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).tqreplace('%',"%%")) << endl; requestDiscoInfo( jidAccountPair.second, jidAccountPair.first, discoInfo->node() ); } else @@ -497,7 +497,7 @@ void JabberCapabilitiesManager::discoRequestFinished() } } else - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").arg(jidCapabilities.node()).arg(node) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").tqarg(jidCapabilities.node()).tqarg(node) << endl; //for (unsigned int i = 0; i < item.features().list().count(); i++) // printf(" Feature: %s\n",item.features().list()[i].latin1()); @@ -563,7 +563,7 @@ void JabberCapabilitiesManager::loadCachedInformation() bool JabberCapabilitiesManager::capabilitiesEnabled(const Jid &jid) const { - return d->jidCapabilitiesMap.contains( jid.full() ); + return d->jidCapabilitiesMap.tqcontains( jid.full() ); } XMPP::Features JabberCapabilitiesManager::features(const Jid& jid) const @@ -599,7 +599,7 @@ TQString JabberCapabilitiesManager::clientName(const Jid& jid) const if (name.startsWith("www.")) name = name.right(name.length() - 4); - int cut_pos = name.find("."); + int cut_pos = name.tqfind("."); if (cut_pos != -1) { name = name.left(cut_pos); } @@ -646,7 +646,7 @@ void JabberCapabilitiesManager::saveInformation() } TQTextStream textStream; - textStream.setDevice(&capsFile); + textStream.setDevice(TQT_TQIODEVICE(&capsFile)); textStream.setEncoding(TQTextStream::UnicodeUTF8); textStream << doc.toString(); textStream.unsetDevice(); diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.h b/kopete/protocols/jabber/jabbercapabilitiesmanager.h index a783188f..f314d760 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.h +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.h @@ -33,9 +33,10 @@ class JabberAccount; * @author Michaël Larouche <michael.larouche@kdemail.net> * @author Remko Troncon */ -class JabberCapabilitiesManager : public QObject +class JabberCapabilitiesManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Construct @@ -80,12 +81,12 @@ public slots: /** * Update if necessary the capabities for the JID passed in args. * Caps are received in Presence messages so that's why we are - * passing a XMPP::Status object. + * passing a XMPP::tqStatus object. * * @param jid JID that capabilities was updated. - * @param status The XMPP::Status that contain the caps. + * @param status The XMPP::tqStatus that contain the caps. */ - void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::Status &status); + void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::tqStatus &status); private slots: /** @@ -182,7 +183,7 @@ private: void removeAccount(JabberAccount* acc); void removeJid(const Jid&); void addJid(const Jid&, JabberAccount*); - QPair<Jid,JabberAccount*> nextJid(const Jid&, const Task*); + TQPair<Jid,JabberAccount*> nextJid(const Jid&, const Task*); void setDiscovered(bool); void setPendingRequests(int); @@ -200,7 +201,7 @@ private: int m_pendingRequests; TQStringList m_features; DiscoItem::Identities m_identities; - TQValueList<QPair<TQString,JabberAccount*> > m_jids; + TQValueList<TQPair<TQString,JabberAccount*> > m_jids; TQDate m_lastSeen; }; diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index dbe35ab6..38ea726f 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -117,8 +117,8 @@ void JabberChatSession::slotUpdateDisplayName () if ( !mResource.isEmpty () ) jid.setResource ( mResource ); - TQString statusText = i18n("a contact's online status in parenthesis.", " (%1)") - .arg( chatMembers.first()->onlineStatus().description() ); + TQString statusText = i18n("a contact's online status in tqparenthesis.", " (%1)") + .tqarg( chatMembers.first()->onlinetqStatus().description() ); if ( jid.resource().isEmpty () ) setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText ); else @@ -225,7 +225,7 @@ void JabberChatSession::slotSendTypingNotification ( bool typing ) // create JID for us as sender XMPP::Jid fromJid = static_cast<const JabberBaseContact*>(myself())->rosterItem().jid(); - fromJid.setResource ( account()->configGroup()->readEntry( "Resource", TQString::null ) ); + fromJid.setResource ( account()->configGroup()->readEntry( "Resource", TQString() ) ); kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Sending out typing notification (" << typing << ") to all chat members." << endl; @@ -253,7 +253,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat jabberMessage.setSubject ( message.subject () ); jabberMessage.setTimeStamp ( message.timestamp () ); - if ( message.plainBody().find ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) + if ( message.plainBody().tqfind ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) { /* * This message is encrypted, so we need to set @@ -270,7 +270,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat // remove PGP header and footer from message encryptedBody.truncate ( encryptedBody.length () - TQString("-----END PGP MESSAGE-----").length () - 2 ); - encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.find ( "\n\n" ) - 2 ); + encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.tqfind ( "\n\n" ) - 2 ); // assign payload to message jabberMessage.setXEncrypted ( encryptedBody ); @@ -286,16 +286,16 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat { TQString xhtmlBody = message.escapedBody(); - // According to JEP-0071 8.9 it is only RECOMMANDED to replace \n with <br/> + // According to JEP-0071 8.9 it is only RECOMMANDED to tqreplace \n with <br/> // which mean that some implementation (gaim 2 beta) may still think that \n are linebreak. // and considered the fact that KTextEditor generate a well indented XHTML, we need to remove all \n from it // see Bug 121627 // Anyway, theses client that do like that are *WRONG* considreded the example of jep-71 where there are lot of // linebreak that are not interpreted. - Olivier 2006-31-03 - xhtmlBody.replace("\n",""); + xhtmlBody.tqreplace("\n",""); // is not a valid XML entity - xhtmlBody.replace(" " , " "); + xhtmlBody.tqreplace(" " , " "); // Remove trailing line break xhtmlBody.remove( TQRegExp( "<br/>$" ) ); @@ -358,4 +358,4 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat #include "jabberchatsession.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; replace-tabs off; space-indent off; +// kate: tab-width 4; tqreplace-tabs off; space-indent off; diff --git a/kopete/protocols/jabber/jabberchatsession.h b/kopete/protocols/jabber/jabberchatsession.h index edd36772..564523de 100644 --- a/kopete/protocols/jabber/jabberchatsession.h +++ b/kopete/protocols/jabber/jabberchatsession.h @@ -35,6 +35,7 @@ class TQString; class JabberChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user, diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp index 41157aaa..99a768fc 100644 --- a/kopete/protocols/jabber/jabberclient.cpp +++ b/kopete/protocols/jabber/jabberclient.cpp @@ -157,7 +157,7 @@ void JabberClient::cleanUp () d->currentPenaltyTime = 0; d->jid = XMPP::Jid (); - d->password = TQString::null; + d->password = TQString(); setForceTLS ( false ); setUseSSL ( false ); @@ -171,9 +171,9 @@ void JabberClient::cleanUp () setFileTransfersEnabled ( false ); setS5BServerPort ( 8010 ); - setClientName ( TQString::null ); - setClientVersion ( TQString::null ); - setOSName ( TQString::null ); + setClientName ( TQString() ); + setClientVersion ( TQString() ); + setOSName ( TQString() ); setTimeZone ( "UTC", 0 ); @@ -272,7 +272,7 @@ void JabberClient::addS5BServerAddress ( const TQString &address ) // now filter the list without dupes for ( TQStringList::Iterator it = d->s5bAddressList.begin (); it != d->s5bAddressList.end (); ++it ) { - if ( !newList.contains ( *it ) ) + if ( !newList.tqcontains ( *it ) ) newList.append ( *it ); } @@ -284,7 +284,7 @@ void JabberClient::removeS5BServerAddress ( const TQString &address ) { TQStringList newList; - TQStringList::iterator it = d->s5bAddressList.find ( address ); + TQStringList::iterator it = d->s5bAddressList.tqfind ( address ); if ( it != d->s5bAddressList.end () ) { d->s5bAddressList.remove ( it ); @@ -300,7 +300,7 @@ void JabberClient::removeS5BServerAddress ( const TQString &address ) // now filter the list without dupes for ( TQStringList::Iterator it = d->s5bAddressList.begin (); it != d->s5bAddressList.end (); ++it ) { - if ( !newList.contains ( *it ) ) + if ( !newList.tqcontains ( *it ) ) newList.append ( *it ); } @@ -724,8 +724,8 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt this, TQT_SLOT ( slotGroupChatJoined (const Jid &) ) ); TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatLeft (const Jid &) ), this, TQT_SLOT ( slotGroupChatLeft (const Jid &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const Status &) ), - this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) ); + TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const tqStatus &) ), + this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const tqStatus &) ) ); TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatError (const Jid &, int, const TQString &) ), this, TQT_SLOT ( slotGroupChatError (const Jid &, int, const TQString &) ) ); //TQObject::connect ( d->jabberClient, TQT_SIGNAL (debugText (const TQString &) ), @@ -769,7 +769,7 @@ void JabberClient::disconnect () } -void JabberClient::disconnect( XMPP::Status &reason ) +void JabberClient::disconnect( XMPP::tqStatus &reason ) { if ( d->jabberClient ) { @@ -823,12 +823,12 @@ void JabberClient::leaveGroupChat ( const TQString &host, const TQString &room ) } -void JabberClient::setGroupChatStatus( const TQString & host, const TQString & room, const XMPP::Status & status ) +void JabberClient::setGroupChattqStatus( const TQString & host, const TQString & room, const XMPP::tqStatus & status ) { - client()->groupChatSetStatus( host, room, status); + client()->groupChatSettqStatus( host, room, status); } -void JabberClient::changeGroupChatNick( const TQString & host, const TQString & room, const TQString & nick, const XMPP::Status & status ) +void JabberClient::changeGroupChatNick( const TQString & host, const TQString & room, const TQString & nick, const XMPP::tqStatus & status ) { client()->groupChatChangeNick( host, room, nick, status ); } @@ -859,8 +859,8 @@ void JabberClient::slotPsiDebug ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); - msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); + msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); + msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); emit debugMessage ( "Psi: " + msg ); @@ -870,8 +870,8 @@ void JabberClient::slotIncomingXML ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); - msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); + msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); + msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); emit debugMessage ( "XML IN: " + msg ); @@ -881,8 +881,8 @@ void JabberClient::slotOutgoingXML ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); - msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); + msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); + msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); emit debugMessage ( "XML OUT: " + msg ); @@ -1112,7 +1112,7 @@ void JabberClient::slotGroupChatLeft ( const Jid &jid ) } -void JabberClient::slotGroupChatPresence ( const Jid &jid, const Status &status) +void JabberClient::slotGroupChatPresence ( const Jid &jid, const tqStatus &status) { emit groupChatPresence ( jid, status ); diff --git a/kopete/protocols/jabber/jabberclient.h b/kopete/protocols/jabber/jabberclient.h index 4db2975f..05324824 100644 --- a/kopete/protocols/jabber/jabberclient.h +++ b/kopete/protocols/jabber/jabberclient.h @@ -54,10 +54,11 @@ class JabberConnector; * @brief Provides a Jabber client * @author Till Gerken */ -class JabberClient : public QObject +class JabberClient : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -95,7 +96,7 @@ public: * Disconnect from Jabber server with reason * @param reason The reason for disconnecting */ - void disconnect (XMPP::Status &reason); + void disconnect (XMPP::tqStatus &reason); /** * Returns if this instance is connected to a server. @@ -213,7 +214,7 @@ public: * @param flag Whether to enable file transfers. * @param localAddress Local address to receive file transfers at. Will be determined automatically if not specified. */ - void setFileTransfersEnabled ( bool flag, const TQString &localAddress = TQString::null ); + void setFileTransfersEnabled ( bool flag, const TQString &localAddress = TQString() ); /** * Returns the address of the local interface. @@ -378,11 +379,11 @@ public: /** * change the status of a group chat */ - void setGroupChatStatus(const TQString &host, const TQString &room, const XMPP::Status &); + void setGroupChattqStatus(const TQString &host, const TQString &room, const XMPP::tqStatus &); /** * change the nick in a group chat */ - void changeGroupChatNick(const TQString &host, const TQString &room, const TQString &nick, const XMPP::Status &status =XMPP::Status()); + void changeGroupChatNick(const TQString &host, const TQString &room, const TQString &nick, const XMPP::tqStatus &status =XMPP::tqStatus()); /** * Send a message. @@ -491,7 +492,7 @@ signals: /** * A presence to a group chat has been signalled. */ - void groupChatPresence ( const XMPP::Jid &jid, const XMPP::Status &status ); + void groupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &status ); /** * An error was encountered joining or processing a group chat. @@ -589,7 +590,7 @@ private slots: /* Slots for handling group chats. */ void slotGroupChatJoined (const Jid & jid); void slotGroupChatLeft (const Jid & jid); - void slotGroupChatPresence (const Jid & jid, const Status & status); + void slotGroupChatPresence (const Jid & jid, const tqStatus & status); void slotGroupChatError (const Jid & jid, int error, const TQString & reason); /* Incoming subscription request. */ diff --git a/kopete/protocols/jabber/jabberconnector.cpp b/kopete/protocols/jabber/jabberconnector.cpp index 8fdc3e84..4653803f 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 *parent, const char */*name*/ ) - : XMPP::Connector ( parent ) +JabberConnector::JabberConnector ( TQObject *tqparent, const char */*name*/ ) + : XMPP::Connector ( tqparent ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "New Jabber connector." << endl; @@ -107,7 +107,7 @@ void JabberConnector::done () } -void JabberConnector::setOptHostPort ( const TQString &host, Q_UINT16 port ) +void JabberConnector::setOptHostPort ( const TQString &host, TQ_UINT16 port ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Manually specifying host " << host << " and port " << port << endl; diff --git a/kopete/protocols/jabber/jabberconnector.h b/kopete/protocols/jabber/jabberconnector.h index b7ee533a..e6f12988 100644 --- a/kopete/protocols/jabber/jabberconnector.h +++ b/kopete/protocols/jabber/jabberconnector.h @@ -33,9 +33,10 @@ class JabberConnector : public XMPP::Connector { Q_OBJECT + TQ_OBJECT public: - JabberConnector ( TQObject *parent = 0, const char *name = 0 ); + JabberConnector ( TQObject *tqparent = 0, const char *name = 0 ); ~JabberConnector (); @@ -43,7 +44,7 @@ public: ByteStream *stream () const; void done (); - void setOptHostPort ( const TQString &host, Q_UINT16 port ); + void setOptHostPort ( const TQString &host, TQ_UINT16 port ); void setOptSSL ( bool ); void setOptProbe ( bool ); @@ -55,7 +56,7 @@ private slots: private: TQString mHost; - Q_UINT16 mPort; + TQ_UINT16 mPort; int mErrorCode; JabberByteStream *mByteStream; diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index 840f9cf3..119a6f6e 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -107,7 +107,7 @@ JabberContact::JabberContact (const XMPP::RosterItem &rosterItem, Kopete::Accoun * Trigger update once if we're already connected for contacts * that are being added while we are online. */ - if ( account()->myself()->onlineStatus().isDefinitelyOnline() ) + if ( account()->myself()->onlinetqStatus().isDefinitelyOnline() ) { slotGetTimedVCard (); } @@ -170,7 +170,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions () // if the contact is online, display the resources we have for it, // otherwise disable the menu - if (onlineStatus ().status () == Kopete::OnlineStatus::Offline) + if (onlinetqStatus ().status () == Kopete::OnlineStatus::Offline) { actionSelectResource->setEnabled ( false ); } @@ -213,7 +213,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions () * and the resources' respective status icons for the rest. */ TQIconSet iconSet ( !i ? - protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () )); + protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.tqfind(*it) ).iconFor ( account () )); actionSelectResource->insert ( new KAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ), actionSelectResource, TQString::number( i ).latin1() ) ); @@ -263,11 +263,11 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message) { TQString room=message.invite(); TQString originalBody=message.body().isEmpty() ? TQString() : - i18n( "The original message is : <i>\" %1 \"</i><br>" ).arg(TQStyleSheet::escape(message.body())); + i18n( "The original message is : <i>\" %1 \"</i><br>" ).tqarg(TQStyleSheet::escape(message.body())); TQString mes=i18n("<qt><i>%1</i> invited you to join the conference <b>%2</b><br>%3<br>" "If you want to accept and join, just <b>enter your nickname</b> and press ok<br>" "If you want to decline, press cancel</qt>") - .arg(message.from().full(), room , originalBody); + .tqarg(message.from().full(), room , originalBody); bool ok=false; TQString futureNewNickName = KInputDialog::getText( i18n( "Invited to a conference - Jabber Plugin" ), @@ -299,7 +299,7 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message) if(mManager->view( Kopete::Contact::CannotCreate )) { //show an internal message if the user has not already closed his window Kopete::Message m=Kopete::Message ( this, mManager->members(), - i18n("%1 has ended their participation in the chat session.").arg(metaContact()->displayName()), + i18n("%1 has ended their participation in the chat session.").tqarg(metaContact()->displayName()), Kopete::Message::Internal ); m.setImportance(Kopete::Message::Low); mManager->view()->appendMessage ( m ); //use KopeteView::AppendMessage to bypass notifications @@ -415,7 +415,7 @@ void JabberContact::slotCheckVCard () Kopete::ContactProperty cacheDateString = property ( protocol()->propVCardCacheTimeStamp ); // don't do anything while we are offline - if ( !account()->myself()->onlineStatus().isDefinitelyOnline () ) + if ( !account()->myself()->onlinetqStatus().isDefinitelyOnline () ) { return; } @@ -440,13 +440,13 @@ void JabberContact::slotCheckVCard () // avoid warning if key does not exist in configuration file if ( cacheDateString.isNull () ) - cacheDate = TQDateTime::currentDateTime().addDays ( -2 ); + cacheDate = TQDateTime::tqcurrentDateTime().addDays ( -2 ); else cacheDate = TQDateTime::fromString ( cacheDateString.value().toString (), Qt::ISODate ); kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Cached vCard data for " << contactId () << " from " << cacheDate.toString () << endl; - if ( !mVCardUpdateInProgress && ( cacheDate.addDays ( 1 ) < TQDateTime::currentDateTime () ) ) + if ( !mVCardUpdateInProgress && ( cacheDate.addDays ( 1 ) < TQDateTime::tqcurrentDateTime () ) ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling update." << endl; @@ -463,7 +463,7 @@ void JabberContact::slotGetTimedVCard () mVCardUpdateInProgress = false; // check if we are still connected - eventually we lost our connection in the meantime - if ( !account()->myself()->onlineStatus().isDefinitelyOnline () ) + if ( !account()->myself()->onlinetqStatus().isDefinitelyOnline () ) { // we are not connected, discard this update return; @@ -506,7 +506,7 @@ void JabberContact::slotGotVCard () // update timestamp of last vCard retrieval if ( metaContact() && !metaContact()->isTemporary () ) { - setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) ); + setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) ); } mVCardUpdateInProgress = false; @@ -527,7 +527,7 @@ void JabberContact::slotGotVCard () } -void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus ) +void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus ) { /* @@ -541,13 +541,13 @@ void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::Onl * to query its activity after we are already connected. */ - if ( onlineStatus().isDefinitelyOnline () ) + if ( onlinetqStatus().isDefinitelyOnline () ) { // Kopete already deals with lastSeen if the contact is online return; } - if ( ( oldStatus.status () == Kopete::OnlineStatus::Connecting ) && newStatus.isDefinitelyOnline () ) + if ( ( oldtqStatus.status () == Kopete::OnlineStatus::Connecting ) && newtqStatus.isDefinitelyOnline () ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling request for last activity for " << mRosterItem.jid().bare () << endl; @@ -567,13 +567,13 @@ void JabberContact::slotGetTimedLastActivity () * maintained by Kopete) */ - if ( onlineStatus().isDefinitelyOnline () ) + if ( onlinetqStatus().isDefinitelyOnline () ) { // Kopete already deals with setting lastSeen if the contact is online return; } - if ( account()->myself()->onlineStatus().isDefinitelyOnline () ) + if ( account()->myself()->onlinetqStatus().isDefinitelyOnline () ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Requesting last activity from timer for " << mRosterItem.jid().bare () << endl; @@ -591,7 +591,7 @@ void JabberContact::slotGotLastActivity () if ( task->success () ) { - setProperty ( protocol()->propLastSeen, TQDateTime::currentDateTime().addSecs ( -task->seconds () ) ); + setProperty ( protocol()->propLastSeen, TQDateTime(TQDateTime::tqcurrentDateTime().addSecs ( -task->seconds () ))); if( !task->message().isEmpty() ) { setProperty( protocol()->propAwayMessage, task->message() ); @@ -732,7 +732,7 @@ void JabberContact::setPhoto( const TQString &photoPath ) TQString newLocation( locateLocal( "appdata", "jabberphotos/"+ KURL(photoPath).fileName().lower() ) ); // Scale and crop the picture. - contactPhoto = contactPhoto.smoothScale( 96, 96, TQImage::ScaleMin ); + contactPhoto = contactPhoto.smoothScale( 96, 96, TQ_ScaleMin ); // crop image if not square if(contactPhoto.width() < contactPhoto.height()) contactPhoto = contactPhoto.copy((contactPhoto.width()-contactPhoto.height())/2, 0, 96, 96); @@ -741,7 +741,7 @@ void JabberContact::setPhoto( const TQString &photoPath ) // Use the cropped/scaled image now. if(!contactPhoto.save(newLocation, "PNG")) - newPhotoPath = TQString::null; + newPhotoPath = TQString(); else newPhotoPath = newLocation; } @@ -751,7 +751,7 @@ void JabberContact::setPhoto( const TQString &photoPath ) TQString newLocation( locateLocal( "appdata", "jabberphotos/"+ KURL(photoPath).fileName().lower() ) ); // Scale and crop the picture. - contactPhoto = contactPhoto.smoothScale( 32, 32, TQImage::ScaleMin ); + contactPhoto = contactPhoto.smoothScale( 32, 32, TQ_ScaleMin ); // crop image if not square if(contactPhoto.width() < contactPhoto.height()) contactPhoto = contactPhoto.copy((contactPhoto.width()-contactPhoto.height())/2, 0, 32, 32); @@ -760,7 +760,7 @@ void JabberContact::setPhoto( const TQString &photoPath ) // Use the cropped/scaled image now. if(!contactPhoto.save(newLocation, "PNG")) - newPhotoPath = TQString::null; + newPhotoPath = TQString(); else newPhotoPath = newLocation; } @@ -776,7 +776,7 @@ void JabberContact::setPhoto( const TQString &photoPath ) // Use the cropped/scaled image now. if(!contactPhoto.save(newLocation, "PNG")) - newPhotoPath = TQString::null; + newPhotoPath = TQString(); else newPhotoPath = newLocation; } @@ -795,7 +795,7 @@ void JabberContact::slotChatSessionDeleted ( TQObject *sender ) JabberChatSession *manager = static_cast<JabberChatSession *>(sender); - mManagers.remove ( mManagers.find ( manager ) ); + mManagers.remove ( mManagers.tqfind ( manager ) ); } @@ -1015,7 +1015,7 @@ void JabberContact::sendFile ( const KURL &sourceURL, const TQString &/*fileName // if the file location is null, then get it from a file open dialog if ( !sourceURL.isValid () ) - filePath = KFileDialog::getOpenFileName( TQString::null , "*", 0L, i18n ( "Kopete File Transfer" ) ); + filePath = KFileDialog::getOpenFileName( TQString() , "*", 0L, i18n ( "Kopete File Transfer" ) ); else filePath = sourceURL.path(-1); @@ -1110,7 +1110,7 @@ void JabberContact::slotSelectResource () } -void JabberContact::sendPresence ( const XMPP::Status status ) +void JabberContact::sendPresence ( const XMPP::tqStatus status ) { if ( !account()->isConnected () ) @@ -1119,15 +1119,15 @@ void JabberContact::sendPresence ( const XMPP::Status status ) return; } - XMPP::Status newStatus = status; + XMPP::tqStatus newtqStatus = status; // honour our priority - if(newStatus.isAvailable()) - newStatus.setPriority ( account()->configGroup()->readNumEntry ( "Priority", 5 ) ); + if(newtqStatus.isAvailable()) + newtqStatus.setPriority ( account()->configGroup()->readNumEntry ( "Priority", 5 ) ); XMPP::JT_Presence * task = new XMPP::JT_Presence ( account()->client()->rootTask () ); - task->pres ( bestAddress (), newStatus); + task->pres ( bestAddress (), newtqStatus); task->go ( true ); } @@ -1136,7 +1136,7 @@ void JabberContact::sendPresence ( const XMPP::Status status ) void JabberContact::slotStatusOnline () { - XMPP::Status status; + XMPP::tqStatus status; status.setShow(""); sendPresence ( status ); @@ -1146,7 +1146,7 @@ void JabberContact::slotStatusOnline () void JabberContact::slotStatusChatty () { - XMPP::Status status; + XMPP::tqStatus status; status.setShow ("chat"); sendPresence ( status ); @@ -1156,7 +1156,7 @@ void JabberContact::slotStatusChatty () void JabberContact::slotStatusAway () { - XMPP::Status status; + XMPP::tqStatus status; status.setShow ("away"); sendPresence ( status ); @@ -1166,7 +1166,7 @@ void JabberContact::slotStatusAway () void JabberContact::slotStatusXA () { - XMPP::Status status; + XMPP::tqStatus status; status.setShow ("xa"); sendPresence ( status ); @@ -1176,7 +1176,7 @@ void JabberContact::slotStatusXA () void JabberContact::slotStatusDND () { - XMPP::Status status; + XMPP::tqStatus status; status.setShow ("dnd"); sendPresence ( status ); @@ -1187,7 +1187,7 @@ void JabberContact::slotStatusDND () void JabberContact::slotStatusInvisible () { - XMPP::Status status; + XMPP::tqStatus status; status.setIsAvailable( false ); sendPresence ( status ); @@ -1298,8 +1298,8 @@ void JabberContact::slotDiscoFinished( ) XMPP::RosterItem ri = rosterItem(); Kopete::MetaContact *mc=metaContact(); - JabberAccount *parentAccount=account(); - Kopete::OnlineStatus status=onlineStatus(); + JabberAccount *tqparentAccount=account(); + Kopete::OnlineStatus status=onlinetqStatus(); kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << ri.jid().full() << " is not a contact but a gateway - " << this << endl; @@ -1315,7 +1315,7 @@ void JabberContact::slotDiscoFinished( ) Kopete::ContactList::self()->removeMetaContact( mc ); //we need to create the transport when 'this' is already deleted, so transport->myself() will not conflict with it - JabberTransport *transport = new JabberTransport( parentAccount , ri , tr_type ); + JabberTransport *transport = new JabberTransport( tqparentAccount , ri , tr_type ); if(!Kopete::AccountManager::self()->registerAccount( transport )) return; transport->myself()->setOnlineStatus( status ); //push back the online status diff --git a/kopete/protocols/jabber/jabbercontact.h b/kopete/protocols/jabber/jabbercontact.h index 6c88318b..ce40be30 100644 --- a/kopete/protocols/jabber/jabbercontact.h +++ b/kopete/protocols/jabber/jabbercontact.h @@ -34,6 +34,7 @@ class JabberContact : public JabberBaseContact { Q_OBJECT + TQ_OBJECT public: @@ -95,7 +96,7 @@ public slots: * a nondeterminate file size (such as over a socket) */ virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); /** * Update the vCard on the server. @@ -227,7 +228,7 @@ private: /** * Sends a presence packet to this contact */ - void sendPresence ( const XMPP::Status status ); + void sendPresence ( const XMPP::tqStatus status ); /** * This variable keeps a list of message managers. diff --git a/kopete/protocols/jabber/jabbercontactpool.cpp b/kopete/protocols/jabber/jabbercontactpool.cpp index 43724d28..369cb9d9 100644 --- a/kopete/protocols/jabber/jabbercontactpool.cpp +++ b/kopete/protocols/jabber/jabbercontactpool.cpp @@ -93,7 +93,7 @@ JabberContact *JabberContactPool::addContact ( const XMPP::RosterItem &contact, JabberTransport *transport=0l; TQString legacyId; //find if the contact should be added to a transport. - if(mAccount->transports().contains(contact.jid().domain())) + if(mAccount->transports().tqcontains(contact.jid().domain())) { transport=mAccount->transports()[contact.jid().domain()]; legacyId=transport->legacyId( contact.jid() ); @@ -222,7 +222,7 @@ void JabberContactPool::slotContactDestroyed ( Kopete::Contact *contact ) else { //this is a legacy contact. we have no way to get the real Jid at this point, we can only guess it. - TQString contactId= contact->contactId().replace('@','%') + "@" + contact->account()->myself()->contactId(); + TQString contactId= contact->contactId().tqreplace('@','%') + "@" + contact->account()->myself()->contactId(); mAccount->resourcePool()->removeAllResources ( XMPP::Jid ( contactId ) ) ; } diff --git a/kopete/protocols/jabber/jabbercontactpool.h b/kopete/protocols/jabber/jabbercontactpool.h index 419061fd..e6bb1a88 100644 --- a/kopete/protocols/jabber/jabbercontactpool.h +++ b/kopete/protocols/jabber/jabbercontactpool.h @@ -33,10 +33,11 @@ class JabberTransport; /** * @author Till Gerken <till@tantalo.net> */ -class JabberContactPool : public QObject +class JabberContactPool : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -105,9 +106,10 @@ private: }; -class JabberContactPoolItem : QObject +class JabberContactPoolItem : TQObject { Q_OBJECT + TQ_OBJECT public: JabberContactPoolItem ( JabberBaseContact *contact ); ~JabberContactPoolItem (); diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp index 00d8be18..d49d846c 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.cpp +++ b/kopete/protocols/jabber/jabberfiletransfer.cpp @@ -137,8 +137,8 @@ void JabberFileTransfer::slotIncomingTransferAccepted ( Kopete::Transfer *transf mLocalFile.setName ( fileName ); bool couldOpen = false; - Q_LLONG offset = 0; - Q_LLONG length = 0; + TQ_LLONG offset = 0; + TQ_LLONG length = 0; mBytesTransferred = 0; mBytesToTransfer = mXMPPTransfer->fileSize (); diff --git a/kopete/protocols/jabber/jabberfiletransfer.h b/kopete/protocols/jabber/jabberfiletransfer.h index 851d5688..2a5e4810 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.h +++ b/kopete/protocols/jabber/jabberfiletransfer.h @@ -27,10 +27,11 @@ namespace Kopete { class Transfer; } namespace Kopete { class FileTransferInfo; } class JabberBaseContact; -class JabberFileTransfer : public QObject +class JabberFileTransfer : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -64,8 +65,8 @@ private: Kopete::Transfer *mKopeteTransfer; TQFile mLocalFile; int mTransferId; - Q_LLONG mBytesTransferred; - Q_LLONG mBytesToTransfer; + TQ_LLONG mBytesTransferred; + TQ_LLONG mBytesToTransfer; }; diff --git a/kopete/protocols/jabber/jabberformlineedit.cpp b/kopete/protocols/jabber/jabberformlineedit.cpp index 991d4a56..235faffe 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 * parent, const char *name):TQLineEdit (value, - parent, +JabberFormLineEdit::JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent, const char *name):TQLineEdit (value, + tqparent, name) { @@ -38,7 +38,7 @@ JabberFormLineEdit::~JabberFormLineEdit () { } -JabberFormPasswordEdit::JabberFormPasswordEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent, const char *name):KPasswordEdit(parent, name) +JabberFormPasswordEdit::JabberFormPasswordEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent, const char *name):KPasswordEdit(tqparent, name) { setText(value); diff --git a/kopete/protocols/jabber/jabberformlineedit.h b/kopete/protocols/jabber/jabberformlineedit.h index 179a8844..8ed1defc 100644 --- a/kopete/protocols/jabber/jabberformlineedit.h +++ b/kopete/protocols/jabber/jabberformlineedit.h @@ -28,11 +28,14 @@ *@author Till Gerken <till@tantalo.net> */ -class JabberFormLineEdit:public QLineEdit +class JabberFormLineEdit:public TQLineEdit { - Q_OBJECT public: - JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0); + Q_OBJECT + TQ_OBJECT + +public: + JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent = 0, const char *name = 0); ~JabberFormLineEdit (); public slots:void slotGatherData (XMPP::Form & form); @@ -46,8 +49,11 @@ class JabberFormLineEdit:public QLineEdit class JabberFormPasswordEdit:public KPasswordEdit { - Q_OBJECT public: - JabberFormPasswordEdit(const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0); + Q_OBJECT + TQ_OBJECT + +public: + JabberFormPasswordEdit(const int type, const TQString & realName, const TQString & value, TQWidget * tqparent = 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 3344f802..08fd3cfe 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 * parent, const char *name):TQWidget (parent, name) +JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * tqparent, const char *name):TQWidget (tqparent, name) { /* Copy basic form values. */ privForm.setJid (form.jid ()); @@ -31,12 +31,12 @@ JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * emptyForm = privForm; - /* Add instructions to layout. */ + /* Add instructions to tqlayout. */ TQVBoxLayout *innerLayout = new TQVBoxLayout (this, 0, 4); TQLabel *label = new TQLabel (form.instructions (), this, "InstructionLabel"); - label->setAlignment (int (TQLabel::WordBreak | TQLabel::AlignVCenter)); - label->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Fixed, true); + label->tqsetAlignment (int (TQLabel::WordBreak | TQLabel::AlignVCenter)); + label->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Fixed, true); label->show (); innerLayout->addWidget (label, 0); diff --git a/kopete/protocols/jabber/jabberformtranslator.h b/kopete/protocols/jabber/jabberformtranslator.h index 875594df..1718ec4b 100644 --- a/kopete/protocols/jabber/jabberformtranslator.h +++ b/kopete/protocols/jabber/jabberformtranslator.h @@ -27,13 +27,14 @@ *@author Till Gerken <till@tantalo.net> */ -class JabberFormTranslator:public QWidget +class JabberFormTranslator:public TQWidget { Q_OBJECT + TQ_OBJECT public: - JabberFormTranslator (const XMPP::Form & form, TQWidget * parent = 0, const char *name = 0); + JabberFormTranslator (const XMPP::Form & form, TQWidget * tqparent = 0, const char *name = 0); ~JabberFormTranslator (); XMPP::Form & resultData (); diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp index e098fdad..ff5ae32c 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp +++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp @@ -89,7 +89,7 @@ void JabberGroupChatManager::slotMessageSent ( Kopete::Message &message, Kopete: jabberMessage.setSubject ( message.subject () ); jabberMessage.setTimeStamp ( message.timestamp () ); - if ( message.plainBody().find ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) + if ( message.plainBody().tqfind ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) { /* * This message is encrypted, so we need to set @@ -106,7 +106,7 @@ void JabberGroupChatManager::slotMessageSent ( Kopete::Message &message, Kopete: // remove PGP header and footer from message encryptedBody.truncate ( encryptedBody.length () - TQString("-----END PGP MESSAGE-----").length () - 2 ); - encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.find ( "\n\n" ) - 2 ); + encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.tqfind ( "\n\n" ) - 2 ); // assign payload to message jabberMessage.setXEncrypted ( encryptedBody ); @@ -145,7 +145,7 @@ void JabberGroupChatManager::inviteContact( const TQString & contactId ) jabberMessage.setFrom ( account()->client()->jid() ); jabberMessage.setTo ( contactId ); jabberMessage.setInvite( mRoomJid.userHost() ); - jabberMessage.setBody( i18n("You have been invited to %1").arg( mRoomJid.userHost() ) ); + jabberMessage.setBody( i18n("You have been invited to %1").tqarg( mRoomJid.userHost() ) ); // send the message account()->client()->sendMessage ( jabberMessage ); diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.h b/kopete/protocols/jabber/jabbergroupchatmanager.h index 0891ae01..fb92ba40 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.h +++ b/kopete/protocols/jabber/jabbergroupchatmanager.h @@ -33,6 +33,7 @@ class TQString; class JabberGroupChatManager : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: JabberGroupChatManager ( JabberProtocol *protocol, const JabberBaseContact *user, diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index 4cc9d628..7ddf4041 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -296,7 +296,7 @@ void JabberGroupContact::sendFile ( const KURL &sourceURL, const TQString &/*fil // if the file location is null, then get it from a file open dialog if ( !sourceURL.isValid () ) - filePath = KFileDialog::getOpenFileName( TQString::null , "*", 0L, i18n ( "Kopete File Transfer" ) ); + filePath = KFileDialog::getOpenFileName( TQString() , "*", 0L, i18n ( "Kopete File Transfer" ) ); else filePath = sourceURL.path(-1); @@ -345,8 +345,8 @@ void JabberGroupContact::slotStatusChanged( ) } //TODO: away message - XMPP::Status newStatus = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() ); - account()->client()->setGroupChatStatus( rosterItem().jid().host() , rosterItem().jid().user() , newStatus ); + XMPP::tqStatus newtqStatus = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() ); + account()->client()->setGroupChattqStatus( rosterItem().jid().host() , rosterItem().jid().user() , newtqStatus ); } void JabberGroupContact::slotChangeNick( ) @@ -354,14 +354,14 @@ void JabberGroupContact::slotChangeNick( ) bool ok; TQString futureNewNickName = KInputDialog::getText( i18n( "Change nickanme - Jabber Plugin" ), - i18n( "Please enter the new nick name you want to have on the room <i>%1</i>" ).arg(rosterItem().jid().userHost()), + i18n( "Please enter the new nick name you want to have on the room <i>%1</i>" ).tqarg(rosterItem().jid().userHost()), mNick, &ok ); if ( !ok || !account()->isConnected()) return; mNick=futureNewNickName; - XMPP::Status status = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() ); + XMPP::tqStatus status = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() ); account()->client()->changeGroupChatNick( rosterItem().jid().host() , rosterItem().jid().user() , mNick , status); } diff --git a/kopete/protocols/jabber/jabbergroupcontact.h b/kopete/protocols/jabber/jabbergroupcontact.h index 7cbd4f36..46bdad2a 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.h +++ b/kopete/protocols/jabber/jabbergroupcontact.h @@ -27,6 +27,7 @@ class JabberGroupContact : public JabberBaseContact { Q_OBJECT + TQ_OBJECT public: @@ -70,7 +71,7 @@ public slots: * a nondeterminate file size (such as over a socket) */ virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); private slots: diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp index ca71b472..e9bae4c1 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp +++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp @@ -150,7 +150,7 @@ void JabberGroupMemberContact::sendFile ( const KURL &sourceURL, const TQString // if the file location is null, then get it from a file open dialog if ( !sourceURL.isValid () ) - filePath = KFileDialog::getOpenFileName( TQString::null , "*", 0L, i18n ( "Kopete File Transfer" ) ); + filePath = KFileDialog::getOpenFileName( TQString() , "*", 0L, i18n ( "Kopete File Transfer" ) ); else filePath = sourceURL.path(-1); diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.h b/kopete/protocols/jabber/jabbergroupmembercontact.h index 2936a5f8..cddc0a58 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.h +++ b/kopete/protocols/jabber/jabbergroupmembercontact.h @@ -28,6 +28,7 @@ class JabberGroupMemberContact : public JabberBaseContact { Q_OBJECT + TQ_OBJECT public: @@ -64,7 +65,7 @@ public slots: * a nondeterminate file size (such as over a socket) */ virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); private slots: /** diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index df8dba7d..c88b8841 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -69,14 +69,14 @@ typedef KGenericFactory<JabberProtocol> JabberProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_jabber, JabberProtocolFactory( "kopete_jabber" ) ) -JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStringList &) -: Kopete::Protocol( JabberProtocolFactory::instance(), parent, name ), +JabberProtocol::JabberProtocol (TQObject * tqparent, const char *name, const TQStringList &) +: Kopete::Protocol( JabberProtocolFactory::instance(), tqparent, 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::null, i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, 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), JabberKOSXA(Kopete::OnlineStatus::Away, 70, this, JabberXA, "contact_xa_overlay", i18n ("Extended Away"), i18n ("Extended Away"), 0, Kopete::OnlineStatusManager::HasAwayMessage), JabberKOSDND(Kopete::OnlineStatus::Away, 60, this, JabberDND, "contact_busy_overlay", i18n ("Do not Disturb"), i18n ("Do not Disturb"), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage), - JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this, JabberOffline, TQString::null, i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasAwayMessage ), + JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this, JabberOffline, TQString(), i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasAwayMessage ), JabberKOSInvisible(Kopete::OnlineStatus::Invisible, 40, this, JabberInvisible, "contact_invisible_overlay", i18n ("Invisible") ,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible), JabberKOSConnecting(Kopete::OnlineStatus::Connecting, 30, this, JabberConnecting, "jabber_connecting", i18n("Connecting")), propLastSeen(Kopete::Global::Properties::self()->lastSeen()), @@ -90,34 +90,34 @@ JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStr propWorkPhone(Kopete::Global::Properties::self()->workPhone()), propWorkMobilePhone(Kopete::Global::Properties::self()->workMobilePhone()), propNickName(Kopete::Global::Properties::self()->nickName()), - propSubscriptionStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString::null, true, false), - propAuthorizationStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString::null, true, false), + propSubscriptiontqStatus("jabberSubscriptiontqStatus", i18n ("Subscription"), TQString(), true, false), + propAuthorizationtqStatus("jabberAuthorizationtqStatus", i18n ("Authorization tqStatus"), TQString(), true, false), propAvailableResources("jabberAvailableResources", i18n ("Available Resources"), "jabber_chatty", false, true), - propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString::null, true, false, true), + propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString(), true, false, true), propPhoto(Kopete::Global::Properties::self()->photo()), - propJid("jabberVCardJid", i18n("Jabber ID"), TQString::null, true, false), - propBirthday("jabberVCardBirthday", i18n("Birthday"), TQString::null, true, false), - propTimezone("jabberVCardTimezone", i18n("Timezone"), TQString::null, true, false), - propHomepage("jabberVCardHomepage", i18n("Homepage"), TQString::null, true, false), - propCompanyName("jabberVCardCompanyName", i18n("Company name"), TQString::null, true, false), - propCompanyDepartement("jabberVCardCompanyDepartement", i18n("Company Departement"), TQString::null, true, false), - propCompanyPosition("jabberVCardCompanyPosition", i18n("Company Position"), TQString::null, true, false), - propCompanyRole("jabberVCardCompanyRole", i18n("Company Role"), TQString::null, true, false), - propWorkStreet("jabberVCardWorkStreet", i18n("Work Street"), TQString::null, true, false), - propWorkExtAddr("jabberVCardWorkExtAddr", i18n("Work Extra Address"), TQString::null, true, false), - propWorkPOBox("jabberVCardWorkPOBox", i18n("Work PO Box"), TQString::null, true, false), - propWorkCity("jabberVCardWorkCity", i18n("Work City"), TQString::null, true, false), - propWorkPostalCode("jabberVCardWorkPostalCode", i18n("Work Postal Code"), TQString::null, true, false), - propWorkCountry("jabberVCardWorkCountry", i18n("Work Country"), TQString::null, true, false), - propWorkEmailAddress("jabberVCardWorkEmailAddress", i18n("Work Email Address"), TQString::null, true, false), - propHomeStreet("jabberVCardHomeStreet", i18n("Home Street"), TQString::null, true, false), - propHomeExtAddr("jabberVCardHomeExt", i18n("Home Extra Address"), TQString::null, true, false), - propHomePOBox("jabberVCardHomePOBox", i18n("Home PO Box"), TQString::null, true, false), - propHomeCity("jabberVCardHomeCity", i18n("Home City"), TQString::null, true, false), - propHomePostalCode("jabberVCardHomePostalCode", i18n("Home Postal Code"), TQString::null, true, false), - propHomeCountry("jabberVCardHomeCountry", i18n("Home Country"), TQString::null, true, false), - propPhoneFax("jabberVCardPhoneFax", i18n("Fax"), TQString::null, true, false), - propAbout("jabberVCardAbout", i18n("About"), TQString::null, true, false) + propJid("jabberVCardJid", i18n("Jabber ID"), TQString(), true, false), + propBirthday("jabberVCardBirthday", i18n("Birthday"), TQString(), true, false), + propTimezone("jabberVCardTimezone", i18n("Timezone"), TQString(), true, false), + propHomepage("jabberVCardHomepage", i18n("Homepage"), TQString(), true, false), + propCompanyName("jabberVCardCompanyName", i18n("Company name"), TQString(), true, false), + propCompanyDepartement("jabberVCardCompanyDepartement", i18n("Company Departement"), TQString(), true, false), + propCompanyPosition("jabberVCardCompanyPosition", i18n("Company Position"), TQString(), true, false), + propCompanyRole("jabberVCardCompanyRole", i18n("Company Role"), TQString(), true, false), + propWorkStreet("jabberVCardWorkStreet", i18n("Work Street"), TQString(), true, false), + propWorkExtAddr("jabberVCardWorkExtAddr", i18n("Work Extra Address"), TQString(), true, false), + propWorkPOBox("jabberVCardWorkPOBox", i18n("Work PO Box"), TQString(), true, false), + propWorkCity("jabberVCardWorkCity", i18n("Work City"), TQString(), true, false), + propWorkPostalCode("jabberVCardWorkPostalCode", i18n("Work Postal Code"), TQString(), true, false), + propWorkCountry("jabberVCardWorkCountry", i18n("Work Country"), TQString(), true, false), + propWorkEmailAddress("jabberVCardWorkEmailAddress", i18n("Work Email Address"), TQString(), true, false), + propHomeStreet("jabberVCardHomeStreet", i18n("Home Street"), TQString(), true, false), + propHomeExtAddr("jabberVCardHomeExt", i18n("Home Extra Address"), TQString(), true, false), + propHomePOBox("jabberVCardHomePOBox", i18n("Home PO Box"), TQString(), true, false), + propHomeCity("jabberVCardHomeCity", i18n("Home City"), TQString(), true, false), + propHomePostalCode("jabberVCardHomePostalCode", i18n("Home Postal Code"), TQString(), true, false), + propHomeCountry("jabberVCardHomeCountry", i18n("Home Country"), TQString(), true, false), + propPhoneFax("jabberVCardPhoneFax", i18n("Fax"), TQString(), true, false), + propAbout("jabberVCardAbout", i18n("About"), TQString(), true, false) { @@ -155,18 +155,18 @@ JabberProtocol::~JabberProtocol () -AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * parent, Kopete::Account * i) +AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * tqparent, Kopete::Account * i) { kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Create Add Contact Widget\n" << endl; - return new JabberAddContactPage (i, parent); + return new JabberAddContactPage (i, tqparent); } -KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * parent) +KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * tqparent) { 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 , parent); + return new JabberEditAccountWidget (this,ja , tqparent); else { JabberTransport *transport = dynamic_cast < JabberTransport * >(account); @@ -185,7 +185,7 @@ Kopete::Account *JabberProtocol::createNewAccount (const TQString & accountId) if( Kopete::AccountManager::self()->findAccount( pluginId() , accountId ) ) return 0L; //the account may already exist if greated just above - int slash=accountId.find('/'); + int slash=accountId.tqfind('/'); if(slash>=0) { TQString realAccountId=accountId.left(slash); @@ -304,42 +304,42 @@ Kopete::Contact *JabberProtocol::deserializeContact (Kopete::MetaContact * metaC return account->contacts()[contactId]; } -XMPP::Status JabberProtocol::kosToStatus( const Kopete::OnlineStatus & status , const TQString & message ) +XMPP::tqStatus JabberProtocol::kosTotqStatus( const Kopete::OnlineStatus & status , const TQString & message ) { - XMPP::Status xmppStatus ( "", message ); + XMPP::tqStatus xmpptqStatus ( "", message ); if( status.status() == Kopete::OnlineStatus::Offline ) { - xmppStatus.setIsAvailable( false ); + xmpptqStatus.setIsAvailable( false ); } switch ( status.internalStatus () ) { case JabberProtocol::JabberFreeForChat: - xmppStatus.setShow ( "chat" ); + xmpptqStatus.setShow ( "chat" ); break; case JabberProtocol::JabberOnline: - xmppStatus.setShow ( "" ); + xmpptqStatus.setShow ( "" ); break; case JabberProtocol::JabberAway: - xmppStatus.setShow ( "away" ); + xmpptqStatus.setShow ( "away" ); break; case JabberProtocol::JabberXA: - xmppStatus.setShow ( "xa" ); + xmpptqStatus.setShow ( "xa" ); break; case JabberProtocol::JabberDND: - xmppStatus.setShow ( "dnd" ); + xmpptqStatus.setShow ( "dnd" ); break; case JabberProtocol::JabberInvisible: - xmppStatus.setIsInvisible ( true ); + xmpptqStatus.setIsInvisible ( true ); break; } - return xmppStatus; + return xmpptqStatus; } #include "jabberprotocol.moc" diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h index 35c8cdbc..696d572b 100644 --- a/kopete/protocols/jabber/jabberprotocol.h +++ b/kopete/protocols/jabber/jabberprotocol.h @@ -39,30 +39,31 @@ namespace XMPP { class Resource; - class Status; + class tqStatus; } class JabberContact; -class dlgJabberStatus; +class dlgJabbertqStatus; class dlgJabberSendRaw; class JabberCapabilitiesManager; class JabberProtocol:public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: /** * Object constructor and destructor */ - JabberProtocol (TQObject * parent, const char *name, const TQStringList &); + JabberProtocol (TQObject * tqparent, const char *name, const TQStringList &); ~JabberProtocol (); /** * Creates the "add contact" dialog specific to this protocol */ - virtual AddContactPage *createAddContactWidget (TQWidget * parent, Kopete::Account * i); - virtual KopeteEditAccountWidget *createEditAccountWidget (Kopete::Account * account, TQWidget * parent); + virtual AddContactPage *createAddContactWidget (TQWidget * tqparent, Kopete::Account * i); + virtual KopeteEditAccountWidget *createEditAccountWidget (Kopete::Account * account, TQWidget * tqparent); virtual Kopete::Account *createNewAccount (const TQString & accountId); /** @@ -94,8 +95,8 @@ public: const Kopete::ContactPropertyTmpl propWorkPhone; const Kopete::ContactPropertyTmpl propWorkMobilePhone; const Kopete::ContactPropertyTmpl propNickName; - const Kopete::ContactPropertyTmpl propSubscriptionStatus; - const Kopete::ContactPropertyTmpl propAuthorizationStatus; + const Kopete::ContactPropertyTmpl propSubscriptiontqStatus; + const Kopete::ContactPropertyTmpl propAuthorizationtqStatus; const Kopete::ContactPropertyTmpl propAvailableResources; const Kopete::ContactPropertyTmpl propVCardCacheTimeStamp; const Kopete::ContactPropertyTmpl propPhoto; @@ -140,9 +141,9 @@ public: Kopete::OnlineStatus resourceToKOS ( const XMPP::Resource &resource ); /** - * Convert an online status to a XMPP::Status + * Convert an online status to a XMPP::tqStatus */ - XMPP::Status kosToStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() ); + XMPP::tqStatus kosTotqStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() ); /** * Return the Entity Capabilities(JEP-0115) manager instance. diff --git a/kopete/protocols/jabber/jabberresource.cpp b/kopete/protocols/jabber/jabberresource.cpp index 04b7d9f3..a971e1c8 100644 --- a/kopete/protocols/jabber/jabberresource.cpp +++ b/kopete/protocols/jabber/jabberresource.cpp @@ -18,7 +18,7 @@ #include "jabberresource.h" -// Qt includes +// TQt includes #include <tqtimer.h> // KDE includes diff --git a/kopete/protocols/jabber/jabberresource.h b/kopete/protocols/jabber/jabberresource.h index b29129be..5f274668 100644 --- a/kopete/protocols/jabber/jabberresource.h +++ b/kopete/protocols/jabber/jabberresource.h @@ -35,9 +35,10 @@ class Jid; class Features; } -class JabberResource : public QObject +class JabberResource : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kopete/protocols/jabber/jabberresourcepool.cpp b/kopete/protocols/jabber/jabberresourcepool.cpp index 19492790..4c84d535 100644 --- a/kopete/protocols/jabber/jabberresourcepool.cpp +++ b/kopete/protocols/jabber/jabberresourcepool.cpp @@ -32,7 +32,7 @@ * for a given JID can be found. It's an empty offline * resource. */ -XMPP::Resource JabberResourcePool::EmptyResource ( "", XMPP::Status ( "", "", 0, false ) ); +XMPP::Resource JabberResourcePool::EmptyResource ( "", XMPP::tqStatus ( "", "", 0, false ) ); class JabberResourcePool::Private { @@ -95,7 +95,7 @@ void JabberResourcePool::notifyRelevantContacts ( const XMPP::Jid &jid ) for(JabberBaseContact *mContact = list.first (); mContact; mContact = list.next ()) { - mContact->reevaluateStatus (); + mContact->reevaluatetqStatus (); } } diff --git a/kopete/protocols/jabber/jabberresourcepool.h b/kopete/protocols/jabber/jabberresourcepool.h index 7378cbe0..1f892d24 100644 --- a/kopete/protocols/jabber/jabberresourcepool.h +++ b/kopete/protocols/jabber/jabberresourcepool.h @@ -29,9 +29,10 @@ class JabberAccount; * @author Till Gerken <till@tantalo.net> * @author Michaël Larouche <michael.larouche@kdemail.net> */ -class JabberResourcePool : public QObject +class JabberResourcePool : public TQObject { Q_OBJECT + TQ_OBJECT public: static XMPP::Resource EmptyResource; diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 26d16b28..a081a8db 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -38,11 +38,11 @@ #include "xmpp_tasks.h" -JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem & item, const TQString& gateway_type) - : Kopete::Account ( parentAccount->protocol(), parentAccount->accountId()+"/"+ item.jid().bare() ) +JabberTransport::JabberTransport (JabberAccount * tqparentAccount, const XMPP::RosterItem & item, const TQString& gateway_type) + : Kopete::Account ( tqparentAccount->protocol(), tqparentAccount->accountId()+"/"+ item.jid().bare() ) { m_status=Creating; - m_account = parentAccount; + m_account = tqparentAccount; m_account->addTransport( this,item.jid().bare() ); JabberContact *myContact = m_account->contactPool()->addContact ( item , Kopete::ContactList::self()->myself(), false ); @@ -88,11 +88,11 @@ JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::Ros m_status=Normal; } -JabberTransport::JabberTransport( JabberAccount * parentAccount, const TQString & _accountId ) - : Kopete::Account ( parentAccount->protocol(), _accountId ) +JabberTransport::JabberTransport( JabberAccount * tqparentAccount, const TQString & _accountId ) + : Kopete::Account ( tqparentAccount->protocol(), _accountId ) { m_status=Creating; - m_account = parentAccount; + m_account = tqparentAccount; const TQString contactJID_s = configGroup()->readEntry("GatewayJID"); @@ -123,11 +123,11 @@ JabberTransport::~JabberTransport () KActionMenu *JabberTransport::actionMenu () { - KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); + KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this ); TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); - menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick ) + menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick ) ); TQPtrList<KAction> *customActions = myself()->customContextMenuActions( ); @@ -203,44 +203,44 @@ void JabberTransport::setOnlineStatus( const Kopete::OnlineStatus& status , con return; } - XMPP::Status xmppStatus ( "", reason ); + XMPP::tqStatus xmpptqStatus ( "", reason ); switch ( status.internalStatus () ) { case JabberProtocol::JabberFreeForChat: - xmppStatus.setShow ( "chat" ); + xmpptqStatus.setShow ( "chat" ); break; case JabberProtocol::JabberOnline: - xmppStatus.setShow ( "" ); + xmpptqStatus.setShow ( "" ); break; case JabberProtocol::JabberAway: - xmppStatus.setShow ( "away" ); + xmpptqStatus.setShow ( "away" ); break; case JabberProtocol::JabberXA: - xmppStatus.setShow ( "xa" ); + xmpptqStatus.setShow ( "xa" ); break; case JabberProtocol::JabberDND: - xmppStatus.setShow ( "dnd" ); + xmpptqStatus.setShow ( "dnd" ); break; case JabberProtocol::JabberInvisible: - xmppStatus.setIsInvisible ( true ); + xmpptqStatus.setIsInvisible ( true ); break; } if ( !isConnected () ) { // we are not connected yet, so connect now - m_initialPresence = xmppStatus; + m_initialPresence = xmpptqStatus; connect (); } else { - setPresence ( xmppStatus ); + setPresence ( xmpptqStatus ); } #endif } @@ -277,7 +277,7 @@ void JabberTransport::removeAllContacts( ) /* if ( ! task->success ()) KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error, - i18n ("An error occured when trying to remove the transport:\n%1").arg(task->statusString()), + i18n ("An error occured when trying to remove the transport:\n%1").tqarg(task->statusString()), i18n ("Jabber Service Unregistration")); */ //we don't really care, we remove everithing anyway. @@ -298,7 +298,7 @@ TQString JabberTransport::legacyId( const XMPP::Jid & jid ) if(jid.node().isEmpty()) return TQString(); TQString node = jid.node(); - return node.replace("%","@"); + return node.tqreplace("%","@"); } void JabberTransport::jabberAccountRemoved( ) @@ -328,7 +328,7 @@ void JabberTransport::eatContacts( ) { XMPP::RosterItem item=contact->rosterItem(); Kopete::MetaContact *mc=contact->metaContact(); - Kopete::OnlineStatus status = contact->onlineStatus(); + Kopete::OnlineStatus status = contact->onlinetqStatus(); kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << item.jid().full() << " will be soon eat - " << contact << endl; delete contact; Kopete::Contact *c2=account()->contactPool()->addContact( item , mc , false ); //not sure this is false; diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h index 605f5cc4..e03be173 100644 --- a/kopete/protocols/jabber/jabbertransport.h +++ b/kopete/protocols/jabber/jabbertransport.h @@ -40,29 +40,30 @@ class JabberProtocol; class JabberTransport : public Kopete::Account { Q_OBJECT + TQ_OBJECT public: /** * constructor called when the transport is created by info from server (i.e not when loading kopete) - * @param parentAccount is the parent jabber account. + * @param tqparentAccount is the tqparent 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 */ - JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString()); + JabberTransport (JabberAccount * tqparentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString()); /** * constructor called when the transport is loaded from config - * @param parentAccount is the parent jabber account. + * @param tqparentAccount is the tqparent jabber account. * @param accountId is the accountId */ - JabberTransport (JabberAccount * parentAccount, const TQString &accountId ); + JabberTransport (JabberAccount * tqparentAccount, const TQString &accountId ); ~JabberTransport (); /** Returns the action menu for this account. */ virtual KActionMenu *actionMenu (); - /** the parent account */ + /** the tqparent account */ JabberAccount *account() const { return m_account; } @@ -79,8 +80,8 @@ public: virtual bool removeAccount(); - enum TransportStatus { Normal , Creating, Removing , AccountRemoved }; - TransportStatus transportStatus() { return m_status; }; + enum TransporttqStatus { Normal , Creating, Removing , AccountRemoved }; + TransporttqStatus transporttqStatus() { return m_status; }; /** * return the legacyId conrresponding to the jid @@ -91,7 +92,7 @@ public: public slots: /* Reimplemented from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); /** * the account has been unregistered. @@ -122,16 +123,16 @@ protected: * method should have the "dirty" flag set. * * This method should simply be used to intantiate the new contact, everything else - * (updating the GUI, parenting to meta contact, etc.) is being taken care of. + * (updating the GUI, tqparenting to meta contact, etc.) is being taken care of. * * @param contactId The unique ID for this protocol - * @param parentContact The metacontact to add this contact to + * @param tqparentContact The metacontact to add this contact to */ - virtual bool createContact (const TQString & contactID, Kopete::MetaContact * parentContact); + virtual bool createContact (const TQString & contactID, Kopete::MetaContact * tqparentContact); private: JabberAccount *m_account; - TransportStatus m_status; + TransporttqStatus m_status; }; diff --git a/kopete/protocols/jabber/jingle/DESIGN b/kopete/protocols/jabber/jingle/DESIGN index b1cbd666..4698ca5d 100644 --- a/kopete/protocols/jabber/jingle/DESIGN +++ b/kopete/protocols/jabber/jingle/DESIGN @@ -60,11 +60,11 @@ JingleSessionManager manage the JingleSession pointers. Do not delete it in user * JingleSessionManager(JabberAccount *) -* public slots: +* public Q_SLOTS: * JingleSession *createSession(const QString &sessionType, const JidList &peers); * void removeSession(JingleSession *); -signals: +Q_SIGNALS: * void incomingSession(const QString &sessionType, JingleSession *session); JingleSession @@ -89,10 +89,10 @@ Base class for Jingle session. A session is a // Return Session XML namespace * virtual QString sessionType() = 0; -protected slots: +protected Q_SLOTS: void sendStanza(const QString &stanza) { account()->client->send(stanza); -signals: +Q_SIGNALS: void accepted(); void declined(); void terminated(); @@ -105,7 +105,7 @@ Hold the PhoneSessionClient object. connect(account()->client(),SIGNAL(xmlIncoming(const QString&)),SLOT(receiveStanza(const QString&))); -private slots: +private Q_SLOTS: void receiveStanza(const QString &stanza); VoiceConversationDialog diff --git a/kopete/protocols/jabber/jingle/jinglesession.h b/kopete/protocols/jabber/jingle/jinglesession.h index a9d73440..ad5d68a7 100644 --- a/kopete/protocols/jabber/jingle/jinglesession.h +++ b/kopete/protocols/jabber/jingle/jinglesession.h @@ -29,9 +29,10 @@ class JabberAccount; * * @author Michaël Larouche <michael.larouche@kdemail.net> */ -class JingleSession : public QObject +class JingleSession : public TQObject { Q_OBJECT + TQ_OBJECT public: typedef TQValueList<XMPP::Jid> JidList; diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp index 54fc7274..766da28e 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp @@ -14,7 +14,7 @@ * * ************************************************************************* */ -// libjingle before everything else to not clash with Qt +// libjingle before everything else to not clash with TQt #define POSIX #include "talk/xmpp/constants.h" #include "talk/base/sigslot.h" @@ -55,8 +55,8 @@ class JingleSessionManager; class JingleSessionManager::SlotsProxy : public sigslot::has_slots<> { public: - SlotsProxy(JingleSessionManager *parent) - : sessionManager(parent) + SlotsProxy(JingleSessionManager *tqparent) + : sessionManager(tqparent) {} void OnSignalingRequest() diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.h b/kopete/protocols/jabber/jingle/jinglesessionmanager.h index f9bb82b9..2ec3ef46 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.h +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.h @@ -36,9 +36,10 @@ class JabberAccount; * @brief Manage Jingle sessions. * @author Michaël Larouche <michael.larouche@kdemail.net> */ -class JingleSessionManager : public QObject +class JingleSessionManager : public TQObject { Q_OBJECT + TQ_OBJECT public: typedef TQValueList<XMPP::Jid> JidList; diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index 12e4b93d..344071c6 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -41,29 +41,29 @@ // ---------------------------------------------------------------------------- -class JingleIQResponder : public XMPP::Task +class JingleITQResponder : public XMPP::Task { public: - JingleIQResponder(XMPP::Task *); - ~JingleIQResponder(); + JingleITQResponder(XMPP::Task *); + ~JingleITQResponder(); bool take(const TQDomElement &); }; /** - * \class JingleIQResponder + * \class JingleITQResponder * \brief A task that responds to jingle candidate queries with an empty reply. */ -JingleIQResponder::JingleIQResponder(Task *parent) :Task(parent) +JingleITQResponder::JingleITQResponder(Task *tqparent) :Task(tqparent) { } -JingleIQResponder::~JingleIQResponder() +JingleITQResponder::~JingleITQResponder() { } -bool JingleIQResponder::take(const TQDomElement &e) +bool JingleITQResponder::take(const TQDomElement &e) { if(e.tagName() != "iq") return false; @@ -114,7 +114,7 @@ void JingleClientSlots::callDestroyed(cricket::Call *call) qDebug("JingleClientSlots: Call destroyed"); Jid jid(call->sessions()[0]->remote_address().c_str()); if (voiceCaller_->calling(jid)) { - qDebug(TQString("Removing unterminated call to %1").arg(jid.full())); + qDebug(TQString("Removing unterminated call to %1").tqarg(jid.full())); voiceCaller_->removeCall(jid); emit voiceCaller_->terminated(jid); } @@ -123,8 +123,8 @@ void JingleClientSlots::callDestroyed(cricket::Call *call) void JingleClientSlots::sendStanza(cricket::SessionClient*, const buzz::XmlElement *stanza) { TQString st(stanza->Str().c_str()); - st.replace("cli:iq","iq"); - st.replace(":cli=","="); + st.tqreplace("cli:iq","iq"); + st.tqreplace(":cli=","="); fprintf(stderr,"bling\n"); voiceCaller_->sendStanza(st.latin1()); fprintf(stderr,"blong\n"); @@ -138,7 +138,7 @@ void JingleClientSlots::requestSignaling() void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *session, cricket::Session::State state) { - qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").arg(state)); + qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").tqarg(state)); // Why is c_str() stuff needed to make it compile on OS X ? Jid jid(session->remote_address().c_str()); @@ -156,7 +156,7 @@ void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *sess } else if (state == cricket::Session::STATE_SENTMODIFY) { } else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); + qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) { } else if (state == cricket::Session::STATE_RECEIVEDREJECT) { @@ -195,7 +195,7 @@ void JingleVoiceCaller::initialize() return; TQString jid = ((ClientStream&) account()->client()->client()->stream()).jid().full(); - qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").arg(jid)); + qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").tqarg(jid)); if (jid.isEmpty()) { qWarning("jinglevoicecaller.cpp: Empty JID"); return; @@ -230,7 +230,7 @@ void JingleVoiceCaller::initialize() phone_client_->SignalSendStanza.connect(slots_, &JingleClientSlots::sendStanza); // IQ Responder - new JingleIQResponder(account()->client()->rootTask()); + new JingleITQResponder(account()->client()->rootTask()); // Listen to incoming packets connect(account()->client()->client(),TQT_SIGNAL(xmlIncoming(const TQString&)),TQT_SLOT(receiveStanza(const TQString&))); @@ -266,12 +266,12 @@ JingleVoiceCaller::~JingleVoiceCaller() bool JingleVoiceCaller::calling(const Jid& jid) { - return calls_.contains(jid.full()); + return calls_.tqcontains(jid.full()); } void JingleVoiceCaller::call(const Jid& jid) { - qDebug(TQString("jinglevoicecaller.cpp: Calling %1").arg(jid.full())); + qDebug(TQString("jinglevoicecaller.cpp: Calling %1").tqarg(jid.full())); cricket::Call *c = ((cricket::PhoneSessionClient*)(phone_client_))->CreateCall(); c->InitiateSession(buzz::Jid(jid.full().ascii())); phone_client_->SetFocus(c); @@ -299,7 +299,7 @@ void JingleVoiceCaller::reject(const Jid& j) void JingleVoiceCaller::terminate(const Jid& j) { - qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").arg(j.full())); + qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").tqarg(j.full())); cricket::Call* call = calls_[j.full()]; if (call != NULL) { call->Terminate(); @@ -316,7 +316,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call) { qDebug("jinglevoicecaller.cpp: Registering call\n"); kdDebug(14000) << k_funcinfo << jid.full() << endl; - if (!calls_.contains(jid.full())) { + if (!calls_.tqcontains(jid.full())) { calls_[jid.full()] = call; } // else { @@ -327,7 +327,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call) void JingleVoiceCaller::removeCall(const Jid& j) { - qDebug(TQString("JingleVoiceCaller: Removing call to %1").arg(j.full())); + qDebug(TQString("JingleVoiceCaller: Removing call to %1").tqarg(j.full())); calls_.remove(j.full()); } @@ -340,7 +340,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza) if (doc.documentElement().tagName() == "presence") { Jid from = Jid(doc.documentElement().attribute("from")); TQString type = doc.documentElement().attribute("type"); - if (type == "unavailable" && calls_.contains(from.full())) { + if (type == "unavailable" && calls_.tqcontains(from.full())) { qDebug("JingleVoiceCaller: User went offline without closing a call."); removeCall(from); emit terminated(from); @@ -363,7 +363,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza) // Spread the word if (ok) { - qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").arg(stanza)); + qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").tqarg(stanza)); buzz::XmlElement *e = buzz::XmlElement::ForStr(stanza.ascii()); phone_client_->OnIncomingStanza(e); } diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.h b/kopete/protocols/jabber/jingle/jinglevoicecaller.h index 50070289..e29eaf16 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.h +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.h @@ -31,6 +31,7 @@ class JingleCallSlots; class JingleVoiceCaller : public VoiceCaller { Q_OBJECT + TQ_OBJECT friend class JingleClientSlots; diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index 91fa1a77..3f3bd6ca 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -15,7 +15,7 @@ ************************************************************************* */ -// libjingle before everything else to not clash with Qt +// libjingle before everything else to not clash with TQt #define POSIX #include "talk/xmpp/constants.h" #include "talk/base/sigslot.h" @@ -38,7 +38,7 @@ #include "jinglevoicesession.h" #include "jinglesessionmanager.h" -// Qt includes +// TQt includes #include <tqdom.h> // KDE includes @@ -68,14 +68,14 @@ static bool hasPeer(const JingleVoiceSession::JidList &jidList, const XMPP::Jid //BEGIN SlotsProxy /** * This class is used to receive signals from libjingle, - * which is are not compatible with Qt signals. + * which is are not compatible with TQt signals. * So it's a proxy between JingeVoiceSession(qt)<->linjingle class. */ class JingleVoiceSession::SlotsProxy : public sigslot::has_slots<> { public: - SlotsProxy(JingleVoiceSession *parent) - : voiceSession(parent) + SlotsProxy(JingleVoiceSession *tqparent) + : voiceSession(tqparent) {} void OnCallCreated(cricket::Call* call) @@ -93,7 +93,7 @@ public: XMPP::Jid jid(session->remote_address().c_str()); // Do nothing if the session do not contain a peers. - //if( !voiceSession->peers().contains(jid) ) + //if( !voiceSession->peers().tqcontains(jid) ) if( !hasPeer(voiceSession->peers(), jid) ) return; @@ -115,7 +115,7 @@ public: {} else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); + //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) {} @@ -142,8 +142,8 @@ public: void OnSendingStanza(cricket::SessionClient*, const buzz::XmlElement *buzzStanza) { TQString irisStanza(buzzStanza->Str().c_str()); - irisStanza.replace("cli:iq","iq"); - irisStanza.replace(":cli=","="); + irisStanza.tqreplace("cli:iq","iq"); + irisStanza.tqreplace(":cli=","="); voiceSession->sendStanza(irisStanza); } @@ -152,30 +152,30 @@ private: }; //END SlotsProxy -//BEGIN JingleIQResponder -class JingleVoiceSession::JingleIQResponder : public XMPP::Task +//BEGIN JingleITQResponder +class JingleVoiceSession::JingleITQResponder : public XMPP::Task { public: - JingleIQResponder(XMPP::Task *); - ~JingleIQResponder(); + JingleITQResponder(XMPP::Task *); + ~JingleITQResponder(); bool take(const TQDomElement &); }; /** - * \class JingleIQResponder + * \class JingleITQResponder * \brief A task that responds to jingle candidate queries with an empty reply. */ -JingleVoiceSession::JingleIQResponder::JingleIQResponder(Task *parent) :Task(parent) +JingleVoiceSession::JingleITQResponder::JingleITQResponder(Task *tqparent) :Task(tqparent) { } -JingleVoiceSession::JingleIQResponder::~JingleIQResponder() +JingleVoiceSession::JingleITQResponder::~JingleITQResponder() { } -bool JingleVoiceSession::JingleIQResponder::take(const TQDomElement &e) +bool JingleVoiceSession::JingleITQResponder::take(const TQDomElement &e) { if(e.tagName() != "iq") return false; @@ -189,7 +189,7 @@ bool JingleVoiceSession::JingleIQResponder::take(const TQDomElement &e) return false; } -//END JingleIQResponder +//END JingleITQResponder class JingleVoiceSession::Private { @@ -226,7 +226,7 @@ JingleVoiceSession::JingleVoiceSession(JabberAccount *account, const JidList &pe // Listen to incoming packets connect(account->client()->client(), TQT_SIGNAL(xmlIncoming(const TQString&)), this, TQT_SLOT(receiveStanza(const TQString&))); - new JingleIQResponder(account->client()->rootTask()); + new JingleITQResponder(account->client()->rootTask()); } JingleVoiceSession::~JingleVoiceSession() diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.h b/kopete/protocols/jabber/jingle/jinglevoicesession.h index 2769d351..0089a1bf 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.h @@ -38,6 +38,7 @@ class JingleSession; class JingleVoiceSession : public JingleSession { Q_OBJECT + TQ_OBJECT public: typedef TQValueList<XMPP::Jid> JidList; @@ -64,7 +65,7 @@ private: class SlotsProxy; SlotsProxy *slotsProxy; - class JingleIQResponder; + class JingleITQResponder; }; #endif diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index b017cdfd..d5086a1a 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -16,7 +16,7 @@ */ #include "jinglevoicesessiondialog.h" -// Qt includes +// TQt includes #include <tqlabel.h> #include <tqpixmap.h> #include <tqimage.h> @@ -40,11 +40,11 @@ using namespace XMPP; -JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *parent, const char *name) - : JingleVoiceSessionDialogBase(parent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) +JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *tqparent, const char *name) + : JingleVoiceSessionDialogBase(tqparent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) { TQString contactJid = m_peerJid.full(); - setCaption( i18n("Voice session with %1").arg(contactJid) ); + setCaption( i18n("Voice session with %1").tqarg(contactJid) ); connect(buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAcceptClicked())); connect(buttonDecline, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeclineClicked())); @@ -69,7 +69,7 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall setContactInformation( peerContact ); } - labelSessionStatus->setText( i18n("Incoming Session...") ); + labelSessiontqStatus->setText( i18n("Incoming Session...") ); buttonAccept->setEnabled(true); buttonDecline->setEnabled(true); } @@ -95,7 +95,7 @@ void JingleVoiceSessionDialog::setContactInformation(JabberContact *contact) void JingleVoiceSessionDialog::start() { - labelSessionStatus->setText( i18n("Waiting for other peer...") ); + labelSessiontqStatus->setText( i18n("Waiting for other peer...") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(true); @@ -106,7 +106,7 @@ void JingleVoiceSessionDialog::start() void JingleVoiceSessionDialog::slotAcceptClicked() { - labelSessionStatus->setText( i18n("Session accepted.") ); + labelSessiontqStatus->setText( i18n("Session accepted.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(true); @@ -118,7 +118,7 @@ void JingleVoiceSessionDialog::slotAcceptClicked() void JingleVoiceSessionDialog::slotDeclineClicked() { - labelSessionStatus->setText( i18n("Session declined.") ); + labelSessiontqStatus->setText( i18n("Session declined.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(false); @@ -131,7 +131,7 @@ void JingleVoiceSessionDialog::slotDeclineClicked() void JingleVoiceSessionDialog::slotTerminateClicked() { - labelSessionStatus->setText( i18n("Session terminated.") ); + labelSessiontqStatus->setText( i18n("Session terminated.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(false); @@ -147,7 +147,7 @@ void JingleVoiceSessionDialog::sessionStarted(const Jid &jid) { if( m_peerJid.compare(jid) ) { - labelSessionStatus->setText( i18n("Session in progress.") ); + labelSessiontqStatus->setText( i18n("Session in progress.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(true); @@ -159,7 +159,7 @@ void JingleVoiceSessionDialog::sessionAccepted(const Jid &jid) { if( m_peerJid.compare(jid) ) { - labelSessionStatus->setText( i18n("Session accepted.") ); + labelSessiontqStatus->setText( i18n("Session accepted.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(true); @@ -171,7 +171,7 @@ void JingleVoiceSessionDialog::sessionDeclined(const Jid &jid) { if( m_peerJid.compare(jid) ) { - labelSessionStatus->setText( i18n("Session declined.") ); + labelSessiontqStatus->setText( i18n("Session declined.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(false); @@ -183,7 +183,7 @@ void JingleVoiceSessionDialog::sessionTerminated(const Jid &jid) { if( m_peerJid.compare(jid) ) { - labelSessionStatus->setText( i18n("Session terminated.") ); + labelSessiontqStatus->setText( i18n("Session terminated.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(false); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h index 1a911bae..e782af03 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h @@ -30,10 +30,11 @@ class VoiceCaller; class JingleVoiceSessionDialog : public JingleVoiceSessionDialogBase { Q_OBJECT + TQ_OBJECT public: enum SessionState { Incoming, Waiting, Accepted, Declined, Started, Terminated }; - JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *parent = 0, const char *name = 0); + JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *tqparent = 0, const char *name = 0); ~JingleVoiceSessionDialog(); public slots: diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui index 0dc9ab35..c6349007 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>JingleVoiceSessionDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>JingleVoiceSessionDialogBase</cstring> </property> @@ -19,17 +19,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -45,14 +45,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -70,7 +70,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -79,9 +79,9 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -97,14 +97,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelContactPhoto</cstring> </property> @@ -116,7 +116,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>128</width> <height>128</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -145,9 +145,9 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -163,14 +163,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelDisplayName</cstring> </property> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -209,7 +209,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -230,9 +230,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -248,7 +248,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -298,7 +298,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -307,15 +307,15 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -323,9 +323,9 @@ <string>Current status:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> - <cstring>labelSessionStatus</cstring> + <cstring>labelSessiontqStatus</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -351,7 +351,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -360,7 +360,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp index 571f9ff6..f37bc6d6 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 *parent) - : Task(parent) +JingleWatchSessionTask::JingleWatchSessionTask(XMPP::Task *tqparent) + : Task(tqparent) {} JingleWatchSessionTask::~JingleWatchSessionTask() diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h index 09dbdbce..0b53280e 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h @@ -21,13 +21,14 @@ /** * This task watch for incoming Jingle session and notify manager. - * It is declared in the header to be "moc"-able. + * It is declared in the header to be "tqmoc"-able. */ class JingleWatchSessionTask : public XMPP::Task { Q_OBJECT + TQ_OBJECT public: - JingleWatchSessionTask(XMPP::Task *parent); + JingleWatchSessionTask(XMPP::Task *tqparent); ~JingleWatchSessionTask(); bool take(const TQDomElement &element); diff --git a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro index 53c8e293..8482614c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro +++ b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro @@ -88,7 +88,7 @@ SOURCES += \ $$JINGLE_CPP/talk/session/phone/linphonemediaengine.cc \ $$JINGLE_CPP/talk/session/phone/voicechannel.cc -#contains(DEFINES, HAVE_PORTAUDIO) { +#tqcontains(DEFINES, HAVE_PORTAUDIO) { # SOURCES += \ # $$JINGLE_CPP/talk/session/phone/portaudiomediaengine.cc #} @@ -128,11 +128,11 @@ SOURCES += \ $$JINGLE_CPP/talk/third_party/mediastreamer/mswrite.c \ $$JINGLE_CPP/talk/third_party/mediastreamer/sndcard.c -contains(DEFINES, HAVE_ALSA_ASOUNDLIB_H) { +tqcontains(DEFINES, HAVE_ALSA_ASOUNDLIB_H) { SOURCES += $$JINGLE_CPP/talk/third_party/mediastreamer/alsacard.c } -contains(DEFINES, HAVE_PORTAUDIO) { +tqcontains(DEFINES, HAVE_PORTAUDIO) { SOURCES += $$JINGLE_CPP/talk/third_party/mediastreamer/portaudiocard.c } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc index e0ec1b90..63130db3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc @@ -24,7 +24,7 @@ static const string::size_type np = string::npos; const string Base64::Base64Table( // 0000000000111111111122222222223333333333444444444455555555556666 // 0123456789012345678901234567890123456789012345678901234567890123 - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"); + "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"); // Decode Table gives the index of any valid base64 character in the Base64 table] // 65 == A, 97 == a, 48 == 0, 43 == +, 47 == / diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h index b21be2f1..5f191beb 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h @@ -178,8 +178,8 @@ inline void Assert(bool result, const char * function, const char * file, int li #endif // !ENABLE_DEBUG -#define COMPILE_TIME_ASSERT(expr) char CTA_UNIQUE_NAME[expr] -#define CTA_UNIQUE_NAME MAKE_NAME(__LINE__) +#define COMPILE_TIME_ASSERT(expr) char CTA_UNITQUE_NAME[expr] +#define CTA_UNITQUE_NAME MAKE_NAME(__LINE__) #define CTA_MAKE_NAME(line) MAKE_NAME2(line) #define CTA_MAKE_NAME2(line) constraint_ ## line diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc index f10489f7..38e22c2e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc @@ -66,7 +66,7 @@ void MessageQueueManager::Add(MessageQueue *message_queue) { void MessageQueueManager::Remove(MessageQueue *message_queue) { CritScope cs(&crit_); std::vector<MessageQueue *>::iterator iter; - iter = std::find(message_queues_.begin(), message_queues_.end(), message_queue); + iter = std::tqfind(message_queues_.begin(), message_queues_.end(), message_queue); if (iter != message_queues_.end()) message_queues_.erase(iter); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h index 9b35b9af..cf8917d9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __MESSAGEQUEUE_H__ -#define __MESSAGEQUEUE_H__ +#ifndef __MESSAGETQUEUE_H__ +#define __MESSAGETQUEUE_H__ #include "talk/base/basictypes.h" #include "talk/base/criticalsection.h" @@ -162,4 +162,4 @@ protected: } // namespace cricket -#endif // __MESSAGEQUEUE_H__ +#endif // __MESSAGETQUEUE_H__ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc index 21b3a08f..2ea7530f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc @@ -60,7 +60,7 @@ const double kLog2 = 0.693147180559945309417; const double kLambda = kLog2 / kHalfLife; // assume so-so quality unless data says otherwise -const double kDefaultQuality = cricket::QUALITY_FAIR; +const double kDefaultQuality = cricket::TQUALITY_FAIR; typedef std::map<std::string,std::string> StrMap; @@ -261,7 +261,7 @@ void NetworkManager::GetNetworks(std::vector<Network*>& result) { CreateNetworks(list); for (uint32 i = 0; i < list.size(); ++i) { - NetworkMap::iterator iter = networks_.find(list[i]->name()); + NetworkMap::iterator iter = networks_.tqfind(list[i]->name()); Network* network; if (iter == networks_.end()) { @@ -313,12 +313,12 @@ Network::Network(const std::string& name, uint32 ip) } void Network::StartSession(NetworkSession* session) { - assert(std::find(sessions_.begin(), sessions_.end(), session) == sessions_.end()); + assert(std::tqfind(sessions_.begin(), sessions_.end(), session) == sessions_.end()); sessions_.push_back(session); } void Network::StopSession(NetworkSession* session) { - SessionList::iterator iter = std::find(sessions_.begin(), sessions_.end(), session); + SessionList::iterator iter = std::tqfind(sessions_.begin(), sessions_.end(), session); if (iter != sessions_.end()) sessions_.erase(iter); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.h index 2cc9128a..5f7d7216 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.h @@ -127,9 +127,9 @@ public: }; -const double QUALITY_BAD = 3.0; -const double QUALITY_FAIR = 3.35; -const double QUALITY_GOOD = 3.7; +const double TQUALITY_BAD = 3.0; +const double TQUALITY_FAIR = 3.35; +const double TQUALITY_GOOD = 3.7; } // namespace cricket diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h index 446516b8..b621185b 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h @@ -5,7 +5,7 @@ // License: Public domain. You are free to use this code however you like, with the proviso that // the author takes on no responsibility or liability for any use. // -// QUICK DOCUMENTATION +// TQUICK DOCUMENTATION // // (see also the full documentation at http://sigslot.sourceforge.net/) // diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socket.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/socket.h index d4a49d96..7c240802 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socket.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socket.h @@ -84,7 +84,7 @@ #define ENOTEMPTY WSAENOTEMPTY #define EPROCLIM WSAEPROCLIM #define EUSERS WSAEUSERS -#define EDQUOT WSAEDQUOT +#define EDTQUOT WSAEDTQUOT #define ESTALE WSAESTALE #define EREMOTE WSAEREMOTE #undef EACCES diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc index f57043e3..5cdc4743 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc @@ -353,7 +353,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, std::string A2 = method + ":" + uri; std::string middle; - if (args.find("qop") != args.end()) { + if (args.tqfind("qop") != args.end()) { args["qop"] = "auth"; middle = args["nonce"] + ":" + ncount + ":" + cnonce + ":" + args["qop"]; } else { @@ -375,13 +375,13 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, ss << ", realm=" << Quote(args["realm"]); ss << ", nonce=" << Quote(args["nonce"]); ss << ", uri=" << Quote(uri); - if (args.find("qop") != args.end()) { + if (args.tqfind("qop") != args.end()) { ss << ", qop=" << args["qop"]; ss << ", nc=" << ncount; ss << ", cnonce=" << Quote(cnonce); } ss << ", response=\"" << dig_response << "\""; - if (args.find("opaque") != args.end()) { + if (args.tqfind("opaque") != args.end()) { ss << ", opaque=" << Quote(args["opaque"]); } response = ss.str(); @@ -418,14 +418,14 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, out_buf_desc.pBuffers = &out_sec; const ULONG NEG_FLAGS_DEFAULT = - //ISC_REQ_ALLOCATE_MEMORY - ISC_REQ_CONFIDENTIALITY - //| ISC_REQ_EXTENDED_ERROR - //| ISC_REQ_INTEGRITY - | ISC_REQ_REPLAY_DETECT - | ISC_REQ_SEQUENCE_DETECT - //| ISC_REQ_STREAM - //| ISC_REQ_USE_SUPPLIED_CREDS + //ISC_RETQ_ALLOCATE_MEMORY + ISC_RETQ_CONFIDENTIALITY + //| ISC_RETQ_EXTENDED_ERROR + //| ISC_RETQ_INTEGRITY + | ISC_RETQ_REPLAY_DETECT + | ISC_RETQ_SEQUENCE_DETECT + //| ISC_RETQ_STREAM + //| ISC_RETQ_USE_SUPPLIED_CREDS ; TimeStamp lifetime; @@ -483,7 +483,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, size_t len = password.GetLength()+1; char * sensitive = new char[len]; password.CopyTo(sensitive, true); - std::string::size_type pos = username.find('\\'); + std::string::size_type pos = username.tqfind('\\'); if (pos == std::string::npos) { auth_id.UserLength = static_cast<unsigned long>( _min(sizeof(userbuf) - 1, username.size())); @@ -1100,7 +1100,7 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) { const char * direction = (input ? " << " : " >> "); std::string str(data, len); while (!str.empty()) { - std::string::size_type pos = str.find('\n'); + std::string::size_type pos = str.tqfind('\n'); std::string substr = str; if (pos == std::string::npos) { substr = str; @@ -1114,9 +1114,9 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) { } // Filter out any private data - std::string::size_type pos_private = substr.find("Email"); + std::string::size_type pos_private = substr.tqfind("Email"); if (pos_private == std::string::npos) { - pos_private = substr.find("Passwd"); + pos_private = substr.tqfind("Passwd"); } if (pos_private == std::string::npos) { LOG(level_) << label_ << direction << substr; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc index a5a94941..41ae9068 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 * parent) : +Task::Task(Task * tqparent) : state_(STATE_INIT), - parent_(parent), + tqparent_(tqparent), blocked_(false), done_(false), aborted_(false), @@ -42,9 +42,9 @@ Task::Task(Task * parent) : error_(false), child_error_(false), start_time_(0) { - runner_ = ((parent == NULL) ? (TaskRunner *)this : parent->GetRunner()); - if (parent_ != NULL) { - parent_->AddChild(this); + runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner()); + if (tqparent_ != NULL) { + tqparent_->AddChild(this); } } @@ -194,12 +194,12 @@ int Task::Process(int state) { void Task::AddChild(Task * child) { - children_.insert(child); + tqchildren_.insert(child); } bool Task::AllChildrenDone() { - for (ChildSet::iterator it = children_.begin(); it != children_.end(); ++it) { + for (ChildSet::iterator it = tqchildren_.begin(); it != tqchildren_.end(); ++it) { if (!(*it)->IsDone()) return false; } @@ -213,8 +213,8 @@ Task::AnyChildError() { void Task::AbortAllChildren() { - if (children_.size() > 0) { - ChildSet copy = children_; + if (tqchildren_.size() > 0) { + ChildSet copy = tqchildren_; for (ChildSet::iterator it = copy.begin(); it != copy.end(); ++it) { (*it)->Abort(true); // Note we do not wake } @@ -224,14 +224,14 @@ Task::AbortAllChildren() { void Task::Stop() { AbortAllChildren(); // No need to wake because we're either awake or in abort - parent_->OnChildStopped(this); + tqparent_->OnChildStopped(this); } void Task::OnChildStopped(Task * child) { if (child->HasError()) child_error_ = true; - children_.erase(child); + tqchildren_.erase(child); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h index 5a486198..553d04fb 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h @@ -61,13 +61,13 @@ // 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 parent tasks and children. If a parent -// task gets aborted, all the children tasks are too. The nice thing -// about this, for example, is if you have one parent task that +// (3) Finally it helps manage tqparent tasks and tqchildren. If a tqparent +// task gets aborted, all the tqchildren tasks are too. The nice thing +// about this, for example, is if you have one tqparent 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 parent task goes to STATE_DONE, the task engine will make -// sure all those children are aborted and get deleted. +// When the tqparent 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 * parent); + Task(Task * tqparent); virtual ~Task() {} void Start(); @@ -115,14 +115,14 @@ public: unsigned long long ElapsedTime(); virtual void Poll() {} - Task * GetParent() { return parent_; } + Task * GetParent() { return tqparent_; } TaskRunner * GetRunner() { return runner_; } - virtual Task * GetParent(int code) { return parent_->GetParent(code); } + virtual Task * GetParent(int code) { return tqparent_->GetParent(code); } // Called from outside to stop task without any more callbacks void Abort(bool nowake = false); - // For managing children + // For managing tqchildren bool AllChildrenDone(); bool AnyChildError(); @@ -153,7 +153,7 @@ protected: virtual int ProcessStart() = 0; virtual int ProcessResponse() { return STATE_DONE; } - // for managing children (if any) + // for managing tqchildren (if any) void AddChild(Task * child); void AbortAllChildren(); @@ -162,7 +162,7 @@ private: void OnChildStopped(Task * child); int state_; - Task * parent_; + Task * tqparent_; TaskRunner * runner_; bool blocked_; bool done_; @@ -172,9 +172,9 @@ private: bool child_error_; unsigned long long start_time_; - // for managing children + // for managing tqchildren typedef std::set<Task *> ChildSet; - ChildSet children_; + ChildSet tqchildren_; }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc index b5ecc55e..43728eb7 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc @@ -33,7 +33,7 @@ namespace buzz { TaskRunner::~TaskRunner() { - // this kills and deletes children silently! + // this kills and deletes tqchildren silently! AbortAllChildren(); RunTasks(); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc index 6d818932..e781b03d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc @@ -188,13 +188,13 @@ private: CallClient* call_client_; }; -const char* DescribeStatus(buzz::Status::Show show, const std::string& desc) { +const char* DescribetqStatus(buzz::tqStatus::Show show, const std::string& desc) { switch (show) { - case buzz::Status::SHOW_XA: return desc.c_str(); - case buzz::Status::SHOW_ONLINE: return "online"; - case buzz::Status::SHOW_AWAY: return "away"; - case buzz::Status::SHOW_DND: return "do not disturb"; - case buzz::Status::SHOW_CHAT: return "ready to chat"; + case buzz::tqStatus::SHOW_XA: return desc.c_str(); + case buzz::tqStatus::SHOW_ONLINE: return "online"; + case buzz::tqStatus::SHOW_AWAY: return "away"; + case buzz::tqStatus::SHOW_DND: return "do not disturb"; + case buzz::tqStatus::SHOW_CHAT: return "ready to chat"; delault: return "offline"; } } @@ -320,11 +320,11 @@ void CallClient::InitPresence() { this, &CallClient::OnStatusUpdate); presence_push_->Start(); - buzz::Status my_status; + buzz::tqStatus my_status; my_status.set_jid(xmpp_client_->jid()); my_status.set_available(true); my_status.set_invisible(false); - my_status.set_show(buzz::Status::SHOW_ONLINE); + my_status.set_show(buzz::tqStatus::SHOW_ONLINE); my_status.set_priority(0); my_status.set_know_capabilities(true); my_status.set_phone_capability(true); @@ -337,7 +337,7 @@ void CallClient::InitPresence() { presence_out_->Start(); } -void CallClient::OnStatusUpdate(const buzz::Status& status) { +void CallClient::OnStatusUpdate(const buzz::tqStatus& status) { RosterItem item; item.jid = status.jid(); item.show = status.show(); @@ -350,19 +350,19 @@ void CallClient::OnStatusUpdate(const buzz::Status& status) { (*roster_)[key] = item; } else { Console()->Printf("Removing from roster: %s", key.c_str()); - RosterMap::iterator iter = roster_->find(key); + RosterMap::iterator iter = roster_->tqfind(key); if (iter != roster_->end()) roster_->erase(iter); } } void CallClient::PrintRoster() { - Console()->Printf("Roster contains %d callable", roster_->size()); + Console()->Printf("Roster tqcontains %d callable", roster_->size()); RosterMap::iterator iter = roster_->begin(); while (iter != roster_->end()) { Console()->Printf("%s - %s", iter->second.jid.BareJid().Str().c_str(), - DescribeStatus(iter->second.show, iter->second.status)); + DescribetqStatus(iter->second.show, iter->second.status)); iter++; } } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h index d35a6114..24ce1545 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h @@ -29,7 +29,7 @@ namespace buzz { class PresencePushTask; -class Status; +class tqStatus; } namespace cricket { @@ -43,7 +43,7 @@ class Call; struct RosterItem { buzz::Jid jid; - buzz::Status::Show show; + buzz::tqStatus::Show show; std::string status; }; @@ -82,7 +82,7 @@ private: void OnSendStanza(cricket::SessionClient *client, const buzz::XmlElement* stanza); void InitPresence(); - void OnStatusUpdate(const buzz::Status& status); + void OnStatusUpdate(const buzz::tqStatus& status); }; #endif // CRICKET_EXAMPLES_CALL_CALLCLIENT_H__ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc index a55af89e..7fd68120 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc @@ -42,33 +42,33 @@ bool ToString(const T &t, return !oss.fail(); } -XmppReturnStatus -PresenceOutTask::Send(const Status & s) { +XmppReturntqStatus +PresenceOutTask::Send(const tqStatus & s) { if (GetState() != STATE_INIT) return XMPP_RETURN_BADSTATE; - stanza_.reset(TranslateStatus(s)); + stanza_.reset(TranslatetqStatus(s)); return XMPP_RETURN_OK; } -XmppReturnStatus -PresenceOutTask::SendDirected(const Jid & j, const Status & s) { +XmppReturntqStatus +PresenceOutTask::SendDirected(const Jid & j, const tqStatus & s) { if (GetState() != STATE_INIT) return XMPP_RETURN_BADSTATE; - XmlElement * presence = TranslateStatus(s); - presence->AddAttr(QN_TO, j.Str()); + XmlElement * presence = TranslatetqStatus(s); + presence->AddAttr(TQN_TO, j.Str()); stanza_.reset(presence); return XMPP_RETURN_OK; } -XmppReturnStatus PresenceOutTask::SendProbe(const Jid & jid) { +XmppReturntqStatus PresenceOutTask::SendProbe(const Jid & jid) { if (GetState() != STATE_INIT) return XMPP_RETURN_BADSTATE; - XmlElement * presence = new XmlElement(QN_PRESENCE); - presence->AddAttr(QN_TO, jid.Str()); - presence->AddAttr(QN_TYPE, "probe"); + XmlElement * presence = new XmlElement(TQN_PRESENCE); + presence->AddAttr(TQN_TO, jid.Str()); + presence->AddAttr(TQN_TYPE, "probe"); stanza_.reset(presence); return XMPP_RETURN_OK; @@ -82,48 +82,48 @@ PresenceOutTask::ProcessStart() { } XmlElement * -PresenceOutTask::TranslateStatus(const Status & s) { - XmlElement * result = new XmlElement(QN_PRESENCE); +PresenceOutTask::TranslatetqStatus(const tqStatus & s) { + XmlElement * result = new XmlElement(TQN_PRESENCE); if (!s.available()) { - result->AddAttr(QN_TYPE, STR_UNAVAILABLE); + result->AddAttr(TQN_TYPE, STR_UNAVAILABLE); } else { if (s.invisible()) { - result->AddAttr(QN_TYPE, STR_INVISIBLE); + result->AddAttr(TQN_TYPE, STR_INVISIBLE); } - if (s.show() != Status::SHOW_ONLINE && s.show() != Status::SHOW_OFFLINE) { - result->AddElement(new XmlElement(QN_SHOW)); + if (s.show() != tqStatus::SHOW_ONLINE && s.show() != tqStatus::SHOW_OFFLINE) { + result->AddElement(new XmlElement(TQN_SHOW)); switch (s.show()) { default: result->AddText(STR_SHOW_AWAY, 1); break; - case Status::SHOW_XA: + case tqStatus::SHOW_XA: result->AddText(STR_SHOW_XA, 1); break; - case Status::SHOW_DND: + case tqStatus::SHOW_DND: result->AddText(STR_SHOW_DND, 1); break; - case Status::SHOW_CHAT: + case tqStatus::SHOW_CHAT: result->AddText(STR_SHOW_CHAT, 1); break; } } - result->AddElement(new XmlElement(QN_STATUS)); + result->AddElement(new XmlElement(TQN_STATUS)); result->AddText(s.status(), 1); std::string pri; ToString(s.priority(), &pri); - result->AddElement(new XmlElement(QN_PRIORITY)); + result->AddElement(new XmlElement(TQN_PRIORITY)); result->AddText(pri, 1); if (s.know_capabilities() && s.is_google_client()) { - result->AddElement(new XmlElement(QN_CAPS_C, true)); - result->AddAttr(QN_NODE, GOOGLE_CLIENT_NODE, 1); - result->AddAttr(QN_VER, s.version(), 1); - result->AddAttr(QN_EXT, s.phone_capability() ? "voice-v1" : "", 1); + result->AddElement(new XmlElement(TQN_CAPS_C, true)); + result->AddAttr(TQN_NODE, GOOGLE_CLIENT_NODE, 1); + result->AddAttr(TQN_VER, s.version(), 1); + result->AddAttr(TQN_EXT, s.phone_capability() ? "voice-v1" : "", 1); } // Put the delay mark on the presence according to JEP-0091 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 2b65a553..7307a522 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h @@ -28,16 +28,16 @@ namespace buzz { class PresenceOutTask : public XmppTask { public: - PresenceOutTask(Task * parent) : XmppTask(parent) {} + PresenceOutTask(Task * tqparent) : XmppTask(tqparent) {} virtual ~PresenceOutTask() {} - XmppReturnStatus Send(const Status & s); - XmppReturnStatus SendDirected(const Jid & j, const Status & s); - XmppReturnStatus SendProbe(const Jid& jid); + XmppReturntqStatus Send(const tqStatus & s); + XmppReturntqStatus SendDirected(const Jid & j, const tqStatus & s); + XmppReturntqStatus SendProbe(const Jid& jid); virtual int ProcessStart(); private: - XmlElement * TranslateStatus(const Status & s); + XmlElement * TranslatetqStatus(const tqStatus & s); scoped_ptr<XmlElement> stanza_; }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc index 03f6c6c1..ee14fe94 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc @@ -48,7 +48,7 @@ IsXmlSpace(int ch) { static bool ListContainsToken(const std::string & list, const std::string & token) { - size_t i = list.find(token); + size_t i = list.tqfind(token); if (i == std::string::npos || token.empty()) return false; bool boundary_before = (i == 0 || IsXmlSpace(list[i - 1])); @@ -59,9 +59,9 @@ ListContainsToken(const std::string & list, const std::string & token) { bool PresencePushTask::HandleStanza(const XmlElement * stanza) { - if (stanza->Name() != QN_PRESENCE) + if (stanza->Name() != TQN_PRESENCE) return false; - if (stanza->HasAttr(QN_TYPE) && stanza->Attr(QN_TYPE) != STR_UNAVAILABLE) + if (stanza->HasAttr(TQN_TYPE) && stanza->Attr(TQN_TYPE) != STR_UNAVAILABLE) return false; QueueStanza(stanza); return true; @@ -77,17 +77,17 @@ PresencePushTask::ProcessStart() { const XmlElement * stanza = NextStanza(); if (stanza == NULL) return STATE_BLOCKED; - Status s; + tqStatus s; - s.set_jid(Jid(stanza->Attr(QN_FROM))); + s.set_jid(Jid(stanza->Attr(TQN_FROM))); - if (stanza->Attr(QN_TYPE) == STR_UNAVAILABLE) { + if (stanza->Attr(TQN_TYPE) == STR_UNAVAILABLE) { s.set_available(false); SignalStatusUpdate(s); } else { s.set_available(true); - const XmlElement * status = stanza->FirstNamed(QN_STATUS); + const XmlElement * status = stanza->FirstNamed(TQN_STATUS); if (status != NULL) { s.set_status(status->BodyText()); @@ -104,7 +104,7 @@ PresencePushTask::ProcessStart() { } } - const XmlElement * priority = stanza->FirstNamed(QN_PRIORITY); + const XmlElement * priority = stanza->FirstNamed(TQN_PRIORITY); if (priority != NULL) { int pri; if (FromString(priority->BodyText(), &pri)) { @@ -112,33 +112,33 @@ PresencePushTask::ProcessStart() { } } - const XmlElement * show = stanza->FirstNamed(QN_SHOW); + const XmlElement * show = stanza->FirstNamed(TQN_SHOW); if (show == NULL || show->FirstChild() == NULL) { - s.set_show(Status::SHOW_ONLINE); + s.set_show(tqStatus::SHOW_ONLINE); } else { if (show->BodyText() == "away") { - s.set_show(Status::SHOW_AWAY); + s.set_show(tqStatus::SHOW_AWAY); } else if (show->BodyText() == "xa") { - s.set_show(Status::SHOW_XA); + s.set_show(tqStatus::SHOW_XA); } else if (show->BodyText() == "dnd") { - s.set_show(Status::SHOW_DND); + s.set_show(tqStatus::SHOW_DND); } else if (show->BodyText() == "chat") { - s.set_show(Status::SHOW_CHAT); + s.set_show(tqStatus::SHOW_CHAT); } else { - s.set_show(Status::SHOW_ONLINE); + s.set_show(tqStatus::SHOW_ONLINE); } } - const XmlElement * caps = stanza->FirstNamed(QN_CAPS_C); + const XmlElement * caps = stanza->FirstNamed(TQN_CAPS_C); if (caps != NULL) { - std::string node = caps->Attr(QN_NODE); - std::string ver = caps->Attr(QN_VER); - std::string exts = caps->Attr(QN_EXT); + std::string node = caps->Attr(TQN_NODE); + std::string ver = caps->Attr(TQN_VER); + std::string exts = caps->Attr(TQN_EXT); s.set_know_capabilities(true); 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 77459647..2ed5ac46 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h @@ -30,9 +30,9 @@ namespace buzz { class PresencePushTask : public XmppTask { public: - PresencePushTask(Task * parent) : XmppTask(parent, XmppEngine::HL_TYPE) {} + PresencePushTask(Task * tqparent) : XmppTask(tqparent, XmppEngine::HL_TYPE) {} virtual int ProcessStart(); - sigslot::signal1<const Status &>SignalStatusUpdate; + sigslot::signal1<const tqStatus &>SignalStatusUpdate; protected: virtual bool HandleStanza(const XmlElement * stanza); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h index cab9312f..0677932b 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h @@ -26,9 +26,9 @@ namespace buzz { -class Status { +class tqStatus { public: - Status() : + tqStatus() : pri_(0), show_(SHOW_NONE), available_(false), @@ -39,7 +39,7 @@ public: is_google_client_(false), feedback_probation_(false) {}; - ~Status() {} + ~tqStatus() {} // These are arranged in "priority order", i.e., if we see // two statuses at the same priority but with different Shows, @@ -86,7 +86,7 @@ public: void set_feedback_probation(bool f) { feedback_probation_ = f; } void set_sent_time(const std::string& time) { sent_time_ = time; } - void UpdateWith(const Status & new_value) { + void UpdateWith(const tqStatus & new_value) { if (!new_value.know_capabilities()) { bool k = know_capabilities(); bool i = is_google_client(); @@ -105,36 +105,36 @@ public: } } - bool HasQuietStatus() const { + bool HasQuiettqStatus() const { if (status_.empty()) return false; - return !(QuietStatus().empty()); + return !(QuiettqStatus().empty()); } // Knowledge of other clients' silly automatic status strings - // Don't show these. - std::string QuietStatus() const { - if (jid_.resource().find("Psi") != std::string::npos) { + std::string QuiettqStatus() const { + if (jid_.resource().tqfind("Psi") != std::string::npos) { if (status_ == "Online" || - status_.find("Auto Status") != std::string::npos) + status_.tqfind("Auto tqStatus") != std::string::npos) return STR_EMPTY; } - if (jid_.resource().find("Gaim") != std::string::npos) { + if (jid_.resource().tqfind("Gaim") != std::string::npos) { if (status_ == "Sorry, I ran out for a bit!") return STR_EMPTY; } - return TrimStatus(status_); + return TrimtqStatus(status_); } - std::string ExplicitStatus() const { - std::string result = QuietStatus(); + std::string ExplicittqStatus() const { + std::string result = QuiettqStatus(); if (result.empty()) { - result = ShowStatus(); + result = ShowtqStatus(); } return result; } - std::string ShowStatus() const { + std::string ShowtqStatus() const { std::string result; if (!available()) { result = "Offline"; @@ -159,7 +159,7 @@ public: return result; } - static std::string TrimStatus(const std::string & st) { + static std::string TrimtqStatus(const std::string & st) { std::string s(st); int j = 0; bool collapsing = true; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc index 66191f12..492559ae 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc @@ -55,12 +55,12 @@ std::string XmppAuth::ChooseBestSaslMechanism( std::vector<std::string>::const_iterator it; // a token is the weakest auth - 15s, service-limited, so prefer it. - it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN"); + it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN"); if (it != mechanisms.end()) return "X-GOOGLE-TOKEN"; // a cookie is the next weakest - 14 days - it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE"); + it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE"); if (it != mechanisms.end()) return "X-GOOGLE-COOKIE"; @@ -70,7 +70,7 @@ std::string XmppAuth::ChooseBestSaslMechanism( // as a last resort, use plain authentication if (jid_.domain() != "google.com") { - it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN"); + it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN"); if (it != mechanisms.end()) return "PLAIN"; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc index 7d966fb3..40e694e2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc @@ -68,6 +68,6 @@ void XmppPump::OnMessage(cricket::Message *pmsg) { RunTasks(); } -buzz::XmppReturnStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) { +buzz::XmppReturntqStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) { return client_->SendStanza(stanza); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h index fd6f88bb..0314b2fd 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h @@ -62,7 +62,7 @@ public: void OnMessage(cricket::Message *pmsg); - buzz::XmppReturnStatus SendStanza(const buzz::XmlElement *stanza); + buzz::XmppReturntqStatus SendStanza(const buzz::XmlElement *stanza); private: buzz::XmppClient *client_; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc index eb53efeb..d07e2e5d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc @@ -381,7 +381,7 @@ bool P2PSocket::CreateConnections(const Candidate &remote_candidate, } if ((origin_port != NULL) && - find(ports_.begin(), ports_.end(), origin_port) == ports_.end()) { + tqfind(ports_.begin(), ports_.end(), origin_port) == ports_.end()) { if (CreateConnection(origin_port, remote_candidate, origin_port, readable)) created = true; } @@ -783,7 +783,7 @@ void P2PSocket::OnConnectionDestroyed(Connection *connection) { // Remove this connection from the list. std::vector<Connection*>::iterator iter = - find(connections_.begin(), connections_.end(), connection); + tqfind(connections_.begin(), connections_.end(), connection); assert(iter != connections_.end()); connections_.erase(iter); @@ -807,7 +807,7 @@ void P2PSocket::OnPortDestroyed(Port* port) { assert(worker_thread_ == Thread::Current()); // Remove this port from the list (if we didn't drop it already). - std::vector<Port*>::iterator iter = find(ports_.begin(), ports_.end(), port); + std::vector<Port*>::iterator iter = tqfind(ports_.begin(), ports_.end(), port); if (iter != ports_.end()) ports_.erase(iter); @@ -843,7 +843,7 @@ const std::vector<Connection *>& P2PSocket::connections() { // Set options on ourselves is simply setting options on all of our available // port objects. int P2PSocket::SetOption(Socket::Option opt, int value) { - OptionMap::iterator it = options_.find(opt); + OptionMap::iterator it = options_.tqfind(opt); if (it == options_.end()) { options_.insert(std::make_pair(opt, value)); } else if (it->second == value) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc index 14549b5b..c9272597 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc @@ -171,7 +171,7 @@ Port::~Port() { } Connection* Port::GetConnection(const SocketAddress& remote_addr) { - AddressMap::const_iterator iter = connections_.find(remote_addr); + AddressMap::const_iterator iter = connections_.tqfind(remote_addr); if (iter != connections_.end()) return iter->second; else @@ -449,7 +449,7 @@ void Port::Start() { } void Port::OnConnectionDestroyed(Connection* conn) { - AddressMap::iterator iter = connections_.find(conn->remote_candidate().address()); + AddressMap::iterator iter = connections_.tqfind(conn->remote_candidate().address()); assert(iter != connections_.end()); connections_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc index bb52a1d5..002033dc 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc @@ -105,14 +105,14 @@ RelayServer::~RelayServer() { void RelayServer::AddInternalSocket(AsyncPacketSocket* socket) { assert(internal_sockets_.end() == - std::find(internal_sockets_.begin(), internal_sockets_.end(), socket)); + std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket)); internal_sockets_.push_back(socket); socket->SignalReadPacket.connect(this, &RelayServer::OnInternalPacket); } void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) { SocketList::iterator iter = - std::find(internal_sockets_.begin(), internal_sockets_.end(), socket); + std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket); assert(iter != internal_sockets_.end()); internal_sockets_.erase(iter); socket->SignalReadPacket.disconnect(this); @@ -120,14 +120,14 @@ void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) { void RelayServer::AddExternalSocket(AsyncPacketSocket* socket) { assert(external_sockets_.end() == - std::find(external_sockets_.begin(), external_sockets_.end(), socket)); + std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket)); external_sockets_.push_back(socket); socket->SignalReadPacket.connect(this, &RelayServer::OnExternalPacket); } void RelayServer::RemoveExternalSocket(AsyncPacketSocket* socket) { SocketList::iterator iter = - std::find(external_sockets_.begin(), external_sockets_.end(), socket); + std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket); assert(iter != external_sockets_.end()); external_sockets_.erase(iter); socket->SignalReadPacket.disconnect(this); @@ -143,7 +143,7 @@ void RelayServer::OnInternalPacket( // If this did not come from an existing connection, it should be a STUN // allocate request. - ConnectionMap::iterator piter = connections_.find(ap); + ConnectionMap::iterator piter = connections_.tqfind(ap); if (piter == connections_.end()) { HandleStunAllocate(bytes, size, ap, socket); return; @@ -186,7 +186,7 @@ void RelayServer::OnExternalPacket( assert(!ap.destination().IsAny()); // If this connection already exists, then forward the traffic. - ConnectionMap::iterator piter = connections_.find(ap); + ConnectionMap::iterator piter = connections_.tqfind(ap); if (piter != connections_.end()) { // TODO: Check the HMAC. RelayServerConnection* ext_conn = piter->second; @@ -220,7 +220,7 @@ void RelayServer::OnExternalPacket( // TODO: Check the HMAC. // The binding should already be present. - BindingMap::iterator biter = bindings_.find(username); + BindingMap::iterator biter = bindings_.tqfind(username); if (biter == bindings_.end()) { // TODO: Turn this back on. This is the sign of a client bug. //std::cerr << "Dropping packet: no binding with username" << std::endl; @@ -299,7 +299,7 @@ void RelayServer::HandleStunAllocate( RelayServerBinding* binding; - BindingMap::iterator biter = bindings_.find(username); + BindingMap::iterator biter = bindings_.tqfind(username); if (biter != bindings_.end()) { binding = biter->second; @@ -453,18 +453,18 @@ void RelayServer::HandleStunSend( } void RelayServer::AddConnection(RelayServerConnection* conn) { - assert(connections_.find(conn->addr_pair()) == connections_.end()); + assert(connections_.tqfind(conn->addr_pair()) == connections_.end()); connections_[conn->addr_pair()] = conn; } void RelayServer::RemoveConnection(RelayServerConnection* conn) { - ConnectionMap::iterator iter = connections_.find(conn->addr_pair()); + ConnectionMap::iterator iter = connections_.tqfind(conn->addr_pair()); assert(iter != connections_.end()); connections_.erase(iter); } void RelayServer::RemoveBinding(RelayServerBinding* binding) { - BindingMap::iterator iter = bindings_.find(binding->username()); + BindingMap::iterator iter = bindings_.tqfind(binding->username()); assert(iter != bindings_.end()); bindings_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc index 4c1c09d9..d146d63c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc @@ -63,7 +63,7 @@ Session *SessionManager::CreateSession(const std::string &name, const SessionID& void SessionManager::DestroySession(Session *session) { if (session != NULL) { - std::map<SessionID, Session *>::iterator it = session_map_.find(session->id()); + std::map<SessionID, Session *>::iterator it = session_map_.tqfind(session->id()); if (it != session_map_.end()) { SignalSessionDestroy(session); session_map_.erase(it); @@ -74,7 +74,7 @@ void SessionManager::DestroySession(Session *session) { Session *SessionManager::GetSession(const SessionID& id) { // If the id isn't present, the [] operator will make a NULL entry - std::map<SessionID, Session *>::iterator it = session_map_.find(id); + std::map<SessionID, Session *>::iterator it = session_map_.tqfind(id); if (it != session_map_.end()) return (*it).second; return NULL; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc index 2f0d67b8..e0257451 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc @@ -109,7 +109,7 @@ void SocketManager::DestroySocket_w(P2PSocket *socket) { // Only if socket exists CritScope cs(&critSM_); std::vector<P2PSocket *>::iterator it; - it = std::find(sockets_.begin(), sockets_.end(), socket); + it = std::tqfind(sockets_.begin(), sockets_.end(), socket); if (it == sockets_.end()) return; sockets_.erase(it); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc index 14d64735..34a62547 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc @@ -59,14 +59,14 @@ void StunRequestManager::Send(StunRequest* request) { void StunRequestManager::SendDelayed(StunRequest* request, int delay) { request->set_manager(this); - assert(requests_.find(request->id()) == requests_.end()); + assert(requests_.tqfind(request->id()) == requests_.end()); requests_[request->id()] = request; thread_->PostDelayed(delay, request, MSG_STUN_SEND, NULL); } void StunRequestManager::Remove(StunRequest* request) { assert(request->manager() == this); - RequestMap::iterator iter = requests_.find(request->id()); + RequestMap::iterator iter = requests_.tqfind(request->id()); if (iter != requests_.end()) { assert(iter->second == request); requests_.erase(iter); @@ -84,7 +84,7 @@ void StunRequestManager::Clear() { } bool StunRequestManager::CheckResponse(StunMessage* msg) { - RequestMap::iterator iter = requests_.find(msg->transaction_id()); + RequestMap::iterator iter = requests_.tqfind(msg->transaction_id()); if (iter == requests_.end()) return false; @@ -113,7 +113,7 @@ bool StunRequestManager::CheckResponse(const char* data, size_t size) { std::string id; id.append(data + 4, 16); - RequestMap::iterator iter = requests_.find(id); + RequestMap::iterator iter = requests_.tqfind(id); if (iter == requests_.end()) return false; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc index 5192595c..42c4a876 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc @@ -372,7 +372,7 @@ void BasicPortAllocatorSession::AddAllocatedPort(Port* port, void BasicPortAllocatorSession::OnAddressReady(Port *port) { assert(Thread::Current() == network_thread_); - std::vector<PortData>::iterator it = std::find(ports_.begin(), ports_.end(), port); + std::vector<PortData>::iterator it = std::tqfind(ports_.begin(), ports_.end(), port); assert(it != ports_.end()); assert(!it->ready); it->ready = true; @@ -418,7 +418,7 @@ void BasicPortAllocatorSession::OnProtocolEnabled(AllocationSequence * seq, Prot void BasicPortAllocatorSession::OnPortDestroyed(Port* port) { assert(Thread::Current() == network_thread_); std::vector<PortData>::iterator iter = - find(ports_.begin(), ports_.end(), port); + tqfind(ports_.begin(), ports_.end(), port); assert(iter != ports_.end()); ports_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc index 09b38a52..668309f8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc @@ -31,7 +31,7 @@ #include "talk/p2p/client/sessionclient.h" #include "talk/p2p/base/helpers.h" #include "talk/base/logging.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmpp/constants.h" #include "talk/xmllite/xmlprinter.h" #include <iostream> @@ -74,25 +74,25 @@ namespace cricket { #endif const std::string NS_GOOGLESESSION("http://www.google.com/session"); -const buzz::QName QN_GOOGLESESSION_SESSION(true, NS_GOOGLESESSION, "session"); -const buzz::QName QN_GOOGLESESSION_CANDIDATE(true, NS_GOOGLESESSION, "candidate"); -const buzz::QName QN_GOOGLESESSION_TARGET(true, NS_GOOGLESESSION, "target"); -const buzz::QName QN_GOOGLESESSION_COOKIE(true, NS_GOOGLESESSION, "cookie"); -const buzz::QName QN_GOOGLESESSION_REGARDING(true, NS_GOOGLESESSION, "regarding"); - -const buzz::QName QN_TYPE(true, buzz::STR_EMPTY, "type"); -const buzz::QName QN_ID(true, buzz::STR_EMPTY, "id"); -const buzz::QName QN_INITIATOR(true, buzz::STR_EMPTY, "initiator"); -const buzz::QName QN_NAME(true, buzz::STR_EMPTY, "name"); -const buzz::QName QN_PORT(true, buzz::STR_EMPTY, "port"); -const buzz::QName QN_NETWORK(true, buzz::STR_EMPTY, "network"); -const buzz::QName QN_GENERATION(true, buzz::STR_EMPTY, "generation"); -const buzz::QName QN_ADDRESS(true, buzz::STR_EMPTY, "address"); -const buzz::QName QN_USERNAME(true, buzz::STR_EMPTY, "username"); -const buzz::QName QN_PASSWORD(true, buzz::STR_EMPTY, "password"); -const buzz::QName QN_PREFERENCE(true, buzz::STR_EMPTY, "preference"); -const buzz::QName QN_PROTOCOL(true, buzz::STR_EMPTY, "protocol"); -const buzz::QName QN_KEY(true, buzz::STR_EMPTY, "key"); +const buzz::TQName TQN_GOOGLESESSION_SESSION(true, NS_GOOGLESESSION, "session"); +const buzz::TQName TQN_GOOGLESESSION_CANDIDATE(true, NS_GOOGLESESSION, "candidate"); +const buzz::TQName TQN_GOOGLESESSION_TARGET(true, NS_GOOGLESESSION, "target"); +const buzz::TQName TQN_GOOGLESESSION_COOKIE(true, NS_GOOGLESESSION, "cookie"); +const buzz::TQName TQN_GOOGLESESSION_REGARDING(true, NS_GOOGLESESSION, "regarding"); + +const buzz::TQName TQN_TYPE(true, buzz::STR_EMPTY, "type"); +const buzz::TQName TQN_ID(true, buzz::STR_EMPTY, "id"); +const buzz::TQName TQN_INITIATOR(true, buzz::STR_EMPTY, "initiator"); +const buzz::TQName TQN_NAME(true, buzz::STR_EMPTY, "name"); +const buzz::TQName TQN_PORT(true, buzz::STR_EMPTY, "port"); +const buzz::TQName TQN_NETWORK(true, buzz::STR_EMPTY, "network"); +const buzz::TQName TQN_GENERATION(true, buzz::STR_EMPTY, "generation"); +const buzz::TQName TQN_ADDRESS(true, buzz::STR_EMPTY, "address"); +const buzz::TQName TQN_USERNAME(true, buzz::STR_EMPTY, "username"); +const buzz::TQName TQN_PASSWORD(true, buzz::STR_EMPTY, "password"); +const buzz::TQName TQN_PREFERENCE(true, buzz::STR_EMPTY, "preference"); +const buzz::TQName TQN_PROTOCOL(true, buzz::STR_EMPTY, "protocol"); +const buzz::TQName TQN_KEY(true, buzz::STR_EMPTY, "key"); class XmlCookie: public SessionMessage::Cookie { public: @@ -140,21 +140,21 @@ void SessionClient::OnSessionDestroySlot(Session *session) { bool SessionClient::IsClientStanza(const buzz::XmlElement *stanza) { // Is it a IQ set stanza? - if (stanza->Name() != buzz::QN_IQ) + if (stanza->Name() != buzz::TQN_IQ) return false; - if (stanza->Attr(buzz::QN_TYPE) != buzz::STR_SET) + if (stanza->Attr(buzz::TQN_TYPE) != buzz::STR_SET) return false; // Make sure it has the right child element const buzz::XmlElement* element - = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); + = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); if (element == NULL) return false; // Is it one of the allowed types? std::string type; - if (element->HasAttr(QN_TYPE)) { - type = element->Attr(QN_TYPE); + if (element->HasAttr(TQN_TYPE)) { + type = element->Attr(TQN_TYPE); if (type != "initiate" && type != "accept" && type != "modify" && type != "candidates" && type != "reject" && type != "redirect" && type != "terminate") { @@ -163,7 +163,7 @@ bool SessionClient::IsClientStanza(const buzz::XmlElement *stanza) { } // Does this client own the session description namespace? - buzz::QName qn_session_desc(GetSessionDescriptionName(), "description"); + buzz::TQName qn_session_desc(GetSessionDescriptionName(), "description"); const buzz::XmlElement* description = element->FirstNamed(qn_session_desc); if (type == "initiate" || type == "accept" || type == "modify") { if (description == NULL) @@ -200,9 +200,9 @@ bool SessionClient::ParseIncomingMessage(const buzz::XmlElement *stanza, SessionMessage& message) { // Parse stanza into SessionMessage const buzz::XmlElement* element - = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); + = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); - std::string type = element->Attr(QN_TYPE); + std::string type = element->Attr(TQN_TYPE); if (type == "initiate" || type == "accept" || type == "modify") { ParseInitiateAcceptModify(stanza, message); } else if (type == "candidates") { @@ -219,20 +219,20 @@ bool SessionClient::ParseIncomingMessage(const buzz::XmlElement *stanza, } void SessionClient::ParseHeader(const buzz::XmlElement *stanza, SessionMessage &message) { - if (stanza->HasAttr(buzz::QN_FROM)) - message.set_from(stanza->Attr(buzz::QN_FROM)); - if (stanza->HasAttr(buzz::QN_TO)) - message.set_to(stanza->Attr(buzz::QN_TO)); + if (stanza->HasAttr(buzz::TQN_FROM)) + message.set_from(stanza->Attr(buzz::TQN_FROM)); + if (stanza->HasAttr(buzz::TQN_TO)) + message.set_to(stanza->Attr(buzz::TQN_TO)); const buzz::XmlElement *element - = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); - if (element->HasAttr(QN_ID)) - message.session_id().set_id_str(element->Attr(QN_ID)); + = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); + if (element->HasAttr(TQN_ID)) + message.session_id().set_id_str(element->Attr(TQN_ID)); - if (element->HasAttr(QN_INITIATOR)) - message.session_id().set_initiator(element->Attr(QN_INITIATOR)); + if (element->HasAttr(TQN_INITIATOR)) + message.session_id().set_initiator(element->Attr(TQN_INITIATOR)); - std::string type = element->Attr(QN_TYPE); + std::string type = element->Attr(TQN_TYPE); if (type == "initiate") { message.set_type(SessionMessage::TYPE_INITIATE); } else if (type == "accept") { @@ -258,8 +258,8 @@ void SessionClient::ParseInitiateAcceptModify(const buzz::XmlElement *stanza, Se // Parse session description const buzz::XmlElement *session - = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); - buzz::QName qn_session_desc(GetSessionDescriptionName(), "description"); + = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); + buzz::TQName qn_session_desc(GetSessionDescriptionName(), "description"); const buzz::XmlElement* desc_elem = session->FirstNamed(qn_session_desc); const SessionDescription *description = NULL; if (desc_elem) @@ -275,10 +275,10 @@ void SessionClient::ParseCandidates(const buzz::XmlElement *stanza, SessionMessa // Parse candidates and session description std::vector<Candidate> candidates; const buzz::XmlElement *element - = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); + = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); const buzz::XmlElement *child = element->FirstElement(); while (child != NULL) { - if (child->Name() == QN_GOOGLESESSION_CANDIDATE) { + if (child->Name() == TQN_GOOGLESESSION_CANDIDATE) { Candidate candidate; if (ParseCandidate(child, &candidate)) candidates.push_back(candidate); @@ -297,20 +297,20 @@ void SessionClient::ParseRejectTerminate(const buzz::XmlElement *stanza, Session bool SessionClient::ParseCandidate(const buzz::XmlElement *child, Candidate* candidate) { // Check for all of the required attributes. - if (!child->HasAttr(QN_NAME) || - !child->HasAttr(QN_ADDRESS) || - !child->HasAttr(QN_PORT) || - !child->HasAttr(QN_USERNAME) || - !child->HasAttr(QN_PREFERENCE) || - !child->HasAttr(QN_PROTOCOL) || - !child->HasAttr(QN_GENERATION)) { + if (!child->HasAttr(TQN_NAME) || + !child->HasAttr(TQN_ADDRESS) || + !child->HasAttr(TQN_PORT) || + !child->HasAttr(TQN_USERNAME) || + !child->HasAttr(TQN_PREFERENCE) || + !child->HasAttr(TQN_PROTOCOL) || + !child->HasAttr(TQN_GENERATION)) { LOG(LERROR) << "Candidate missing required attribute"; return false; } SocketAddress address; - address.SetIP(child->Attr(QN_ADDRESS)); - std::istringstream ist(child->Attr(QN_PORT)); + address.SetIP(child->Attr(TQN_ADDRESS)); + std::istringstream ist(child->Attr(TQN_PORT)); int port; ist >> port; address.SetPort(port); @@ -338,12 +338,12 @@ bool SessionClient::ParseCandidate(const buzz::XmlElement *child, } } - candidate->set_name(child->Attr(QN_NAME)); + candidate->set_name(child->Attr(TQN_NAME)); candidate->set_address(address); - candidate->set_username(child->Attr(QN_USERNAME)); - candidate->set_preference_str(child->Attr(QN_PREFERENCE)); - candidate->set_protocol(child->Attr(QN_PROTOCOL)); - candidate->set_generation_str(child->Attr(QN_GENERATION)); + candidate->set_username(child->Attr(TQN_USERNAME)); + candidate->set_preference_str(child->Attr(TQN_PREFERENCE)); + candidate->set_protocol(child->Attr(TQN_PROTOCOL)); + candidate->set_generation_str(child->Attr(TQN_GENERATION)); // Check that the username is not too long and does not use any bad chars. if (candidate->username().size() > kMaxUsernameSize) { @@ -356,12 +356,12 @@ bool SessionClient::ParseCandidate(const buzz::XmlElement *child, } // Look for the non-required attributes. - if (child->HasAttr(QN_PASSWORD)) - candidate->set_password(child->Attr(QN_PASSWORD)); - if (child->HasAttr(QN_TYPE)) - candidate->set_type(child->Attr(QN_TYPE)); - if (child->HasAttr(QN_NETWORK)) - candidate->set_network_name(child->Attr(QN_NETWORK)); + if (child->HasAttr(TQN_PASSWORD)) + candidate->set_password(child->Attr(TQN_PASSWORD)); + if (child->HasAttr(TQN_TYPE)) + candidate->set_type(child->Attr(TQN_TYPE)); + if (child->HasAttr(TQN_NETWORK)) + candidate->set_network_name(child->Attr(TQN_NETWORK)); return true; } @@ -369,15 +369,15 @@ bool SessionClient::ParseCandidate(const buzz::XmlElement *child, void SessionClient::ParseRedirect(const buzz::XmlElement *stanza, SessionMessage &message) { // Pull the standard header pieces out ParseHeader(stanza, message); - const buzz::XmlElement *session = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); + const buzz::XmlElement *session = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); // Parse the target and cookie. - const buzz::XmlElement* target = session->FirstNamed(QN_GOOGLESESSION_TARGET); + const buzz::XmlElement* target = session->FirstNamed(TQN_GOOGLESESSION_TARGET); if (target) - message.set_redirect_target(target->Attr(QN_NAME)); + message.set_redirect_target(target->Attr(TQN_NAME)); - const buzz::XmlElement* cookie = session->FirstNamed(QN_GOOGLESESSION_COOKIE); + const buzz::XmlElement* cookie = session->FirstNamed(TQN_GOOGLESESSION_COOKIE); if (cookie) message.set_redirect_cookie(new XmlCookie(cookie)); } @@ -415,58 +415,58 @@ void SessionClient::OnOutgoingMessage(Session *session, const SessionMessage &me } buzz::XmlElement *SessionClient::TranslateHeader(const SessionMessage &message) { - buzz::XmlElement *result = new buzz::XmlElement(buzz::QN_IQ); - result->AddAttr(buzz::QN_TO, message.to()); - result->AddAttr(buzz::QN_TYPE, buzz::STR_SET); - buzz::XmlElement *session = new buzz::XmlElement(QN_GOOGLESESSION_SESSION, true); + buzz::XmlElement *result = new buzz::XmlElement(buzz::TQN_IQ); + result->AddAttr(buzz::TQN_TO, message.to()); + result->AddAttr(buzz::TQN_TYPE, buzz::STR_SET); + buzz::XmlElement *session = new buzz::XmlElement(TQN_GOOGLESESSION_SESSION, true); result->AddElement(session); switch (message.type()) { case SessionMessage::TYPE_INITIATE: - session->AddAttr(QN_TYPE, "initiate"); + session->AddAttr(TQN_TYPE, "initiate"); break; case SessionMessage::TYPE_ACCEPT: - session->AddAttr(QN_TYPE, "accept"); + session->AddAttr(TQN_TYPE, "accept"); break; case SessionMessage::TYPE_MODIFY: - session->AddAttr(QN_TYPE, "modify"); + session->AddAttr(TQN_TYPE, "modify"); break; case SessionMessage::TYPE_CANDIDATES: - session->AddAttr(QN_TYPE, "candidates"); + session->AddAttr(TQN_TYPE, "candidates"); break; case SessionMessage::TYPE_REJECT: - session->AddAttr(QN_TYPE, "reject"); + session->AddAttr(TQN_TYPE, "reject"); break; case SessionMessage::TYPE_REDIRECT: - session->AddAttr(QN_TYPE, "redirect"); + session->AddAttr(TQN_TYPE, "redirect"); break; case SessionMessage::TYPE_TERMINATE: - session->AddAttr(QN_TYPE, "terminate"); + session->AddAttr(TQN_TYPE, "terminate"); break; } - session->AddAttr(QN_ID, message.session_id().id_str()); - session->AddAttr(QN_INITIATOR, message.session_id().initiator()); + session->AddAttr(TQN_ID, message.session_id().id_str()); + session->AddAttr(TQN_INITIATOR, message.session_id().initiator()); return result; } buzz::XmlElement *SessionClient::TranslateCandidate(const Candidate &candidate) { - buzz::XmlElement *result = new buzz::XmlElement(QN_GOOGLESESSION_CANDIDATE); - result->AddAttr(QN_NAME, candidate.name()); - result->AddAttr(QN_ADDRESS, candidate.address().IPAsString()); - result->AddAttr(QN_PORT, candidate.address().PortAsString()); - result->AddAttr(QN_USERNAME, candidate.username()); - result->AddAttr(QN_PASSWORD, candidate.password()); - result->AddAttr(QN_PREFERENCE, candidate.preference_str()); - result->AddAttr(QN_PROTOCOL, candidate.protocol()); - result->AddAttr(QN_TYPE, candidate.type()); - result->AddAttr(QN_NETWORK, candidate.network_name()); - result->AddAttr(QN_GENERATION, candidate.generation_str()); + buzz::XmlElement *result = new buzz::XmlElement(TQN_GOOGLESESSION_CANDIDATE); + result->AddAttr(TQN_NAME, candidate.name()); + result->AddAttr(TQN_ADDRESS, candidate.address().IPAsString()); + result->AddAttr(TQN_PORT, candidate.address().PortAsString()); + result->AddAttr(TQN_USERNAME, candidate.username()); + result->AddAttr(TQN_PASSWORD, candidate.password()); + result->AddAttr(TQN_PREFERENCE, candidate.preference_str()); + result->AddAttr(TQN_PROTOCOL, candidate.protocol()); + result->AddAttr(TQN_TYPE, candidate.type()); + result->AddAttr(TQN_NETWORK, candidate.network_name()); + result->AddAttr(TQN_GENERATION, candidate.generation_str()); return result; } buzz::XmlElement *SessionClient::TranslateInitiateAcceptModify(const SessionMessage &message) { // Header info common to all message types buzz::XmlElement *result = TranslateHeader(message); - buzz::XmlElement *session = result->FirstNamed(QN_GOOGLESESSION_SESSION); + buzz::XmlElement *session = result->FirstNamed(TQN_GOOGLESESSION_SESSION); // Candidates assert(message.candidates().size() == 0); @@ -490,7 +490,7 @@ buzz::XmlElement *SessionClient::TranslateInitiateAcceptModify(const SessionMess buzz::XmlElement *SessionClient::TranslateCandidates(const SessionMessage &message) { // Header info common to all message types buzz::XmlElement *result = TranslateHeader(message); - buzz::XmlElement *session = result->FirstNamed(QN_GOOGLESESSION_SESSION); + buzz::XmlElement *session = result->FirstNamed(TQN_GOOGLESESSION_SESSION); // Candidates std::vector<Candidate>::const_iterator it; @@ -508,24 +508,24 @@ buzz::XmlElement *SessionClient::TranslateRejectTerminate(const SessionMessage & buzz::XmlElement *SessionClient::TranslateRedirect(const SessionMessage &message) { // Header info common to all message types buzz::XmlElement *result = TranslateHeader(message); - buzz::XmlElement *session = result->FirstNamed(QN_GOOGLESESSION_SESSION); + buzz::XmlElement *session = result->FirstNamed(TQN_GOOGLESESSION_SESSION); assert(message.candidates().size() == 0); assert(message.description() == NULL); assert(message.redirect_target().size() > 0); - buzz::XmlElement* target = new buzz::XmlElement(QN_GOOGLESESSION_TARGET); - target->AddAttr(QN_NAME, message.redirect_target()); + buzz::XmlElement* target = new buzz::XmlElement(TQN_GOOGLESESSION_TARGET); + target->AddAttr(TQN_NAME, message.redirect_target()); session->AddElement(target); - buzz::XmlElement* cookie = new buzz::XmlElement(QN_GOOGLESESSION_COOKIE); + buzz::XmlElement* cookie = new buzz::XmlElement(TQN_GOOGLESESSION_COOKIE); session->AddElement(cookie); // If the message does not have a redirect cookie, then this is a redirect // initiated by us. We will automatically add a regarding cookie. if (message.redirect_cookie() == NULL) { - buzz::XmlElement* regarding = new buzz::XmlElement(QN_GOOGLESESSION_REGARDING); - regarding->AddAttr(QN_NAME, GetJid().BareJid().Str()); + buzz::XmlElement* regarding = new buzz::XmlElement(TQN_GOOGLESESSION_REGARDING); + regarding->AddAttr(TQN_NAME, GetJid().BareJid().Str()); cookie->AddElement(regarding); } else { const buzz::XmlElement* cookie_elem = diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc index 31b12e92..7a79d044 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc @@ -56,7 +56,7 @@ Session *Call::InitiateSession(const buzz::Jid &jid) { void Call::AcceptSession(Session *session) { std::vector<Session *>::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Accept(session_client_->CreateAcceptSessionDescription(session->remote_description())); @@ -64,7 +64,7 @@ void Call::AcceptSession(Session *session) { void Call::RedirectSession(Session *session, const buzz::Jid &to) { std::vector<Session *>::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Redirect(to.Str()); @@ -72,16 +72,16 @@ void Call::RedirectSession(Session *session, const buzz::Jid &to) { void Call::RejectSession(Session *session) { std::vector<Session *>::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Reject(); } void Call::TerminateSession(Session *session) { - assert(std::find(sessions_.begin(), sessions_.end(), session) != sessions_.end()); + assert(std::tqfind(sessions_.begin(), sessions_.end(), session) != sessions_.end()); std::vector<Session *>::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); if (it != sessions_.end()) (*it)->Terminate(); } @@ -127,14 +127,14 @@ void Call::AddSession(Session *session) { void Call::RemoveSession(Session *session) { // Remove session from list std::vector<Session *>::iterator it_session; - it_session = std::find(sessions_.begin(), sessions_.end(), session); + it_session = std::tqfind(sessions_.begin(), sessions_.end(), session); if (it_session == sessions_.end()) return; sessions_.erase(it_session); // Destroy session channel std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = it_channel->second; channel_map_.erase(it_channel); @@ -149,7 +149,7 @@ void Call::RemoveSession(Session *session) { } VoiceChannel* Call::GetChannel(Session* session) { - std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.find(session->id()); + std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.tqfind(session->id()); assert(it != channel_map_.end()); return it->second; } @@ -184,7 +184,7 @@ void Call::Join(Call *call, bool enable) { // Move channel std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = call->channel_map_.find(session->id()); + it_channel = call->channel_map_.tqfind(session->id()); if (it_channel != call->channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; call->channel_map_.erase(it_channel); @@ -196,7 +196,7 @@ void Call::Join(Call *call, bool enable) { void Call::StartConnectionMonitor(Session *session, int cms) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->SignalConnectionMonitor.connect(this, &Call::OnConnectionMonitor); @@ -206,7 +206,7 @@ void Call::StartConnectionMonitor(Session *session, int cms) { void Call::StopConnectionMonitor(Session *session) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->StopConnectionMonitor(); @@ -216,7 +216,7 @@ void Call::StopConnectionMonitor(Session *session) { void Call::StartAudioMonitor(Session *session, int cms) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->SignalAudioMonitor.connect(this, &Call::OnAudioMonitor); @@ -226,7 +226,7 @@ void Call::StartAudioMonitor(Session *session, int cms) { void Call::StopAudioMonitor(Session *session) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->StopAudioMonitor(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc index 98634b12..e5e6758d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc @@ -119,7 +119,7 @@ void ChannelManager::DestroyVoiceChannel_w(VoiceChannel *voice_channel) { CritScope cs(&crit_); // Destroy voice channel. assert(initialized_); - std::vector<VoiceChannel *>::iterator it = std::find(channels_.begin(), + std::vector<VoiceChannel *>::iterator it = std::tqfind(channels_.begin(), channels_.end(), voice_channel); assert(it != channels_.end()); if (it == channels_.end()) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc index f3244c54..8456a90f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc @@ -110,8 +110,8 @@ void LinphoneMediaChannel::OnPacketReceived(const void *data, int len) { sendto(fd_, buf, len, 0, (struct sockaddr*)&sockaddr, sizeof(sockaddr)); } -void LinphoneMediaChannel::SetPlayout(bool playout) { - play_ = playout; +void LinphoneMediaChannel::SetPtqlayout(bool ptqlayout) { + play_ = ptqlayout; } void LinphoneMediaChannel::SetSend(bool send) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h index 0c00be75..2639c7ac 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h @@ -36,7 +36,7 @@ class LinphoneMediaChannel : public MediaChannel { virtual void SetCodec(const char *codec); virtual void OnPacketReceived(const void *data, int len); - virtual void SetPlayout(bool playout); + virtual void SetPtqlayout(bool ptqlayout); virtual void SetSend(bool send); virtual float GetCurrentQuality(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h index db2f9654..4a2e4560 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h @@ -41,7 +41,7 @@ class MediaChannel { void SetInterface(NetworkInterface *iface) {network_interface_ = iface;} virtual void SetCodec(const char *codec) = 0; virtual void OnPacketReceived(const void *data, int len) = 0; - virtual void SetPlayout(bool playout) = 0; + virtual void SetPtqlayout(bool ptqlayout) = 0; virtual void SetSend(bool send) = 0; virtual float GetCurrentQuality() = 0; virtual int GetOutputLevel() = 0; 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 fa07d2ec..fe6f0f6c 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; } }; - // Bitmask flags for options that may be supported by the media engine implementation + // Bittqmask 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/phone/phonesessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc index 7f2ff11f..a8f0a511 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc @@ -30,16 +30,16 @@ #include "talk/base/logging.h" #include "talk/session/receiver.h" #include "talk/session/phone/phonesessionclient.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" namespace { const std::string NS_PHONE("http://www.google.com/session/phone"); const std::string NS_EMPTY(""); -const buzz::QName QN_PHONE_DESCRIPTION(true, NS_PHONE, "description"); -const buzz::QName QN_PHONE_PAYLOADTYPE(true, NS_PHONE, "payload-type"); -const buzz::QName QN_PHONE_PAYLOADTYPE_ID(true, NS_EMPTY, "id"); -const buzz::QName QN_PHONE_PAYLOADTYPE_NAME(true, NS_EMPTY, "name"); +const buzz::TQName TQN_PHONE_DESCRIPTION(true, NS_PHONE, "description"); +const buzz::TQName TQN_PHONE_PAYLOADTYPE(true, NS_PHONE, "payload-type"); +const buzz::TQName TQN_PHONE_PAYLOADTYPE_ID(true, NS_EMPTY, "id"); +const buzz::TQName TQN_PHONE_PAYLOADTYPE_NAME(true, NS_EMPTY, "name"); } @@ -116,19 +116,19 @@ bool PhoneSessionClient::FindMediaCodec(MediaEngine* me, const SessionDescription *PhoneSessionClient::CreateSessionDescription(const buzz::XmlElement *element) { PhoneSessionDescription* desc = new PhoneSessionDescription(); - const buzz::XmlElement* payload_type = element->FirstNamed(QN_PHONE_PAYLOADTYPE); + const buzz::XmlElement* payload_type = element->FirstNamed(TQN_PHONE_PAYLOADTYPE); int num_payload_types = 0; while (payload_type) { - if (payload_type->HasAttr(QN_PHONE_PAYLOADTYPE_ID) && - payload_type->HasAttr(QN_PHONE_PAYLOADTYPE_NAME)) { - int id = atoi(payload_type->Attr(QN_PHONE_PAYLOADTYPE_ID).c_str()); + if (payload_type->HasAttr(TQN_PHONE_PAYLOADTYPE_ID) && + payload_type->HasAttr(TQN_PHONE_PAYLOADTYPE_NAME)) { + int id = atoi(payload_type->Attr(TQN_PHONE_PAYLOADTYPE_ID).c_str()); int pref = 0; - std::string name = payload_type->Attr(QN_PHONE_PAYLOADTYPE_NAME); + std::string name = payload_type->Attr(TQN_PHONE_PAYLOADTYPE_NAME); desc->AddCodec(MediaEngine::Codec(id, name, 0)); } - payload_type = payload_type->NextNamed(QN_PHONE_PAYLOADTYPE); + payload_type = payload_type->NextNamed(TQN_PHONE_PAYLOADTYPE); num_payload_types += 1; } @@ -145,16 +145,16 @@ const SessionDescription *PhoneSessionClient::CreateSessionDescription(const buz buzz::XmlElement *PhoneSessionClient::TranslateSessionDescription(const SessionDescription *_session_desc) { const PhoneSessionDescription* session_desc = static_cast<const PhoneSessionDescription*>(_session_desc); - buzz::XmlElement* description = new buzz::XmlElement(QN_PHONE_DESCRIPTION, true); + buzz::XmlElement* description = new buzz::XmlElement(TQN_PHONE_DESCRIPTION, true); for (size_t i = 0; i < session_desc->codecs().size(); ++i) { - buzz::XmlElement* payload_type = new buzz::XmlElement(QN_PHONE_PAYLOADTYPE, true); + buzz::XmlElement* payload_type = new buzz::XmlElement(TQN_PHONE_PAYLOADTYPE, true); char buf[32]; sprintf(buf, "%d", session_desc->codecs()[i].id); - payload_type->AddAttr(QN_PHONE_PAYLOADTYPE_ID, buf); + payload_type->AddAttr(TQN_PHONE_PAYLOADTYPE_ID, buf); - payload_type->AddAttr(QN_PHONE_PAYLOADTYPE_NAME, + payload_type->AddAttr(TQN_PHONE_PAYLOADTYPE_NAME, session_desc->codecs()[i].name.c_str()); description->AddElement(payload_type); @@ -202,7 +202,7 @@ void PhoneSessionClient::DestroyCall(Call *call) { // Remove it from calls_ map and delete - std::map<uint32, Call *>::iterator it = calls_.find(call->id()); + std::map<uint32, Call *>::iterator it = calls_.tqfind(call->id()); if (it != calls_.end()) calls_.erase(it); @@ -212,7 +212,7 @@ void PhoneSessionClient::DestroyCall(Call *call) { void PhoneSessionClient::OnSessionDestroy(Session *session) { // Find the call this session is in, remove it - std::map<SessionID, Call *>::iterator it = session_map_.find(session->id()); + std::map<SessionID, Call *>::iterator it = session_map_.tqfind(session->id()); assert(it != session_map_.end()); if (it != session_map_.end()) { Call *call = (*it).second; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc index b65c9a20..90092283 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc @@ -25,7 +25,7 @@ #define SAMPLE_RATE 1 // Speex settings -//#define SPEEX_QUALITY 8 +//#define SPEEX_TQUALITY 8 // ORTP settings #define MAX_RTP_SIZE 1500 // From mediastreamer @@ -65,8 +65,8 @@ PortAudioMediaChannel::PortAudioMediaChannel() : mute_(false), play_(false), str speex_decoder_ctl(speex_dec_state_, SPEEX_GET_FRAME_SIZE, &speex_frame_size_); speex_frame_ = new float[speex_frame_size_]; - // int quality = SPEEX_QUALITY; - // speex_encoder_ctl(state, SPEEX_SET_QUALITY, &quality); + // int quality = SPEEX_TQUALITY; + // speex_encoder_ctl(state, SPEEX_SET_TQUALITY, &quality); // Initialize ORTP socket struct sockaddr_in sockaddr; @@ -126,12 +126,12 @@ void PortAudioMediaChannel::OnPacketReceived(const void *data, int len) } } -void PortAudioMediaChannel::SetPlayout(bool playout) +void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout) { if (!stream_) return; - if (play_ && !playout) { + if (play_ && !ptqlayout) { int err = Pa_StopStream(stream_); if (err != paNoError) { fprintf(stderr, "Error stopping PortAudio stream: %s\n", Pa_GetErrorText(err)); @@ -139,7 +139,7 @@ void PortAudioMediaChannel::SetPlayout(bool playout) } play_ = false; } - else if (!play_ && playout) { + else if (!play_ && ptqlayout) { int err = Pa_StartStream(stream_); if (err != paNoError) { fprintf(stderr, "Error starting PortAudio stream: %s\n", Pa_GetErrorText(err)); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h index 95c39a1a..89922e77 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h @@ -15,7 +15,7 @@ public: virtual void SetCodec(const char *codec); virtual void OnPacketReceived(const void *data, int len); - virtual void SetPlayout(bool playout); + virtual void SetPtqlayout(bool ptqlayout); virtual void SetSend(bool send); virtual float GetCurrentQuality(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc index 58e1db60..c55ef287 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc @@ -168,15 +168,15 @@ void VoiceChannel::SendPacket(const void *data, size_t len) { void VoiceChannel::ChangeState() { if (paused_ || !enabled_ || !socket_writable_) { - channel_->SetPlayout(false); + channel_->SetPtqlayout(false); channel_->SetSend(false); } else { if (muted_) { channel_->SetSend(false); - channel_->SetPlayout(true); + channel_->SetPtqlayout(true); } else { channel_->SetSend(true); - channel_->SetPlayout(true); + channel_->SetPtqlayout(true); } } } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h index a5326893..5b75af3c 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 *parent, SessionClient *session_client) - : buzz::XmppTask(parent, buzz::XmppEngine::HL_TYPE) { + Receiver(Task *tqparent, SessionClient *session_client) + : buzz::XmppTask(tqparent, 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 9dc5384c..5f67d58b 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 *parent, SessionClient *session_client) - : buzz::XmppTask(parent, buzz::XmppEngine::HL_SINGLE), + SessionSendTask(Task *tqparent, SessionClient *session_client) + : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_SINGLE), session_client_(session_client), timed_out_(false) { } @@ -54,7 +54,7 @@ public: void Send(const buzz::XmlElement* stanza) { assert(stanza_.get() == NULL); stanza_.reset(new buzz::XmlElement(*stanza)); - stanza_->SetAttr(buzz::QN_ID, task_id()); + stanza_->SetAttr(buzz::TQN_ID, task_id()); } protected: @@ -81,7 +81,7 @@ protected: if (next == NULL) return STATE_BLOCKED; - if (next->Attr(buzz::QN_TYPE) == "result") { + if (next->Attr(buzz::TQN_TYPE) == "result") { return STATE_DONE; } else { session_client_->OnFailedSend(stanza_.get(), next); @@ -90,10 +90,10 @@ protected: } virtual bool HandleStanza(const buzz::XmlElement *stanza) { - if (!MatchResponseIq(stanza, buzz::Jid(stanza_->Attr(buzz::QN_TO)), task_id())) + if (!MatchResponseIq(stanza, buzz::Jid(stanza_->Attr(buzz::TQN_TO)), task_id())) return false; - if (stanza->Attr(buzz::QN_TYPE) == "result" || - stanza->Attr(buzz::QN_TYPE) == "error") { + if (stanza->Attr(buzz::TQN_TYPE) == "result" || + stanza->Attr(buzz::TQN_TYPE) == "error") { QueueStanza(stanza); return true; } 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 24cc5a3f..6d8868d6 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); - sigprocmask(SIG_BLOCK,&set,NULL); + sigproctqmask(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)); } - sigprocmask(SIG_UNBLOCK,&set,NULL); + sigproctqmask(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); - sigprocmask(SIG_BLOCK,&set,NULL); + sigproctqmask(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)); } - sigprocmask(SIG_UNBLOCK,&set,NULL); + sigproctqmask(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 1d7ba3a0..9ee33ef4 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 parent; + SndCard tqparent; 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 3f5ad16f..30128191 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 mask; + int tqmask; int seg; unsigned char aval; if (pcm_val >= 0) { - mask = 0xD5; + tqmask = 0xD5; } else { - mask = 0x55; + tqmask = 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 ^ mask; + return aval ^ tqmask; } /* @@ -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 mask; + int tqmask; int seg; unsigned char uval; if (pcm_val < 0) { pcm_val = 0x84 - pcm_val; - mask = 0x7f; + tqmask = 0x7f; } else { pcm_val += 0x84; - mask = 0xff; + tqmask = 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 ^ mask; + return uval ^ tqmask; } /* 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 8a636c99..fe98df74 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_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; + gain.channel_tqmask=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_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; + gain.channel_tqmask=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 0118e035..ae6f1c7c 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 parent; + SndCard tqparent; jack_client_t *client; gboolean jack_running; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c index e83eb8dc..d243bf76 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c @@ -81,7 +81,7 @@ static gint compare(gconstpointer a, gconstpointer b) static GList *g_list_append_if_new(GList *l,gpointer data) { GList *res=l; - if (g_list_find(res,data)==NULL) + if (g_list_tqfind(res,data)==NULL) res=g_list_append(res,data); return(res); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h index c10d76fd..9e13459e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h @@ -42,7 +42,7 @@ typedef struct _MSALAWDecoderClass { /* the MSALAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSALAWDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h index 66e9fa63..d76f2f62 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h @@ -42,7 +42,7 @@ typedef struct _MSALAWEncoderClass { /* the MSALAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSALAWEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h index 8fbce4a0..dd8d330c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h @@ -45,7 +45,7 @@ typedef struct _MSGSMDecoderClass { /* the MSGSMDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSGSMDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h index e2130625..3fad63e3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h @@ -44,7 +44,7 @@ typedef struct _MSGSMEncoderClass { /* the MSGSMEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSGSMEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h index 8f61778b..af1ecc7c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h @@ -45,7 +45,7 @@ typedef struct _MSLPC10DecoderClass { /* the MSLPC10Decoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Decoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSLPC10DecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h index e72539ec..af900445 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h @@ -57,7 +57,7 @@ typedef struct _MSLPC10EncoderClass { /* the MSLPC10Encoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Encoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSLPC10EncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h index 6e038368..6e516db5 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h @@ -42,7 +42,7 @@ typedef struct _MSMULAWDecoderClass { /* the MSMULAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSMULAWDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h index b302b339..0192984e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h @@ -42,7 +42,7 @@ typedef struct _MSMULAWEncoderClass { /* the MSMULAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSMULAWEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h index 55008939..71a04d3a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h @@ -57,7 +57,7 @@ struct _MSAVDecoderClass { /* the MSAVDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSAVDecoderClass MSAVDecoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h index b703a396..23da59f6 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h @@ -58,7 +58,7 @@ struct _MSAVEncoderClass { /* the MSAVEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSAVEncoderClass MSAVEncoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h index 9b7c438b..2e03e525 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h @@ -44,7 +44,7 @@ typedef struct _MSCopyClass { /* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSCopyClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c index 623a3682..84859fda 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c @@ -51,15 +51,15 @@ void ms_fdispatcher_init(MSFdispatcher *obj) void ms_fdispatcher_class_init(MSFdispatcherClass *klass) { - MSFilterClass *parent_class=MS_FILTER_CLASS(klass); - ms_filter_class_init(parent_class); - ms_filter_class_set_name(parent_class,"fdispatcher"); - parent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS; - parent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS; - parent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN; - parent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN; - parent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy; - parent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process; + MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass); + ms_filter_class_init(tqparent_class); + ms_filter_class_set_name(tqparent_class,"fdispatcher"); + tqparent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS; + tqparent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS; + tqparent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN; + tqparent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN; + tqparent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy; + tqparent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h index 4aea7e95..a50c5637 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h @@ -44,7 +44,7 @@ typedef struct _MSFdispatcherClass { /* the MSFdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSFdispatcher class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSFdispatcherClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c index cb69904c..c73081a2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c @@ -130,7 +130,7 @@ int ms_filter_add_link(MSFilter *m1, MSFilter *m2) if ((m1_q!=-1) && (m2_q!=-1)){ /* link with queues */ ms_trace("m1_q=%i , m2_q=%i",m1_q,m2_q); - return ms_filter_link(m1,m1_q,m2,m2_q,LINK_QUEUE); + return ms_filter_link(m1,m1_q,m2,m2_q,LINK_TQUEUE); } if ((m1_f!=-1) && (m2_f!=-1)){ /* link with queues */ @@ -146,7 +146,7 @@ int ms_filter_add_link(MSFilter *m1, MSFilter *m2) * @pin1: The pin number on @m1. * @m2: A #MSFilter object. * @pin2: The pin number on @m2. - * @linktype: Type of connection, it may be #LINK_QUEUE, #LINK_FIFOS. + * @linktype: Type of connection, it may be #LINK_TQUEUE, #LINK_FIFOS. * * This function links two MSFilter object between them. It must be used to make chains of filters. * All data outgoing from pin1 of m1 will go to the input pin2 of m2. @@ -165,7 +165,7 @@ int ms_filter_link(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2, int linktype g_message("ms_filter_add_link: %s,%i -> %s,%i",m1->klass->name,pin1,m2->klass->name,pin2); switch(linktype) { - case LINK_QUEUE: + case LINK_TQUEUE: /* Are filter m1 and m2 able to accept more queues connections ?*/ g_return_val_if_fail(m1->qoutputs<MS_FILTER_GET_CLASS(m1)->max_qoutputs,-EMLINK); g_return_val_if_fail(m2->qinputs<MS_FILTER_GET_CLASS(m2)->max_qinputs,-EMLINK); @@ -244,7 +244,7 @@ int ms_filter_link(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2, int linktype * @pin1: The pin number on @m1. * @m2: A #MSFilter object. * @pin2: The pin number on @m2. - * @linktype: Type of connection, it may be #LINK_QUEUE, #LINK_FIFOS. + * @linktype: Type of connection, it may be #LINK_TQUEUE, #LINK_FIFOS. * * Unlink @pin1 of filter @m1 from @pin2 of filter @m2. @linktype specifies what type of connection is removed. * @@ -254,7 +254,7 @@ int ms_filter_unlink(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2,gint linkty { switch(linktype) { - case LINK_QUEUE: + case LINK_TQUEUE: /* Are filter m1 and m2 valid with their inputs and outputs ?*/ g_return_val_if_fail(m1->outqueues!=NULL,-EFAULT); g_return_val_if_fail(m2->inqueues!=NULL,-EFAULT); @@ -321,7 +321,7 @@ gint ms_filter_remove_links(MSFilter *m1, MSFilter *m2) if (rmf==m2){ j=find_iq(rmf,qo); if (j==-1) g_error("Could not find input queue: impossible case."); - ms_filter_unlink(m1,i,m2,j,LINK_QUEUE); + ms_filter_unlink(m1,i,m2,j,LINK_TQUEUE); removed=0; } } @@ -419,7 +419,7 @@ GList *filter_list=NULL; void ms_filter_register(MSFilterInfo *info) { gpointer tmp; - tmp=g_list_find(filter_list,info); + tmp=g_list_tqfind(filter_list,info); if (tmp==NULL) filter_list=g_list_append(filter_list,(gpointer)info); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h index 89f91ad8..60c87411 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h @@ -98,7 +98,7 @@ typedef struct _MSFilterClass void (*destroy)(MSFilter *filter); guint attributes; #define FILTER_HAS_FIFOS (0x0001) -#define FILTER_HAS_QUEUES (0x0001<<1) +#define FILTER_HAS_TQUEUES (0x0001<<1) #define FILTER_IS_SOURCE (0x0001<<2) #define FILTER_IS_SINK (0x0001<<3) #define FILTER_CAN_SYNC (0x0001<<4) @@ -151,7 +151,7 @@ void ms_filter_destroy(MSFilter *f); #define LINK_DEFAULT 0 #define LINK_FIFO 1 -#define LINK_QUEUE 2 +#define LINK_TQUEUE 2 #define MSFILTER_VERSION(a,b,c) (((a)<<2)|((b)<<1)|(c)) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h index a3d0a326..035a80fd 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h @@ -49,7 +49,7 @@ typedef struct _MSILBCDecoderClass { /* the MSILBCDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSILBCDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h index b072e430..6995022c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h @@ -64,7 +64,7 @@ typedef struct _MSILBCEncoderClass { /* the MSILBCEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSILBCEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h index a6c9e9e8..7af095f8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h @@ -38,7 +38,7 @@ typedef struct _MSNoSync typedef struct _MSNoSyncClass { /* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/ - MSSyncClass parent_class; + MSSyncClass tqparent_class; } MSNoSyncClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h index e359f271..78fa91ad 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h @@ -53,7 +53,7 @@ struct _MSOssReadClass { /* the MSOssRead derivates from MSSoundRead, so the MSSoundRead class MUST be the first of the MSOssRead class in order to the class mechanism to work*/ - MSSoundReadClass parent_class; + MSSoundReadClass tqparent_class; }; typedef struct _MSOssReadClass MSOssReadClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h index 024eebb4..21abb2a1 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h @@ -52,7 +52,7 @@ struct _MSOssWriteClass { /* the MSOssWrite derivates from MSSoundWrite, so the MSSoundWrite class MUST be the first of the MSOssWrite class in order to the class mechanism to work*/ - MSSoundWriteClass parent_class; + MSSoundWriteClass tqparent_class; }; typedef struct _MSOssWriteClass MSOssWriteClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c index b924b0dd..20051b62 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c @@ -43,22 +43,22 @@ void ms_qdispatcher_init(MSQdispatcher *obj) MS_FILTER(obj)->inqueues=obj->q_inputs; MS_FILTER(obj)->outqueues=obj->q_outputs; - memset(obj->q_inputs,0,sizeof(MSQueue*)*MS_QDISPATCHER_MAX_INPUTS); - memset(obj->q_outputs,0,sizeof(MSQueue*)*MS_QDISPATCHER_MAX_OUTPUTS); + memset(obj->q_inputs,0,sizeof(MSQueue*)*MS_TQDISPATCHER_MAX_INPUTS); + memset(obj->q_outputs,0,sizeof(MSQueue*)*MS_TQDISPATCHER_MAX_OUTPUTS); } void ms_qdispatcher_class_init(MSQdispatcherClass *klass) { - MSFilterClass *parent_class=MS_FILTER_CLASS(klass); - ms_filter_class_init(parent_class); - ms_filter_class_set_name(parent_class,"qdispatcher"); - parent_class->max_qinputs=MS_QDISPATCHER_MAX_INPUTS; - parent_class->max_qoutputs=MS_QDISPATCHER_MAX_OUTPUTS; + MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass); + ms_filter_class_init(tqparent_class); + ms_filter_class_set_name(tqparent_class,"qdispatcher"); + tqparent_class->max_qinputs=MS_TQDISPATCHER_MAX_INPUTS; + tqparent_class->max_qoutputs=MS_TQDISPATCHER_MAX_OUTPUTS; - parent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy; - parent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process; + tqparent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy; + tqparent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process; } @@ -77,7 +77,7 @@ void ms_qdispatcher_process(MSQdispatcher *obj) MSMessage *m1,*m2; while ( (m1=ms_queue_get(inq))!=NULL){ /* dispatch incoming messages to output queues */ - for (i=0;i<MS_QDISPATCHER_MAX_OUTPUTS;i++){ + for (i=0;i<MS_TQDISPATCHER_MAX_OUTPUTS;i++){ outq=obj->q_outputs[i]; if (outq!=NULL){ m2=ms_message_dup(m1); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h index 054440d1..66e80902 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h @@ -19,36 +19,36 @@ */ -#ifndef MSQDISPATCHER_H -#define MSQDISPATCHER_H +#ifndef MSTQDISPATCHER_H +#define MSTQDISPATCHER_H #include "msfilter.h" /*this is the class that implements a qdispatcher filter*/ -#define MS_QDISPATCHER_MAX_INPUTS 1 -#define MS_QDISPATCHER_MAX_OUTPUTS 5 +#define MS_TQDISPATCHER_MAX_INPUTS 1 +#define MS_TQDISPATCHER_MAX_OUTPUTS 5 typedef struct _MSQdispatcher { /* the MSQdispatcher derivates from MSFilter, so the MSFilter object MUST be the first of the MSQdispatcher object in order to the object mechanism to work*/ MSFilter filter; - MSQueue *q_inputs[MS_QDISPATCHER_MAX_INPUTS]; - MSQueue *q_outputs[MS_QDISPATCHER_MAX_OUTPUTS]; + MSQueue *q_inputs[MS_TQDISPATCHER_MAX_INPUTS]; + MSQueue *q_outputs[MS_TQDISPATCHER_MAX_OUTPUTS]; } MSQdispatcher; typedef struct _MSQdispatcherClass { /* the MSQdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSQdispatcher class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSQdispatcherClass; /* PUBLIC */ -#define MS_QDISPATCHER(filter) ((MSQdispatcher*)(filter)) -#define MS_QDISPATCHER_CLASS(klass) ((MSQdispatcherClass*)(klass)) +#define MS_TQDISPATCHER(filter) ((MSQdispatcher*)(filter)) +#define MS_TQDISPATCHER_CLASS(klass) ((MSQdispatcherClass*)(klass)) MSFilter * ms_qdispatcher_new(void); /* FOR INTERNAL USE*/ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h index 7094b088..ee8e1f44 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MSQUEUE_H -#define MSQUEUE_H +#ifndef MSTQUEUE_H +#define MSTQUEUE_H #include "msbuffer.h" diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h index b695f7da..a40f4fa0 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h @@ -55,7 +55,7 @@ typedef struct _MSReadClass { /* the MSRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSRead class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSReadClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h index a090afbf..715cdf3c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h @@ -59,7 +59,7 @@ struct _MSRingPlayerClass { /* the MSRingPlayer derivates from MSFilter, so the MSFilter class MUST be the first of the MSRingPlayer class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSRingPlayerClass MSRingPlayerClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h index 0f36c379..e9fd7937 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h @@ -55,7 +55,7 @@ struct _MSRtpRecvClass { /* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSRtpRecvClass MSRtpRecvClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h index 96889964..56728f16 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h @@ -59,7 +59,7 @@ struct _MSRtpSendClass { /* the MSRtpSend derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSRtpSendClass MSRtpSendClass; 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 0ce08618..b19c7e74 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 parent; + MSFilter tqparent; MSQueue *input[2]; gint width,height; const gchar *format; @@ -51,7 +51,7 @@ typedef struct _MSSdlOut MSSdlOut; struct _MSSdlOutClass { - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSSdlOutClass MSSdlOutClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h index 9c5512b0..31349250 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h @@ -38,7 +38,7 @@ struct _MSSoundReadClass { /* the MSOssRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssRead class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; gint (*set_device)(MSSoundRead *, gint devid); void (*start)(MSSoundRead *); void (*stop)(MSSoundRead*); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h index 8c1bab2d..e8fae0d8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h @@ -38,7 +38,7 @@ struct _MSSoundWriteClass { /* the MSOssWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssWrite class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; gint (*set_device)(MSSoundWrite *, gint devid); void (*start)(MSSoundWrite *); void (*stop)(MSSoundWrite*); 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 370af69e..9c7f7fc4 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 parent; + MSFilter tqparent; 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 parent; + MSFilterClass tqparent; }; 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 f63edfcd..2325ba23 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 parent; + MSFilter tqparent; 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 parent; + MSFilterClass tqparent; }; typedef struct _MSSpeexEncClass MSSpeexEncClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h index 3fe11350..b245ab86 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h @@ -42,7 +42,7 @@ typedef struct _MSTimer typedef struct _MSTimerClass { /* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/ - MSSyncClass parent_class; + MSSyncClass tqparent_class; } MSTimerClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h index a61719ea..105e2603 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h @@ -42,7 +42,7 @@ typedef struct _MSTrueSpeechDecoderClass so the MSFilter class MUST be the first of the MSTrueSpechDecoder class in order for the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; Win32CodecDriver* driver; } MSTrueSpeechDecoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h index 78024946..2637d3ac 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h @@ -46,7 +46,7 @@ typedef struct _MSTrueSpeechEncoderClass so the MSFilter class MUST be the first of the MSTrueSpechEncoder class in order for the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; Win32CodecDriver* driver; } MSTrueSpeechEncoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h index ecd8eb32..2b4f7bd2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h @@ -50,8 +50,8 @@ #define VIDEO_SIZE_CIF_W 352 #define VIDEO_SIZE_CIF_H 288 -#define VIDEO_SIZE_QCIF_W 176 -#define VIDEO_SIZE_QCIF_H 144 +#define VIDEO_SIZE_TQCIF_W 176 +#define VIDEO_SIZE_TQCIF_H 144 #define VIDEO_SIZE_4CIF_W 704 #define VIDEO_SIZE_4CIF_H 576 #define VIDEO_SIZE_MAX_W VIDEO_SIZE_4CIF_W 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 3dc5ee04..e289ccc8 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 parent; + MSVideoSource tqparent; int fd; char *device; struct video_capability cap; @@ -61,7 +61,7 @@ typedef struct _MSV4l MSV4l; struct _MSV4lClass { - MSVideoSourceClass parent_class; + MSVideoSourceClass tqparent_class; }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h index 897b239e..2189a6df 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h @@ -45,7 +45,7 @@ typedef struct _MSVideoSourceClass { /* the MSVideoSource derivates from MSFilter, so the MSFilter class MUST be the first of the MSVideoSource class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; gint (*set_device)(MSVideoSource *s, const gchar *name); void (*start)(MSVideoSource *s); void (*stop)(MSVideoSource *s); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h index 8492a09d..55081793 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h @@ -45,7 +45,7 @@ typedef struct _MSWriteClass { /* the MSWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSWrite class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSWriteClass; /* PUBLIC */ 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 0f1e09ab..6413c682 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 parent; + SndCard tqparent; 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 2ffc6cd1..caf906df 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 parent; + SndCard tqparent; 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 80e07682..1ac35d9c 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); - sigprocmask(SIG_BLOCK,&set,NULL); + sigproctqmask(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/rtp.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h index 625d2111..f67409d8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h @@ -26,7 +26,7 @@ -#define RTP_MAX_RQ_SIZE 100 /* max number of packet allowed to be enqueued */ +#define RTP_MAX_RTQ_SIZE 100 /* max number of packet allowed to be enqueued */ #define IPMAXLEN 20 #define UDP_MAX_SIZE 65536 diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c index de6b2e7d..a73aa121 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c @@ -104,7 +104,7 @@ rtp_session_init (RtpSession * session, gint mode) { memset (session, 0, sizeof (RtpSession)); session->lock = g_mutex_new (); - session->rtp.max_rq_size = RTP_MAX_RQ_SIZE; + session->rtp.max_rq_size = RTP_MAX_RTQ_SIZE; session->mode = mode; if ((mode == RTP_SESSION_RECVONLY) || (mode == RTP_SESSION_SENDRECV)) { 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 e7702000..81554a06 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 mask of RtpSession */ + gint tqmask_pos; /* the position in the scheduler tqmask 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 17ff6748..2ea733ac 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 mask and see if they have to leave, or to wait for next tick*/ + result tqmask 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,10 +174,10 @@ 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 mask*/ + /* find a free pos in the session tqmask*/ for (i=0;i<sched->max_sessions;i++){ if (!ORTP_FD_ISSET(i,&sched->all_sessions.rtpset)){ - session->mask_pos=i; + session->tqmask_pos=i; session_set_set(&sched->all_sessions,session); /* make a new session scheduled not blockable if it has not started*/ if (session->flags & RTP_SESSION_RECV_NOT_STARTED) @@ -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 mask */ + /* delete the bit in the tqmask */ 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 91cde6a9..106f1fcd 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,15 +29,15 @@ struct _RtpScheduler { RtpSession *list; /* list of scheduled sessions*/ - 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 */ + 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 */ gint r_max; - SessionSet w_sessions; /* mask of sessions that have a send event */ + SessionSet w_sessions; /* tqmask of sessions that have a send event */ gint w_max; - SessionSet e_sessions; /* mask of session that have error event */ + SessionSet e_sessions; /* tqmask of session that have error event */ gint e_max; - gint max_sessions; /* the number of position in the masks */ + gint max_sessions; /* the number of position in the tqmasks */ /* GMutex *unblock_select_mutex; */ GCond *unblock_select_cond; GMutex *lock; 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 7b5ad921..bea1a7c9 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 *mask1,*mask2,*mask3; + guint32 *tqmask1,*tqmask2,*tqmask3; gint i=0; gint j,ret=0; - mask1=(guint32*)&sched_set->rtpset; - mask2=(guint32*)&user_set->rtpset; - mask3=(guint32*)&result_set->rtpset; + tqmask1=(guint32*)&sched_set->rtpset; + tqmask2=(guint32*)&user_set->rtpset; + tqmask3=(guint32*)&result_set->rtpset; while(i<maxs+1){ - *mask3=(*mask1) & (*mask2); /* computes the AND between the two masks*/ + *tqmask3=(*tqmask1) & (*tqmask2); /* computes the AND between the two tqmasks*/ /* and unset the sessions that have been found from the sched_set */ - *mask1=(*mask1) & (~(*mask3)); - if ((*mask3)!=0){ + *tqmask1=(*tqmask1) & (~(*tqmask3)); + if ((*tqmask3)!=0){ for (j=0;j<32;j++){ - if ( ((*mask3)>>j) & 1){ + if ( ((*tqmask3)>>j) & 1){ ret++; } } } i+=32; - mask1++; - mask2++; - mask3++; + tqmask1++; + tqmask2++; + tqmask3++; } //printf("session_set_and: ret=%i\n",ret); return ret; @@ -116,12 +116,12 @@ int session_set_select(SessionSet *recvs, SessionSet *sends, SessionSet *errors) SessionSet temp; RtpScheduler *sched=ortp_get_scheduler(); - /*lock the scheduler to not read the masks while they are being modified by the scheduler*/ + /*lock the scheduler to not read the tqmasks while they are being modified by the scheduler*/ rtp_scheduler_lock(sched); while(1){ - /* computes the SessionSet intersection (in the other words mask intersection) between - the mask given by the user and scheduler masks */ + /* computes the SessionSet intersection (in the other words tqmask intersection) between + the tqmask given by the user and scheduler tqmasks */ 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 623b9d10..b4a0b904 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_mask); ++__i) \ + for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_tqmask); ++__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_mask; +typedef long int ortp__fd_tqmask; /* 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_mask)) +#define ORTP__NFDBITS (8 * sizeof (ortp__fd_tqmask)) #define ORTP__FDELT(d) ((d) / ORTP__NFDBITS) -#define ORTP__FDMASK(d) ((ortp__fd_mask) 1 << ((d) % ORTP__NFDBITS)) +#define ORTP__FDMASK(d) ((ortp__fd_tqmask) 1 << ((d) % ORTP__NFDBITS)) /* fd_set for select and pselect. */ typedef struct { - ortp__fd_mask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS]; + ortp__fd_tqmask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS]; # define ORTP__FDS_BITS(set) ((set)->fds_bits) } ortp_fd_set; @@ -87,9 +87,9 @@ typedef struct _SessionSet SessionSet; SessionSet * session_set_new(); #define session_set_init(ss) ORTP_FD_ZERO(&(ss)->rtpset) -#define session_set_set(ss,rtpsession) ORTP_FD_SET((rtpsession)->mask_pos,&(ss)->rtpset) -#define session_set_is_set(ss,rtpsession) ORTP_FD_ISSET((rtpsession)->mask_pos,&(ss)->rtpset) -#define session_set_clr(ss,rtpsession) ORTP_FD_CLR((rtpsession)->mask_pos,&(ss)->rtpset) +#define session_set_set(ss,rtpsession) ORTP_FD_SET((rtpsession)->tqmask_pos,&(ss)->rtpset) +#define session_set_is_set(ss,rtpsession) ORTP_FD_ISSET((rtpsession)->tqmask_pos,&(ss)->rtpset) +#define session_set_clr(ss,rtpsession) ORTP_FD_CLR((rtpsession)->tqmask_pos,&(ss)->rtpset) #define session_set_copy(dest,src) memcpy(&(dest)->rtpset,&(src)->rtpset,sizeof(ortp_fd_set)) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc index 626cfa96..ccb08884 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc @@ -28,14 +28,14 @@ #include <string> #include "talk/base/common.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmllite/xmlconstants.h" //#define new TRACK_NEW namespace buzz { -static int QName_Hash(const std::string & ns, const char * local) { +static int TQName_Hash(const std::string & ns, const char * local) { int result = ns.size() * 101; while (*local) { result *= 19; @@ -46,20 +46,20 @@ static int QName_Hash(const std::string & ns, const char * local) { } static const int bits = 9; -static QName::Data * get_qname_table() { - static QName::Data qname_table[1 << bits]; +static TQName::Data * get_qname_table() { + static TQName::Data qname_table[1 << bits]; return qname_table; } -static QName::Data * +static TQName::Data * AllocateOrFind(const std::string & ns, const char * local) { - int index = QName_Hash(ns, local); + int index = TQName_Hash(ns, local); int increment = index >> (bits - 1) | 1; - QName::Data * qname_table = get_qname_table(); + TQName::Data * qname_table = get_qname_table(); for (;;) { index &= ((1 << bits) - 1); if (!qname_table[index].Occupied()) { - return new QName::Data(ns, local); + return new TQName::Data(ns, local); } if (qname_table[index].localPart_ == local && qname_table[index].namespace_ == ns) { @@ -70,11 +70,11 @@ AllocateOrFind(const std::string & ns, const char * local) { } } -static QName::Data * +static TQName::Data * Add(const std::string & ns, const char * local) { - int index = QName_Hash(ns, local); + int index = TQName_Hash(ns, local); int increment = index >> (bits - 1) | 1; - QName::Data * qname_table = get_qname_table(); + TQName::Data * qname_table = get_qname_table(); for (;;) { index &= ((1 << bits) - 1); if (!qname_table[index].Occupied()) { @@ -93,25 +93,25 @@ Add(const std::string & ns, const char * local) { } } -QName::~QName() { +TQName::~TQName() { data_->Release(); } -QName::QName() : data_(QN_EMPTY.data_) { +TQName::TQName() : data_(TQN_EMPTY.data_) { data_->AddRef(); } -QName::QName(bool add, const std::string & ns, const char * local) : +TQName::TQName(bool add, const std::string & ns, const char * local) : data_(add ? Add(ns, local) : AllocateOrFind(ns, local)) {} -QName::QName(bool add, const std::string & ns, const std::string & local) : +TQName::TQName(bool add, const std::string & ns, const std::string & local) : data_(add ? Add(ns, local.c_str()) : AllocateOrFind(ns, local.c_str())) {} -QName::QName(const std::string & ns, const char * local) : +TQName::TQName(const std::string & ns, const char * local) : data_(AllocateOrFind(ns, local)) {} static std::string -QName_LocalPart(const std::string & name) { +TQName_LocalPart(const std::string & name) { size_t i = name.rfind(':'); if (i == std::string::npos) return name; @@ -119,19 +119,19 @@ QName_LocalPart(const std::string & name) { } static std::string -QName_Namespace(const std::string & name) { +TQName_Namespace(const std::string & name) { size_t i = name.rfind(':'); if (i == std::string::npos) return STR_EMPTY; return name.substr(0, i); } -QName::QName(const std::string & mergedOrLocal) : - data_(AllocateOrFind(QName_Namespace(mergedOrLocal), - QName_LocalPart(mergedOrLocal).c_str())) {} +TQName::TQName(const std::string & mergedOrLocal) : + data_(AllocateOrFind(TQName_Namespace(mergedOrLocal), + TQName_LocalPart(mergedOrLocal).c_str())) {} std::string -QName::Merged() const { +TQName::Merged() const { if (data_->namespace_ == STR_EMPTY) return data_->localPart_; @@ -143,14 +143,14 @@ QName::Merged() const { } bool -QName::operator==(const QName & other) const { +TQName::operator==(const TQName & other) const { return other.data_ == data_ || data_->localPart_ == other.data_->localPart_ && data_->namespace_ == other.data_->namespace_; } int -QName::Compare(const QName & other) const { +TQName::Compare(const TQName & other) const { if (data_ == other.data_) return 0; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h index b1bcec61..dff04cd9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h @@ -33,30 +33,30 @@ namespace buzz { -class QName +class TQName { public: - explicit QName(); - QName(const QName & qname) : data_(qname.data_) { data_->AddRef(); } - explicit QName(bool add, const std::string & ns, const char * local); - explicit QName(bool add, const std::string & ns, const std::string & local); - explicit QName(const std::string & ns, const char * local); - explicit QName(const std::string & mergedOrLocal); - QName & operator=(const QName & qn) { + explicit TQName(); + TQName(const TQName & qname) : data_(qname.data_) { data_->AddRef(); } + explicit TQName(bool add, const std::string & ns, const char * local); + explicit TQName(bool add, const std::string & ns, const std::string & local); + explicit TQName(const std::string & ns, const char * local); + explicit TQName(const std::string & mergedOrLocal); + TQName & operator=(const TQName & qn) { qn.data_->AddRef(); data_->Release(); data_ = qn.data_; return *this; } - ~QName(); + ~TQName(); const std::string & Namespace() const { return data_->namespace_; } const std::string & LocalPart() const { return data_->localPart_; } std::string Merged() const; - int Compare(const QName & other) const; - bool operator==(const QName & other) const; - bool operator!=(const QName & other) const { return !operator==(other); } - bool operator<(const QName & other) const { return Compare(other) < 0; } + int Compare(const TQName & other) const; + bool operator==(const TQName & other) const; + bool operator!=(const TQName & other) const { return !operator==(other); } + bool operator<(const TQName & other) const { return Compare(other) < 0; } class Data { public: diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc index 313c4013..7b1b10f0 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc @@ -53,8 +53,8 @@ XmlBuilder::Reset() { XmlElement * XmlBuilder::BuildElement(XmlParseContext * pctx, const char * name, const char ** atts) { - QName tagName(pctx->ResolveQName(name, false)); - if (tagName == QN_EMPTY) + TQName tagName(pctx->ResolveTQName(name, false)); + if (tagName == TQN_EMPTY) return NULL; XmlElement * pelNew = new XmlElement(tagName); @@ -62,11 +62,11 @@ XmlBuilder::BuildElement(XmlParseContext * pctx, if (!*atts) return pelNew; - std::set<QName> seenNonlocalAtts; + std::set<TQName> seenNonlocalAtts; while (*atts) { - QName attName(pctx->ResolveQName(*atts, true)); - if (attName == QN_EMPTY) { + TQName attName(pctx->ResolveTQName(*atts, true)); + if (attName == TQN_EMPTY) { delete pelNew; return NULL; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc index d3619a92..a021f67a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc @@ -32,7 +32,7 @@ #include "talk/base/common.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmllite/xmlparser.h" #include "talk/xmllite/xmlbuilder.h" #include "talk/xmllite/xmlprinter.h" @@ -42,8 +42,8 @@ namespace buzz { -const QName QN_EMPTY(true, STR_EMPTY, STR_EMPTY); -const QName QN_XMLNS(true, STR_EMPTY, STR_XMLNS); +const TQName TQN_EMPTY(true, STR_EMPTY, STR_EMPTY); +const TQName TQN_XMLNS(true, STR_EMPTY, STR_XMLNS); XmlChild::~XmlChild() { @@ -82,7 +82,7 @@ XmlText::AddText(const std::string & text) { XmlText::~XmlText() { } -XmlElement::XmlElement(const QName & name) : +XmlElement::XmlElement(const TQName & name) : name_(name), pFirstAttr_(NULL), pLastAttr_(NULL), @@ -109,7 +109,7 @@ XmlElement::XmlElement(const XmlElement & elt) : } pLastAttr_ = newAttr; - // copy children + // copy tqchildren XmlChild * pChild; XmlChild ** ppLast = &pFirstChild_; XmlChild * newChild = NULL; @@ -127,9 +127,9 @@ XmlElement::XmlElement(const XmlElement & elt) : } -XmlElement::XmlElement(const QName & name, bool useDefaultNs) : +XmlElement::XmlElement(const TQName & name, bool useDefaultNs) : name_(name), - pFirstAttr_(useDefaultNs ? new XmlAttr(QN_XMLNS, name.Namespace()) : NULL), + pFirstAttr_(useDefaultNs ? new XmlAttr(TQN_XMLNS, name.Namespace()) : NULL), pLastAttr_(pFirstAttr_), pFirstChild_(NULL), pLastChild_(NULL) { @@ -173,11 +173,11 @@ XmlElement::SetBodyText(const std::string & text) { } } -const QName & +const TQName & XmlElement::FirstElementName() const { const XmlElement * element = FirstElement(); if (element == NULL) - return QN_EMPTY; + return TQN_EMPTY; return element->Name(); } @@ -187,7 +187,7 @@ XmlElement::FirstAttr() { } const std::string & -XmlElement::Attr(const QName & name) const { +XmlElement::Attr(const TQName & name) const { XmlAttr * pattr; for (pattr = pFirstAttr_; pattr; pattr = pattr->pNextAttr_) { if (pattr->name_ == name) @@ -197,7 +197,7 @@ XmlElement::Attr(const QName & name) const { } bool -XmlElement::HasAttr(const QName & name) const { +XmlElement::HasAttr(const TQName & name) const { XmlAttr * pattr; for (pattr = pFirstAttr_; pattr; pattr = pattr->pNextAttr_) { if (pattr->name_ == name) @@ -207,7 +207,7 @@ XmlElement::HasAttr(const QName & name) const { } void -XmlElement::SetAttr(const QName & name, const std::string & value) { +XmlElement::SetAttr(const TQName & name, const std::string & value) { XmlAttr * pattr; for (pattr = pFirstAttr_; pattr; pattr = pattr->pNextAttr_) { if (pattr->name_ == name) @@ -226,7 +226,7 @@ XmlElement::SetAttr(const QName & name, const std::string & value) { } void -XmlElement::ClearAttr(const QName & name) { +XmlElement::ClearAttr(const TQName & name) { XmlAttr * pattr; XmlAttr *pLastAttr = NULL; for (pattr = pFirstAttr_; pattr; pattr = pattr->pNextAttr_) { @@ -291,7 +291,7 @@ XmlElement::NextWithNamespace(const std::string & ns) { } XmlElement * -XmlElement::FirstNamed(const QName & name) { +XmlElement::FirstNamed(const TQName & name) { XmlChild * pChild; for (pChild = pFirstChild_; pChild; pChild = pChild->pNextChild_) { if (!pChild->IsText() && pChild->AsElement()->Name() == name) @@ -301,7 +301,7 @@ XmlElement::FirstNamed(const QName & name) { } XmlElement * -XmlElement::NextNamed(const QName & name) { +XmlElement::NextNamed(const TQName & name) { XmlChild * pChild; for (pChild = pNextChild_; pChild; pChild = pChild->pNextChild_) { if (!pChild->IsText() && pChild->AsElement()->Name() == name) @@ -311,7 +311,7 @@ XmlElement::NextNamed(const QName & name) { } const std::string & -XmlElement::TextNamed(const QName & name) const { +XmlElement::TextNamed(const TQName & name) const { XmlChild * pChild; for (pChild = pFirstChild_; pChild; pChild = pChild->pNextChild_) { if (!pChild->IsText() && pChild->AsElement()->Name() == name) @@ -352,7 +352,7 @@ XmlElement::RemoveChildAfter(XmlChild * pPredecessor) { } void -XmlElement::AddAttr(const QName & name, const std::string & value) { +XmlElement::AddAttr(const TQName & name, const std::string & value) { ASSERT(!HasAttr(name)); XmlAttr ** pprev = pLastAttr_ ? &(pLastAttr_->pNextAttr_) : &pFirstAttr_; @@ -360,7 +360,7 @@ XmlElement::AddAttr(const QName & name, const std::string & value) { } void -XmlElement::AddAttr(const QName & name, const std::string & value, +XmlElement::AddAttr(const TQName & name, const std::string & value, int depth) { XmlElement * element = this; while (depth--) { @@ -426,7 +426,7 @@ XmlElement::AddElement(XmlElement *pelChild, int depth) { } void -XmlElement::ClearNamedChildren(const QName & name) { +XmlElement::ClearNamedChildren(const TQName & name) { XmlChild * prev_child = NULL; XmlChild * next_child; XmlChild * child; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h index 06545d89..2c9fc860 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h @@ -31,12 +31,12 @@ #include <iosfwd> #include <string> #include "talk/base/scoped_ptr.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" namespace buzz { -extern const QName QN_EMPTY; -extern const QName QN_XMLNS; +extern const TQName TQN_EMPTY; +extern const TQName TQN_XMLNS; class XmlChild; @@ -116,11 +116,11 @@ friend class XmlElement; public: XmlAttr * NextAttr() const { return pNextAttr_; } - const QName & Name() const { return name_; } + const TQName & Name() const { return name_; } const std::string & Value() const { return value_; } private: - explicit XmlAttr(const QName & name, const std::string & value) : + explicit XmlAttr(const TQName & name, const std::string & value) : pNextAttr_(NULL), name_(name), value_(value) { @@ -132,24 +132,24 @@ private: } XmlAttr * pNextAttr_; - QName name_; + TQName name_; std::string value_; }; class XmlElement : public XmlChild { public: - explicit XmlElement(const QName & name); - explicit XmlElement(const QName & name, bool useDefaultNs); + explicit XmlElement(const TQName & name); + explicit XmlElement(const TQName & name, bool useDefaultNs); explicit XmlElement(const XmlElement & elt); virtual ~XmlElement(); - const QName & Name() const { return name_; } + const TQName & Name() const { return name_; } const std::string & BodyText() const; void SetBodyText(const std::string & text); - const QName & FirstElementName() const; + const TQName & FirstElementName() const; XmlAttr * FirstAttr(); const XmlAttr * FirstAttr() const @@ -157,10 +157,10 @@ public: //! Attr will return STR_EMPTY if the attribute isn't there: //! use HasAttr to test presence of an attribute. - const std::string & Attr(const QName & name) const; - bool HasAttr(const QName & name) const; - void SetAttr(const QName & name, const std::string & value); - void ClearAttr(const QName & name); + const std::string & Attr(const TQName & name) const; + bool HasAttr(const TQName & name) const; + void SetAttr(const TQName & name, const std::string & value); + void ClearAttr(const TQName & name); XmlChild * FirstChild(); const XmlChild * FirstChild() const @@ -182,15 +182,15 @@ public: const XmlElement * NextWithNamespace(const std::string & ns) const { return const_cast<XmlElement *>(this)->NextWithNamespace(ns); } - XmlElement * FirstNamed(const QName & name); - const XmlElement * FirstNamed(const QName & name) const + XmlElement * FirstNamed(const TQName & name); + const XmlElement * FirstNamed(const TQName & name) const { return const_cast<XmlElement *>(this)->FirstNamed(name); } - XmlElement * NextNamed(const QName & name); - const XmlElement * NextNamed(const QName & name) const + XmlElement * NextNamed(const TQName & name); + const XmlElement * NextNamed(const TQName & name) const { return const_cast<XmlElement *>(this)->NextNamed(name); } - const std::string & TextNamed(const QName & name) const; + const std::string & TextNamed(const TQName & name) const; void InsertChildAfter(XmlChild * pPredecessor, XmlChild * pNewChild); void RemoveChildAfter(XmlChild * pPredecessor); @@ -200,9 +200,9 @@ public: void AddText(const std::string & text, int depth); void AddElement(XmlElement * pelChild); void AddElement(XmlElement * pelChild, int depth); - void AddAttr(const QName & name, const std::string & value); - void AddAttr(const QName & name, const std::string & value, int depth); - void ClearNamedChildren(const QName & name); + void AddAttr(const TQName & name, const std::string & value); + void AddAttr(const TQName & name, const std::string & value, int depth); + void ClearNamedChildren(const TQName & name); void ClearChildren(); static XmlElement * ForStr(const std::string & str); @@ -216,7 +216,7 @@ protected: virtual XmlText * AsTextImpl() const; private: - QName name_; + TQName name_; XmlAttr * pFirstAttr_; XmlAttr * pLastAttr_; XmlChild * pFirstChild_; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc index 4dcb6490..570a8be5 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc @@ -116,7 +116,7 @@ XmlnsStack::PrefixForNs(const std::string & ns, bool isattr) { } std::string -XmlnsStack::FormatQName(const QName & name, bool isAttr) { +XmlnsStack::FormatTQName(const TQName & name, bool isAttr) { std::string prefix(PrefixForNs(name.Namespace(), isAttr).first); if (prefix == STR_EMPTY) return name.LocalPart(); @@ -170,7 +170,7 @@ static std::string SuggestPrefix(const std::string & ns) { if (last - first > 4) last = first + 3; std::string candidate(AsciiLower(ns.substr(first, last - first))); - if (candidate.find("xml") != 0) + if (candidate.tqfind("xml") != 0) return candidate; break; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h index 299ec1ce..6fd7665c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h @@ -31,7 +31,7 @@ #include <string> #include "talk/base/scoped_ptr.h" #include "talk/base/stl_decl.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" namespace buzz { @@ -50,7 +50,7 @@ public: bool PrefixMatchesNs(const std::string & prefix, const std::string & ns); std::pair<std::string, bool> PrefixForNs(const std::string & ns, bool isAttr); std::pair<std::string, bool> AddNewPrefix(const std::string & ns, bool isAttr); - std::string FormatQName(const QName & name, bool isAttr); + std::string FormatTQName(const TQName & name, bool isAttr); private: diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc index f2b56778..41cadb84 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc @@ -212,29 +212,29 @@ XmlParser::ParseContext::EndElement() { xmlnsstack_.PopFrame(); } -QName -XmlParser::ParseContext::ResolveQName(const char *qname, bool isAttr) { +TQName +XmlParser::ParseContext::ResolveTQName(const char *qname, bool isAttr) { const char *c; for (c = qname; *c; ++c) { if (*c == ':') { const std::string * result; result = xmlnsstack_.NsForPrefix(std::string(qname, c - qname)); if (result == NULL) - return QN_EMPTY; + return TQN_EMPTY; const char * localname = c + 1; - return QName(*result, localname); + return TQName(*result, localname); } } if (isAttr) { - return QName(STR_EMPTY, qname); + return TQName(STR_EMPTY, qname); } const std::string * result; result = xmlnsstack_.NsForPrefix(STR_EMPTY); if (result == NULL) - return QN_EMPTY; + return TQN_EMPTY; - return QName(*result, qname); + return TQName(*result, qname); } void diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.h index 760802e4..8e2e4b5f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.h @@ -43,7 +43,7 @@ class XmlParser; class XmlParseContext { public: - virtual QName ResolveQName(const char * qname, bool isAttr) = 0; + virtual TQName ResolveTQName(const char * qname, bool isAttr) = 0; virtual void RaiseError(XML_Error err) = 0; }; @@ -80,7 +80,7 @@ private: public: ParseContext(XmlParser * parser); virtual ~ParseContext(); - virtual QName ResolveQName(const char * qname, bool isAttr); + virtual TQName ResolveTQName(const char * qname, bool isAttr); virtual void RaiseError(XML_Error err) { if (!raised_) raised_ = err; } XML_Error RaisedError() { return raised_; } void Reset(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc index 892e2ebb..8e36ac02 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc @@ -79,7 +79,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) { // first go through attrs of pel to add xmlns definitions const XmlAttr * pattr; for (pattr = element->FirstAttr(); pattr; pattr = pattr->NextAttr()) { - if (pattr->Name() == QN_XMLNS) + if (pattr->Name() == TQN_XMLNS) xmlnsStack_.AddXmlns(STR_EMPTY, pattr->Value()); else if (pattr->Name().Namespace() == NS_XMLNS) xmlnsStack_.AddXmlns(pattr->Name().LocalPart(), @@ -104,11 +104,11 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) { } // print the element name - *pout_ << '<' << xmlnsStack_.FormatQName(element->Name(), false); + *pout_ << '<' << xmlnsStack_.FormatTQName(element->Name(), false); // and the attributes for (pattr = element->FirstAttr(); pattr; pattr = pattr->NextAttr()) { - *pout_ << ' ' << xmlnsStack_.FormatQName(pattr->Name(), true) << "=\""; + *pout_ << ' ' << xmlnsStack_.FormatTQName(pattr->Name(), true) << "=\""; PrintQuotedValue(pattr->Value()); *pout_ << '"'; } @@ -123,7 +123,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) { i += 2; } - // now the children + // now the tqchildren const XmlChild * pchild = element->FirstChild(); if (pchild == NULL) @@ -137,7 +137,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) { PrintElement(pchild->AsElement()); pchild = pchild->NextChild(); } - *pout_ << "</" << xmlnsStack_.FormatQName(element->Name(), false) << '>'; + *pout_ << "</" << xmlnsStack_.FormatTQName(element->Name(), false) << '>'; } xmlnsStack_.PopFrame(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc index b2c833f7..18987e7d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc @@ -29,7 +29,7 @@ #include "talk/base/basicdefs.h" #include "talk/xmllite/xmlconstants.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/constants.h" namespace buzz { @@ -135,131 +135,131 @@ const std::string STR_GOOGLEMAIL_COM("googlemail.com"); const std::string STR_DEFAULT_DOMAIN("default.talk.google.com"); const std::string STR_X("x"); -const QName QN_STREAM_STREAM(true, NS_STREAM, STR_STREAM); -const QName QN_STREAM_FEATURES(true, NS_STREAM, "features"); -const QName QN_STREAM_ERROR(true, NS_STREAM, "error"); - -const QName QN_XSTREAM_BAD_FORMAT(true, NS_XSTREAM, "bad-format"); -const QName QN_XSTREAM_BAD_NAMESPACE_PREFIX(true, NS_XSTREAM, "bad-namespace-prefix"); -const QName QN_XSTREAM_CONFLICT(true, NS_XSTREAM, "conflict"); -const QName QN_XSTREAM_CONNECTION_TIMEOUT(true, NS_XSTREAM, "connection-timeout"); -const QName QN_XSTREAM_HOST_GONE(true, NS_XSTREAM, "host-gone"); -const QName QN_XSTREAM_HOST_UNKNOWN(true, NS_XSTREAM, "host-unknown"); -const QName QN_XSTREAM_IMPROPER_ADDRESSIING(true, NS_XSTREAM, "improper-addressing"); -const QName QN_XSTREAM_INTERNAL_SERVER_ERROR(true, NS_XSTREAM, "internal-server-error"); -const QName QN_XSTREAM_INVALID_FROM(true, NS_XSTREAM, "invalid-from"); -const QName QN_XSTREAM_INVALID_ID(true, NS_XSTREAM, "invalid-id"); -const QName QN_XSTREAM_INVALID_NAMESPACE(true, NS_XSTREAM, "invalid-namespace"); -const QName QN_XSTREAM_INVALID_XML(true, NS_XSTREAM, "invalid-xml"); -const QName QN_XSTREAM_NOT_AUTHORIZED(true, NS_XSTREAM, "not-authorized"); -const QName QN_XSTREAM_POLICY_VIOLATION(true, NS_XSTREAM, "policy-violation"); -const QName QN_XSTREAM_REMOTE_CONNECTION_FAILED(true, NS_XSTREAM, "remote-connection-failed"); -const QName QN_XSTREAM_RESOURCE_CONSTRAINT(true, NS_XSTREAM, "resource-constraint"); -const QName QN_XSTREAM_RESTRICTED_XML(true, NS_XSTREAM, "restricted-xml"); -const QName QN_XSTREAM_SEE_OTHER_HOST(true, NS_XSTREAM, "see-other-host"); -const QName QN_XSTREAM_SYSTEM_SHUTDOWN(true, NS_XSTREAM, "system-shutdown"); -const QName QN_XSTREAM_UNDEFINED_CONDITION(true, NS_XSTREAM, "undefined-condition"); -const QName QN_XSTREAM_UNSUPPORTED_ENCODING(true, NS_XSTREAM, "unsupported-encoding"); -const QName QN_XSTREAM_UNSUPPORTED_STANZA_TYPE(true, NS_XSTREAM, "unsupported-stanza-type"); -const QName QN_XSTREAM_UNSUPPORTED_VERSION(true, NS_XSTREAM, "unsupported-version"); -const QName QN_XSTREAM_XML_NOT_WELL_FORMED(true, NS_XSTREAM, "xml-not-well-formed"); -const QName QN_XSTREAM_TEXT(true, NS_XSTREAM, "text"); - -const QName QN_TLS_STARTTLS(true, NS_TLS, "starttls"); -const QName QN_TLS_REQUIRED(true, NS_TLS, "required"); -const QName QN_TLS_PROCEED(true, NS_TLS, "proceed"); -const QName QN_TLS_FAILURE(true, NS_TLS, "failure"); - -const QName QN_SASL_MECHANISMS(true, NS_SASL, "mechanisms"); -const QName QN_SASL_MECHANISM(true, NS_SASL, "mechanism"); -const QName QN_SASL_AUTH(true, NS_SASL, "auth"); -const QName QN_SASL_CHALLENGE(true, NS_SASL, "challenge"); -const QName QN_SASL_RESPONSE(true, NS_SASL, "response"); -const QName QN_SASL_ABORT(true, NS_SASL, "abort"); -const QName QN_SASL_SUCCESS(true, NS_SASL, "success"); -const QName QN_SASL_FAILURE(true, NS_SASL, "failure"); -const QName QN_SASL_ABORTED(true, NS_SASL, "aborted"); -const QName QN_SASL_INCORRECT_ENCODING(true, NS_SASL, "incorrect-encoding"); -const QName QN_SASL_INVALID_AUTHZID(true, NS_SASL, "invalid-authzid"); -const QName QN_SASL_INVALID_MECHANISM(true, NS_SASL, "invalid-mechanism"); -const QName QN_SASL_MECHANISM_TOO_WEAK(true, NS_SASL, "mechanism-too-weak"); -const QName QN_SASL_NOT_AUTHORIZED(true, NS_SASL, "not-authorized"); -const QName QN_SASL_TEMPORARY_AUTH_FAILURE(true, NS_SASL, "temporary-auth-failure"); - -const QName QN_DIALBACK_RESULT(true, NS_DIALBACK, "result"); -const QName QN_DIALBACK_VERIFY(true, NS_DIALBACK, "verify"); - -const QName QN_STANZA_BAD_REQUEST(true, NS_STANZA, "bad-request"); -const QName QN_STANZA_CONFLICT(true, NS_STANZA, "conflict"); -const QName QN_STANZA_FEATURE_NOT_IMPLEMENTED(true, NS_STANZA, "feature-not-implemented"); -const QName QN_STANZA_FORBIDDEN(true, NS_STANZA, "forbidden"); -const QName QN_STANZA_GONE(true, NS_STANZA, "gone"); -const QName QN_STANZA_INTERNAL_SERVER_ERROR(true, NS_STANZA, "internal-server-error"); -const QName QN_STANZA_ITEM_NOT_FOUND(true, NS_STANZA, "item-not-found"); -const QName QN_STANZA_JID_MALFORMED(true, NS_STANZA, "jid-malformed"); -const QName QN_STANZA_NOT_ACCEPTABLE(true, NS_STANZA, "not-acceptable"); -const QName QN_STANZA_NOT_ALLOWED(true, NS_STANZA, "not-allowed"); -const QName QN_STANZA_PAYMENT_REQUIRED(true, NS_STANZA, "payment-required"); -const QName QN_STANZA_RECIPIENT_UNAVAILABLE(true, NS_STANZA, "recipient-unavailable"); -const QName QN_STANZA_REDIRECT(true, NS_STANZA, "redirect"); -const QName QN_STANZA_REGISTRATION_REQUIRED(true, NS_STANZA, "registration-required"); -const QName QN_STANZA_REMOTE_SERVER_NOT_FOUND(true, NS_STANZA, "remote-server-not-found"); -const QName QN_STANZA_REMOTE_SERVER_TIMEOUT(true, NS_STANZA, "remote-server-timeout"); -const QName QN_STANZA_RESOURCE_CONSTRAINT(true, NS_STANZA, "resource-constraint"); -const QName QN_STANZA_SERVICE_UNAVAILABLE(true, NS_STANZA, "service-unavailable"); -const QName QN_STANZA_SUBSCRIPTION_REQUIRED(true, NS_STANZA, "subscription-required"); -const QName QN_STANZA_UNDEFINED_CONDITION(true, NS_STANZA, "undefined-condition"); -const QName QN_STANZA_UNEXPECTED_REQUEST(true, NS_STANZA, "unexpected-request"); -const QName QN_STANZA_TEXT(true, NS_STANZA, "text"); - -const QName QN_BIND_BIND(true, NS_BIND, "bind"); -const QName QN_BIND_RESOURCE(true, NS_BIND, "resource"); -const QName QN_BIND_JID(true, NS_BIND, "jid"); - -const QName QN_MESSAGE(true, NS_CLIENT, "message"); -const QName QN_BODY(true, NS_CLIENT, "body"); -const QName QN_SUBJECT(true, NS_CLIENT, "subject"); -const QName QN_THREAD(true, NS_CLIENT, "thread"); -const QName QN_PRESENCE(true, NS_CLIENT, "presence"); -const QName QN_SHOW(true, NS_CLIENT, "show"); -const QName QN_STATUS(true, NS_CLIENT, "status"); -const QName QN_LANG(true, NS_CLIENT, "lang"); -const QName QN_PRIORITY(true, NS_CLIENT, "priority"); -const QName QN_IQ(true, NS_CLIENT, "iq"); -const QName QN_ERROR(true, NS_CLIENT, "error"); - -const QName QN_SERVER_MESSAGE(true, NS_SERVER, "message"); -const QName QN_SERVER_BODY(true, NS_SERVER, "body"); -const QName QN_SERVER_SUBJECT(true, NS_SERVER, "subject"); -const QName QN_SERVER_THREAD(true, NS_SERVER, "thread"); -const QName QN_SERVER_PRESENCE(true, NS_SERVER, "presence"); -const QName QN_SERVER_SHOW(true, NS_SERVER, "show"); -const QName QN_SERVER_STATUS(true, NS_SERVER, "status"); -const QName QN_SERVER_LANG(true, NS_SERVER, "lang"); -const QName QN_SERVER_PRIORITY(true, NS_SERVER, "priority"); -const QName QN_SERVER_IQ(true, NS_SERVER, "iq"); -const QName QN_SERVER_ERROR(true, NS_SERVER, "error"); - -const QName QN_SESSION_SESSION(true, NS_SESSION, "session"); - -const QName QN_PRIVACY_QUERY(true, NS_PRIVACY, "query"); -const QName QN_PRIVACY_ACTIVE(true, NS_PRIVACY, "active"); -const QName QN_PRIVACY_DEFAULT(true, NS_PRIVACY, "default"); -const QName QN_PRIVACY_LIST(true, NS_PRIVACY, "list"); -const QName QN_PRIVACY_ITEM(true, NS_PRIVACY, "item"); -const QName QN_PRIVACY_IQ(true, NS_PRIVACY, "iq"); -const QName QN_PRIVACY_MESSAGE(true, NS_PRIVACY, "message"); -const QName QN_PRIVACY_PRESENCE_IN(true, NS_PRIVACY, "presence-in"); -const QName QN_PRIVACY_PRESENCE_OUT(true, NS_PRIVACY, "presence-out"); - -const QName QN_ROSTER_QUERY(true, NS_ROSTER, "query"); -const QName QN_ROSTER_ITEM(true, NS_ROSTER, "item"); -const QName QN_ROSTER_GROUP(true, NS_ROSTER, "group"); - -const QName QN_VCARD_QUERY(true, NS_VCARD, "vCard"); -const QName QN_VCARD_FN(true, NS_VCARD, "FN"); - -const QName QN_XML_LANG(true, NS_XML, "lang"); +const TQName TQN_STREAM_STREAM(true, NS_STREAM, STR_STREAM); +const TQName TQN_STREAM_FEATURES(true, NS_STREAM, "features"); +const TQName TQN_STREAM_ERROR(true, NS_STREAM, "error"); + +const TQName TQN_XSTREAM_BAD_FORMAT(true, NS_XSTREAM, "bad-format"); +const TQName TQN_XSTREAM_BAD_NAMESPACE_PREFIX(true, NS_XSTREAM, "bad-namespace-prefix"); +const TQName TQN_XSTREAM_CONFLICT(true, NS_XSTREAM, "conflict"); +const TQName TQN_XSTREAM_CONNECTION_TIMEOUT(true, NS_XSTREAM, "connection-timeout"); +const TQName TQN_XSTREAM_HOST_GONE(true, NS_XSTREAM, "host-gone"); +const TQName TQN_XSTREAM_HOST_UNKNOWN(true, NS_XSTREAM, "host-unknown"); +const TQName TQN_XSTREAM_IMPROPER_ADDRESSIING(true, NS_XSTREAM, "improper-addressing"); +const TQName TQN_XSTREAM_INTERNAL_SERVER_ERROR(true, NS_XSTREAM, "internal-server-error"); +const TQName TQN_XSTREAM_INVALID_FROM(true, NS_XSTREAM, "invalid-from"); +const TQName TQN_XSTREAM_INVALID_ID(true, NS_XSTREAM, "invalid-id"); +const TQName TQN_XSTREAM_INVALID_NAMESPACE(true, NS_XSTREAM, "invalid-namespace"); +const TQName TQN_XSTREAM_INVALID_XML(true, NS_XSTREAM, "invalid-xml"); +const TQName TQN_XSTREAM_NOT_AUTHORIZED(true, NS_XSTREAM, "not-authorized"); +const TQName TQN_XSTREAM_POLICY_VIOLATION(true, NS_XSTREAM, "policy-violation"); +const TQName TQN_XSTREAM_REMOTE_CONNECTION_FAILED(true, NS_XSTREAM, "remote-connection-failed"); +const TQName TQN_XSTREAM_RESOURCE_CONSTRAINT(true, NS_XSTREAM, "resource-constraint"); +const TQName TQN_XSTREAM_RESTRICTED_XML(true, NS_XSTREAM, "restricted-xml"); +const TQName TQN_XSTREAM_SEE_OTHER_HOST(true, NS_XSTREAM, "see-other-host"); +const TQName TQN_XSTREAM_SYSTEM_SHUTDOWN(true, NS_XSTREAM, "system-shutdown"); +const TQName TQN_XSTREAM_UNDEFINED_CONDITION(true, NS_XSTREAM, "undefined-condition"); +const TQName TQN_XSTREAM_UNSUPPORTED_ENCODING(true, NS_XSTREAM, "unsupported-encoding"); +const TQName TQN_XSTREAM_UNSUPPORTED_STANZA_TYPE(true, NS_XSTREAM, "unsupported-stanza-type"); +const TQName TQN_XSTREAM_UNSUPPORTED_VERSION(true, NS_XSTREAM, "unsupported-version"); +const TQName TQN_XSTREAM_XML_NOT_WELL_FORMED(true, NS_XSTREAM, "xml-not-well-formed"); +const TQName TQN_XSTREAM_TEXT(true, NS_XSTREAM, "text"); + +const TQName TQN_TLS_STARTTLS(true, NS_TLS, "starttls"); +const TQName TQN_TLS_RETQUIRED(true, NS_TLS, "required"); +const TQName TQN_TLS_PROCEED(true, NS_TLS, "proceed"); +const TQName TQN_TLS_FAILURE(true, NS_TLS, "failure"); + +const TQName TQN_SASL_MECHANISMS(true, NS_SASL, "mechanisms"); +const TQName TQN_SASL_MECHANISM(true, NS_SASL, "mechanism"); +const TQName TQN_SASL_AUTH(true, NS_SASL, "auth"); +const TQName TQN_SASL_CHALLENGE(true, NS_SASL, "challenge"); +const TQName TQN_SASL_RESPONSE(true, NS_SASL, "response"); +const TQName TQN_SASL_ABORT(true, NS_SASL, "abort"); +const TQName TQN_SASL_SUCCESS(true, NS_SASL, "success"); +const TQName TQN_SASL_FAILURE(true, NS_SASL, "failure"); +const TQName TQN_SASL_ABORTED(true, NS_SASL, "aborted"); +const TQName TQN_SASL_INCORRECT_ENCODING(true, NS_SASL, "incorrect-encoding"); +const TQName TQN_SASL_INVALID_AUTHZID(true, NS_SASL, "invalid-authzid"); +const TQName TQN_SASL_INVALID_MECHANISM(true, NS_SASL, "invalid-mechanism"); +const TQName TQN_SASL_MECHANISM_TOO_WEAK(true, NS_SASL, "mechanism-too-weak"); +const TQName TQN_SASL_NOT_AUTHORIZED(true, NS_SASL, "not-authorized"); +const TQName TQN_SASL_TEMPORARY_AUTH_FAILURE(true, NS_SASL, "temporary-auth-failure"); + +const TQName TQN_DIALBACK_RESULT(true, NS_DIALBACK, "result"); +const TQName TQN_DIALBACK_VERIFY(true, NS_DIALBACK, "verify"); + +const TQName TQN_STANZA_BAD_REQUEST(true, NS_STANZA, "bad-request"); +const TQName TQN_STANZA_CONFLICT(true, NS_STANZA, "conflict"); +const TQName TQN_STANZA_FEATURE_NOT_IMPLEMENTED(true, NS_STANZA, "feature-not-implemented"); +const TQName TQN_STANZA_FORBIDDEN(true, NS_STANZA, "forbidden"); +const TQName TQN_STANZA_GONE(true, NS_STANZA, "gone"); +const TQName TQN_STANZA_INTERNAL_SERVER_ERROR(true, NS_STANZA, "internal-server-error"); +const TQName TQN_STANZA_ITEM_NOT_FOUND(true, NS_STANZA, "item-not-found"); +const TQName TQN_STANZA_JID_MALFORMED(true, NS_STANZA, "jid-malformed"); +const TQName TQN_STANZA_NOT_ACCEPTABLE(true, NS_STANZA, "not-acceptable"); +const TQName TQN_STANZA_NOT_ALLOWED(true, NS_STANZA, "not-allowed"); +const TQName TQN_STANZA_PAYMENT_RETQUIRED(true, NS_STANZA, "payment-required"); +const TQName TQN_STANZA_RECIPIENT_UNAVAILABLE(true, NS_STANZA, "recipient-unavailable"); +const TQName TQN_STANZA_REDIRECT(true, NS_STANZA, "redirect"); +const TQName TQN_STANZA_REGISTRATION_RETQUIRED(true, NS_STANZA, "registration-required"); +const TQName TQN_STANZA_REMOTE_SERVER_NOT_FOUND(true, NS_STANZA, "remote-server-not-found"); +const TQName TQN_STANZA_REMOTE_SERVER_TIMEOUT(true, NS_STANZA, "remote-server-timeout"); +const TQName TQN_STANZA_RESOURCE_CONSTRAINT(true, NS_STANZA, "resource-constraint"); +const TQName TQN_STANZA_SERVICE_UNAVAILABLE(true, NS_STANZA, "service-unavailable"); +const TQName TQN_STANZA_SUBSCRIPTION_RETQUIRED(true, NS_STANZA, "subscription-required"); +const TQName TQN_STANZA_UNDEFINED_CONDITION(true, NS_STANZA, "undefined-condition"); +const TQName TQN_STANZA_UNEXPECTED_REQUEST(true, NS_STANZA, "unexpected-request"); +const TQName TQN_STANZA_TEXT(true, NS_STANZA, "text"); + +const TQName TQN_BIND_BIND(true, NS_BIND, "bind"); +const TQName TQN_BIND_RESOURCE(true, NS_BIND, "resource"); +const TQName TQN_BIND_JID(true, NS_BIND, "jid"); + +const TQName TQN_MESSAGE(true, NS_CLIENT, "message"); +const TQName TQN_BODY(true, NS_CLIENT, "body"); +const TQName TQN_SUBJECT(true, NS_CLIENT, "subject"); +const TQName TQN_THREAD(true, NS_CLIENT, "thread"); +const TQName TQN_PRESENCE(true, NS_CLIENT, "presence"); +const TQName TQN_SHOW(true, NS_CLIENT, "show"); +const TQName TQN_STATUS(true, NS_CLIENT, "status"); +const TQName TQN_LANG(true, NS_CLIENT, "lang"); +const TQName TQN_PRIORITY(true, NS_CLIENT, "priority"); +const TQName TQN_IQ(true, NS_CLIENT, "iq"); +const TQName TQN_ERROR(true, NS_CLIENT, "error"); + +const TQName TQN_SERVER_MESSAGE(true, NS_SERVER, "message"); +const TQName TQN_SERVER_BODY(true, NS_SERVER, "body"); +const TQName TQN_SERVER_SUBJECT(true, NS_SERVER, "subject"); +const TQName TQN_SERVER_THREAD(true, NS_SERVER, "thread"); +const TQName TQN_SERVER_PRESENCE(true, NS_SERVER, "presence"); +const TQName TQN_SERVER_SHOW(true, NS_SERVER, "show"); +const TQName TQN_SERVER_STATUS(true, NS_SERVER, "status"); +const TQName TQN_SERVER_LANG(true, NS_SERVER, "lang"); +const TQName TQN_SERVER_PRIORITY(true, NS_SERVER, "priority"); +const TQName TQN_SERVER_IQ(true, NS_SERVER, "iq"); +const TQName TQN_SERVER_ERROR(true, NS_SERVER, "error"); + +const TQName TQN_SESSION_SESSION(true, NS_SESSION, "session"); + +const TQName TQN_PRIVACY_TQUERY(true, NS_PRIVACY, "query"); +const TQName TQN_PRIVACY_ACTIVE(true, NS_PRIVACY, "active"); +const TQName TQN_PRIVACY_DEFAULT(true, NS_PRIVACY, "default"); +const TQName TQN_PRIVACY_LIST(true, NS_PRIVACY, "list"); +const TQName TQN_PRIVACY_ITEM(true, NS_PRIVACY, "item"); +const TQName TQN_PRIVACY_IQ(true, NS_PRIVACY, "iq"); +const TQName TQN_PRIVACY_MESSAGE(true, NS_PRIVACY, "message"); +const TQName TQN_PRIVACY_PRESENCE_IN(true, NS_PRIVACY, "presence-in"); +const TQName TQN_PRIVACY_PRESENCE_OUT(true, NS_PRIVACY, "presence-out"); + +const TQName TQN_ROSTER_TQUERY(true, NS_ROSTER, "query"); +const TQName TQN_ROSTER_ITEM(true, NS_ROSTER, "item"); +const TQName TQN_ROSTER_GROUP(true, NS_ROSTER, "group"); + +const TQName TQN_VCARD_TQUERY(true, NS_VCARD, "vCard"); +const TQName TQN_VCARD_FN(true, NS_VCARD, "FN"); + +const TQName TQN_XML_LANG(true, NS_XML, "lang"); const std::string STR_TYPE("type"); const std::string STR_ID("id"); @@ -268,26 +268,26 @@ const std::string STR_JID("jid"); const std::string STR_SUBSCRIPTION("subscription"); const std::string STR_ASK("ask"); -const QName QN_ENCODING(true, STR_EMPTY, STR_ENCODING); -const QName QN_VERSION(true, STR_EMPTY, STR_VERSION); -const QName QN_TO(true, STR_EMPTY, "to"); -const QName QN_FROM(true, STR_EMPTY, "from"); -const QName QN_TYPE(true, STR_EMPTY, "type"); -const QName QN_ID(true, STR_EMPTY, "id"); -const QName QN_CODE(true, STR_EMPTY, "code"); -const QName QN_NAME(true, STR_EMPTY, "name"); -const QName QN_VALUE(true, STR_EMPTY, "value"); -const QName QN_ACTION(true, STR_EMPTY, "action"); -const QName QN_ORDER(true, STR_EMPTY, "order"); -const QName QN_MECHANISM(true, STR_EMPTY, "mechanism"); -const QName QN_ASK(true, STR_EMPTY, "ask"); -const QName QN_JID(true, STR_EMPTY, "jid"); -const QName QN_SUBSCRIPTION(true, STR_EMPTY, "subscription"); -const QName QN_SOURCE(true, STR_EMPTY, "source"); - -const QName QN_XMLNS_CLIENT(true, NS_XMLNS, STR_CLIENT); -const QName QN_XMLNS_SERVER(true, NS_XMLNS, STR_SERVER); -const QName QN_XMLNS_STREAM(true, NS_XMLNS, STR_STREAM); +const TQName TQN_ENCODING(true, STR_EMPTY, STR_ENCODING); +const TQName TQN_VERSION(true, STR_EMPTY, STR_VERSION); +const TQName TQN_TO(true, STR_EMPTY, "to"); +const TQName TQN_FROM(true, STR_EMPTY, "from"); +const TQName TQN_TYPE(true, STR_EMPTY, "type"); +const TQName TQN_ID(true, STR_EMPTY, "id"); +const TQName TQN_CODE(true, STR_EMPTY, "code"); +const TQName TQN_NAME(true, STR_EMPTY, "name"); +const TQName TQN_VALUE(true, STR_EMPTY, "value"); +const TQName TQN_ACTION(true, STR_EMPTY, "action"); +const TQName TQN_ORDER(true, STR_EMPTY, "order"); +const TQName TQN_MECHANISM(true, STR_EMPTY, "mechanism"); +const TQName TQN_ASK(true, STR_EMPTY, "ask"); +const TQName TQN_JID(true, STR_EMPTY, "jid"); +const TQName TQN_SUBSCRIPTION(true, STR_EMPTY, "subscription"); +const TQName TQN_SOURCE(true, STR_EMPTY, "source"); + +const TQName TQN_XMLNS_CLIENT(true, NS_XMLNS, STR_CLIENT); +const TQName TQN_XMLNS_SERVER(true, NS_XMLNS, STR_SERVER); +const TQName TQN_XMLNS_STREAM(true, NS_XMLNS, STR_STREAM); // Presence const std::string STR_SHOW_AWAY("away"); @@ -303,29 +303,29 @@ const std::string STR_UNSUBSCRIBED("unsubscribed"); // JEP 0030 -const QName QN_NODE(true, STR_EMPTY, "node"); -const QName QN_CATEGORY(true, STR_EMPTY, "category"); -const QName QN_VAR(true, STR_EMPTY, "var"); +const TQName TQN_NODE(true, STR_EMPTY, "node"); +const TQName TQN_CATEGORY(true, STR_EMPTY, "category"); +const TQName TQN_VAR(true, STR_EMPTY, "var"); const std::string NS_DISCO_INFO("http://jabber.org/protocol/disco#info"); const std::string NS_DISCO_ITEMS("http://jabber.org/protocol/disco#items"); -const QName QN_DISCO_INFO_QUERY(true, NS_DISCO_INFO, "query"); -const QName QN_DISCO_IDENTITY(true, NS_DISCO_INFO, "identity"); -const QName QN_DISCO_FEATURE(true, NS_DISCO_INFO, "feature"); +const TQName TQN_DISCO_INFO_TQUERY(true, NS_DISCO_INFO, "query"); +const TQName TQN_DISCO_IDENTITY(true, NS_DISCO_INFO, "identity"); +const TQName TQN_DISCO_FEATURE(true, NS_DISCO_INFO, "feature"); -const QName QN_DISCO_ITEMS_QUERY(true, NS_DISCO_ITEMS, "query"); -const QName QN_DISCO_ITEM(true, NS_DISCO_ITEMS, "item"); +const TQName TQN_DISCO_ITEMS_TQUERY(true, NS_DISCO_ITEMS, "query"); +const TQName TQN_DISCO_ITEM(true, NS_DISCO_ITEMS, "item"); // JEP 0115 const std::string NS_CAPS("http://jabber.org/protocol/caps"); -const QName QN_CAPS_C(true, NS_CAPS, "c"); -const QName QN_VER(true, STR_EMPTY, "ver"); -const QName QN_EXT(true, STR_EMPTY, "ext"); +const TQName TQN_CAPS_C(true, NS_CAPS, "c"); +const TQName TQN_VER(true, STR_EMPTY, "ver"); +const TQName TQN_EXT(true, STR_EMPTY, "ext"); // JEP 0091 Delayed Delivery const std::string kNSDelay("jabber:x:delay"); -const QName kQnDelayX(true, kNSDelay, "x"); -const QName kQnStamp(true, STR_EMPTY, "stamp"); +const TQName kQnDelayX(true, kNSDelay, "x"); +const TQName kQnStamp(true, STR_EMPTY, "stamp"); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h index b05af965..00ff8e8d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h @@ -29,7 +29,7 @@ #define _CRICKET_XMPP_XMPPLIB_BUZZ_CONSTANTS_H_ #include <string> -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmpp/jid.h" @@ -108,152 +108,152 @@ extern const std::string STR_DEFAULT_DOMAIN; extern const std::string STR_UNAVAILABLE; extern const std::string STR_INVISIBLE; -extern const QName QN_STREAM_STREAM; -extern const QName QN_STREAM_FEATURES; -extern const QName QN_STREAM_ERROR; - -extern const QName QN_XSTREAM_BAD_FORMAT; -extern const QName QN_XSTREAM_BAD_NAMESPACE_PREFIX; -extern const QName QN_XSTREAM_CONFLICT; -extern const QName QN_XSTREAM_CONNECTION_TIMEOUT; -extern const QName QN_XSTREAM_HOST_GONE; -extern const QName QN_XSTREAM_HOST_UNKNOWN; -extern const QName QN_XSTREAM_IMPROPER_ADDRESSIING; -extern const QName QN_XSTREAM_INTERNAL_SERVER_ERROR; -extern const QName QN_XSTREAM_INVALID_FROM; -extern const QName QN_XSTREAM_INVALID_ID; -extern const QName QN_XSTREAM_INVALID_NAMESPACE; -extern const QName QN_XSTREAM_INVALID_XML; -extern const QName QN_XSTREAM_NOT_AUTHORIZED; -extern const QName QN_XSTREAM_POLICY_VIOLATION; -extern const QName QN_XSTREAM_REMOTE_CONNECTION_FAILED; -extern const QName QN_XSTREAM_RESOURCE_CONSTRAINT; -extern const QName QN_XSTREAM_RESTRICTED_XML; -extern const QName QN_XSTREAM_SEE_OTHER_HOST; -extern const QName QN_XSTREAM_SYSTEM_SHUTDOWN; -extern const QName QN_XSTREAM_UNDEFINED_CONDITION; -extern const QName QN_XSTREAM_UNSUPPORTED_ENCODING; -extern const QName QN_XSTREAM_UNSUPPORTED_STANZA_TYPE; -extern const QName QN_XSTREAM_UNSUPPORTED_VERSION; -extern const QName QN_XSTREAM_XML_NOT_WELL_FORMED; -extern const QName QN_XSTREAM_TEXT; - -extern const QName QN_TLS_STARTTLS; -extern const QName QN_TLS_REQUIRED; -extern const QName QN_TLS_PROCEED; -extern const QName QN_TLS_FAILURE; - -extern const QName QN_SASL_MECHANISMS; -extern const QName QN_SASL_MECHANISM; -extern const QName QN_SASL_AUTH; -extern const QName QN_SASL_CHALLENGE; -extern const QName QN_SASL_RESPONSE; -extern const QName QN_SASL_ABORT; -extern const QName QN_SASL_SUCCESS; -extern const QName QN_SASL_FAILURE; -extern const QName QN_SASL_ABORTED; -extern const QName QN_SASL_INCORRECT_ENCODING; -extern const QName QN_SASL_INVALID_AUTHZID; -extern const QName QN_SASL_INVALID_MECHANISM; -extern const QName QN_SASL_MECHANISM_TOO_WEAK; -extern const QName QN_SASL_NOT_AUTHORIZED; -extern const QName QN_SASL_TEMPORARY_AUTH_FAILURE; - -extern const QName QN_DIALBACK_RESULT; -extern const QName QN_DIALBACK_VERIFY; - -extern const QName QN_STANZA_BAD_REQUEST; -extern const QName QN_STANZA_CONFLICT; -extern const QName QN_STANZA_FEATURE_NOT_IMPLEMENTED; -extern const QName QN_STANZA_FORBIDDEN; -extern const QName QN_STANZA_GONE; -extern const QName QN_STANZA_INTERNAL_SERVER_ERROR; -extern const QName QN_STANZA_ITEM_NOT_FOUND; -extern const QName QN_STANZA_JID_MALFORMED; -extern const QName QN_STANZA_NOT_ACCEPTABLE; -extern const QName QN_STANZA_NOT_ALLOWED; -extern const QName QN_STANZA_PAYMENT_REQUIRED; -extern const QName QN_STANZA_RECIPIENT_UNAVAILABLE; -extern const QName QN_STANZA_REDIRECT; -extern const QName QN_STANZA_REGISTRATION_REQUIRED; -extern const QName QN_STANZA_REMOTE_SERVER_NOT_FOUND; -extern const QName QN_STANZA_REMOTE_SERVER_TIMEOUT; -extern const QName QN_STANZA_RESOURCE_CONSTRAINT; -extern const QName QN_STANZA_SERVICE_UNAVAILABLE; -extern const QName QN_STANZA_SUBSCRIPTION_REQUIRED; -extern const QName QN_STANZA_UNDEFINED_CONDITION; -extern const QName QN_STANZA_UNEXPECTED_REQUEST; -extern const QName QN_STANZA_TEXT; - -extern const QName QN_BIND_BIND; -extern const QName QN_BIND_RESOURCE; -extern const QName QN_BIND_JID; - -extern const QName QN_MESSAGE; -extern const QName QN_BODY; -extern const QName QN_SUBJECT; -extern const QName QN_THREAD; -extern const QName QN_PRESENCE; -extern const QName QN_SHOW; -extern const QName QN_STATUS; -extern const QName QN_LANG; -extern const QName QN_PRIORITY; -extern const QName QN_IQ; -extern const QName QN_ERROR; - -extern const QName QN_SERVER_MESSAGE; -extern const QName QN_SERVER_BODY; -extern const QName QN_SERVER_SUBJECT; -extern const QName QN_SERVER_THREAD; -extern const QName QN_SERVER_PRESENCE; -extern const QName QN_SERVER_SHOW; -extern const QName QN_SERVER_STATUS; -extern const QName QN_SERVER_LANG; -extern const QName QN_SERVER_PRIORITY; -extern const QName QN_SERVER_IQ; -extern const QName QN_SERVER_ERROR; - -extern const QName QN_SESSION_SESSION; - -extern const QName QN_PRIVACY_QUERY; -extern const QName QN_PRIVACY_ACTIVE; -extern const QName QN_PRIVACY_DEFAULT; -extern const QName QN_PRIVACY_LIST; -extern const QName QN_PRIVACY_ITEM; -extern const QName QN_PRIVACY_IQ; -extern const QName QN_PRIVACY_MESSAGE; -extern const QName QN_PRIVACY_PRESENCE_IN; -extern const QName QN_PRIVACY_PRESENCE_OUT; - -extern const QName QN_ROSTER_QUERY; -extern const QName QN_ROSTER_ITEM; -extern const QName QN_ROSTER_GROUP; - -extern const QName QN_VCARD_QUERY; -extern const QName QN_VCARD_FN; - -extern const QName QN_XML_LANG; - -extern const QName QN_ENCODING; -extern const QName QN_VERSION; -extern const QName QN_TO; -extern const QName QN_FROM; -extern const QName QN_TYPE; -extern const QName QN_ID; -extern const QName QN_CODE; -extern const QName QN_NAME; -extern const QName QN_VALUE; -extern const QName QN_ACTION; -extern const QName QN_ORDER; -extern const QName QN_MECHANISM; -extern const QName QN_ASK; -extern const QName QN_JID; -extern const QName QN_SUBSCRIPTION; - - -extern const QName QN_XMLNS_CLIENT; -extern const QName QN_XMLNS_SERVER; -extern const QName QN_XMLNS_STREAM; +extern const TQName TQN_STREAM_STREAM; +extern const TQName TQN_STREAM_FEATURES; +extern const TQName TQN_STREAM_ERROR; + +extern const TQName TQN_XSTREAM_BAD_FORMAT; +extern const TQName TQN_XSTREAM_BAD_NAMESPACE_PREFIX; +extern const TQName TQN_XSTREAM_CONFLICT; +extern const TQName TQN_XSTREAM_CONNECTION_TIMEOUT; +extern const TQName TQN_XSTREAM_HOST_GONE; +extern const TQName TQN_XSTREAM_HOST_UNKNOWN; +extern const TQName TQN_XSTREAM_IMPROPER_ADDRESSIING; +extern const TQName TQN_XSTREAM_INTERNAL_SERVER_ERROR; +extern const TQName TQN_XSTREAM_INVALID_FROM; +extern const TQName TQN_XSTREAM_INVALID_ID; +extern const TQName TQN_XSTREAM_INVALID_NAMESPACE; +extern const TQName TQN_XSTREAM_INVALID_XML; +extern const TQName TQN_XSTREAM_NOT_AUTHORIZED; +extern const TQName TQN_XSTREAM_POLICY_VIOLATION; +extern const TQName TQN_XSTREAM_REMOTE_CONNECTION_FAILED; +extern const TQName TQN_XSTREAM_RESOURCE_CONSTRAINT; +extern const TQName TQN_XSTREAM_RESTRICTED_XML; +extern const TQName TQN_XSTREAM_SEE_OTHER_HOST; +extern const TQName TQN_XSTREAM_SYSTEM_SHUTDOWN; +extern const TQName TQN_XSTREAM_UNDEFINED_CONDITION; +extern const TQName TQN_XSTREAM_UNSUPPORTED_ENCODING; +extern const TQName TQN_XSTREAM_UNSUPPORTED_STANZA_TYPE; +extern const TQName TQN_XSTREAM_UNSUPPORTED_VERSION; +extern const TQName TQN_XSTREAM_XML_NOT_WELL_FORMED; +extern const TQName TQN_XSTREAM_TEXT; + +extern const TQName TQN_TLS_STARTTLS; +extern const TQName TQN_TLS_RETQUIRED; +extern const TQName TQN_TLS_PROCEED; +extern const TQName TQN_TLS_FAILURE; + +extern const TQName TQN_SASL_MECHANISMS; +extern const TQName TQN_SASL_MECHANISM; +extern const TQName TQN_SASL_AUTH; +extern const TQName TQN_SASL_CHALLENGE; +extern const TQName TQN_SASL_RESPONSE; +extern const TQName TQN_SASL_ABORT; +extern const TQName TQN_SASL_SUCCESS; +extern const TQName TQN_SASL_FAILURE; +extern const TQName TQN_SASL_ABORTED; +extern const TQName TQN_SASL_INCORRECT_ENCODING; +extern const TQName TQN_SASL_INVALID_AUTHZID; +extern const TQName TQN_SASL_INVALID_MECHANISM; +extern const TQName TQN_SASL_MECHANISM_TOO_WEAK; +extern const TQName TQN_SASL_NOT_AUTHORIZED; +extern const TQName TQN_SASL_TEMPORARY_AUTH_FAILURE; + +extern const TQName TQN_DIALBACK_RESULT; +extern const TQName TQN_DIALBACK_VERIFY; + +extern const TQName TQN_STANZA_BAD_REQUEST; +extern const TQName TQN_STANZA_CONFLICT; +extern const TQName TQN_STANZA_FEATURE_NOT_IMPLEMENTED; +extern const TQName TQN_STANZA_FORBIDDEN; +extern const TQName TQN_STANZA_GONE; +extern const TQName TQN_STANZA_INTERNAL_SERVER_ERROR; +extern const TQName TQN_STANZA_ITEM_NOT_FOUND; +extern const TQName TQN_STANZA_JID_MALFORMED; +extern const TQName TQN_STANZA_NOT_ACCEPTABLE; +extern const TQName TQN_STANZA_NOT_ALLOWED; +extern const TQName TQN_STANZA_PAYMENT_RETQUIRED; +extern const TQName TQN_STANZA_RECIPIENT_UNAVAILABLE; +extern const TQName TQN_STANZA_REDIRECT; +extern const TQName TQN_STANZA_REGISTRATION_RETQUIRED; +extern const TQName TQN_STANZA_REMOTE_SERVER_NOT_FOUND; +extern const TQName TQN_STANZA_REMOTE_SERVER_TIMEOUT; +extern const TQName TQN_STANZA_RESOURCE_CONSTRAINT; +extern const TQName TQN_STANZA_SERVICE_UNAVAILABLE; +extern const TQName TQN_STANZA_SUBSCRIPTION_RETQUIRED; +extern const TQName TQN_STANZA_UNDEFINED_CONDITION; +extern const TQName TQN_STANZA_UNEXPECTED_REQUEST; +extern const TQName TQN_STANZA_TEXT; + +extern const TQName TQN_BIND_BIND; +extern const TQName TQN_BIND_RESOURCE; +extern const TQName TQN_BIND_JID; + +extern const TQName TQN_MESSAGE; +extern const TQName TQN_BODY; +extern const TQName TQN_SUBJECT; +extern const TQName TQN_THREAD; +extern const TQName TQN_PRESENCE; +extern const TQName TQN_SHOW; +extern const TQName TQN_STATUS; +extern const TQName TQN_LANG; +extern const TQName TQN_PRIORITY; +extern const TQName TQN_IQ; +extern const TQName TQN_ERROR; + +extern const TQName TQN_SERVER_MESSAGE; +extern const TQName TQN_SERVER_BODY; +extern const TQName TQN_SERVER_SUBJECT; +extern const TQName TQN_SERVER_THREAD; +extern const TQName TQN_SERVER_PRESENCE; +extern const TQName TQN_SERVER_SHOW; +extern const TQName TQN_SERVER_STATUS; +extern const TQName TQN_SERVER_LANG; +extern const TQName TQN_SERVER_PRIORITY; +extern const TQName TQN_SERVER_IQ; +extern const TQName TQN_SERVER_ERROR; + +extern const TQName TQN_SESSION_SESSION; + +extern const TQName TQN_PRIVACY_TQUERY; +extern const TQName TQN_PRIVACY_ACTIVE; +extern const TQName TQN_PRIVACY_DEFAULT; +extern const TQName TQN_PRIVACY_LIST; +extern const TQName TQN_PRIVACY_ITEM; +extern const TQName TQN_PRIVACY_IQ; +extern const TQName TQN_PRIVACY_MESSAGE; +extern const TQName TQN_PRIVACY_PRESENCE_IN; +extern const TQName TQN_PRIVACY_PRESENCE_OUT; + +extern const TQName TQN_ROSTER_TQUERY; +extern const TQName TQN_ROSTER_ITEM; +extern const TQName TQN_ROSTER_GROUP; + +extern const TQName TQN_VCARD_TQUERY; +extern const TQName TQN_VCARD_FN; + +extern const TQName TQN_XML_LANG; + +extern const TQName TQN_ENCODING; +extern const TQName TQN_VERSION; +extern const TQName TQN_TO; +extern const TQName TQN_FROM; +extern const TQName TQN_TYPE; +extern const TQName TQN_ID; +extern const TQName TQN_CODE; +extern const TQName TQN_NAME; +extern const TQName TQN_VALUE; +extern const TQName TQN_ACTION; +extern const TQName TQN_ORDER; +extern const TQName TQN_MECHANISM; +extern const TQName TQN_ASK; +extern const TQName TQN_JID; +extern const TQName TQN_SUBSCRIPTION; + + +extern const TQName TQN_XMLNS_CLIENT; +extern const TQName TQN_XMLNS_SERVER; +extern const TQName TQN_XMLNS_STREAM; // Presence extern const std::string STR_SHOW_AWAY; @@ -269,31 +269,31 @@ extern const std::string STR_UNSUBSCRIBED; // JEP 0030 -extern const QName QN_NODE; -extern const QName QN_CATEGORY; -extern const QName QN_VAR; +extern const TQName TQN_NODE; +extern const TQName TQN_CATEGORY; +extern const TQName TQN_VAR; extern const std::string NS_DISCO_INFO; extern const std::string NS_DISCO_ITEMS; -extern const QName QN_DISCO_INFO_QUERY; -extern const QName QN_DISCO_IDENTITY; -extern const QName QN_DISCO_FEATURE; +extern const TQName TQN_DISCO_INFO_TQUERY; +extern const TQName TQN_DISCO_IDENTITY; +extern const TQName TQN_DISCO_FEATURE; -extern const QName QN_DISCO_ITEMS_QUERY; -extern const QName QN_DISCO_ITEM; +extern const TQName TQN_DISCO_ITEMS_TQUERY; +extern const TQName TQN_DISCO_ITEM; // JEP 0115 extern const std::string NS_CAPS; -extern const QName QN_CAPS_C; -extern const QName QN_VER; -extern const QName QN_EXT; +extern const TQName TQN_CAPS_C; +extern const TQName TQN_VER; +extern const TQName TQN_EXT; // JEP 0091 Delayed Delivery extern const std::string kNSDelay; -extern const QName kQnDelayX; -extern const QName kQnStamp; +extern const TQName kQnDelayX; +extern const TQName kQnStamp; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc index b742e03a..48a89504 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc @@ -56,13 +56,13 @@ Jid::Jid(const std::string & jid_string) { } // First find the slash and slice of that part - size_t slash = jid_string.find('/'); + size_t slash = jid_string.tqfind('/'); std::string resource_name = (slash == std::string::npos ? STR_EMPTY : jid_string.substr(slash + 1)); // Now look for the node std::string node_name; - size_t at = jid_string.find('@'); + size_t at = jid_string.tqfind('@'); size_t domain_begin; if (at < slash && at != std::string::npos) { node_name = jid_string.substr(0, at); @@ -80,13 +80,13 @@ Jid::Jid(const std::string & jid_string) { // avoid allocating these constants repeatedly std::string domain_name; - if (domain_length == 9 && jid_string.find("gmail.com", domain_begin) == domain_begin) { + if (domain_length == 9 && jid_string.tqfind("gmail.com", domain_begin) == domain_begin) { domain_name = STR_GMAIL_COM; } - else if (domain_length == 14 && jid_string.find("googlemail.com", domain_begin) == domain_begin) { + else if (domain_length == 14 && jid_string.tqfind("googlemail.com", domain_begin) == domain_begin) { domain_name = STR_GOOGLEMAIL_COM; } - else if (domain_length == 10 && jid_string.find("google.com", domain_begin) == domain_begin) { + else if (domain_length == 10 && jid_string.tqfind("google.com", domain_begin) == domain_begin) { domain_name = STR_GOOGLE_COM; } else { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h index 659820f5..488dc56e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h @@ -49,7 +49,7 @@ public: return ""; } - std::vector<std::string>::const_iterator it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN"); + std::vector<std::string>::const_iterator it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN"); if (it == mechanisms.end()) { return ""; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h index a6630d90..dbd56a24 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h @@ -44,8 +44,8 @@ public: virtual XmlElement * StartSaslAuth() { // send initial request - XmlElement * el = new XmlElement(QN_SASL_AUTH, true); - el->AddAttr(QN_MECHANISM, mechanism_); + XmlElement * el = new XmlElement(TQN_SASL_AUTH, true); + el->AddAttr(TQN_MECHANISM, mechanism_); std::string credential; credential.append("\0", 1); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc index 092df104..4a6d7c24 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc @@ -34,12 +34,12 @@ namespace buzz { XmlElement * SaslMechanism::StartSaslAuth() { - return new XmlElement(QN_SASL_AUTH, true); + return new XmlElement(TQN_SASL_AUTH, true); } XmlElement * SaslMechanism::HandleSaslChallenge(const XmlElement * challenge) { - return new XmlElement(QN_SASL_ABORT, true); + return new XmlElement(TQN_SASL_ABORT, true); } void diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h index 7e0b0562..2d8c1b76 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h @@ -43,8 +43,8 @@ public: virtual XmlElement * StartSaslAuth() { // send initial request - XmlElement * el = new XmlElement(QN_SASL_AUTH, true); - el->AddAttr(QN_MECHANISM, "PLAIN"); + XmlElement * el = new XmlElement(TQN_SASL_AUTH, true); + el->AddAttr(TQN_MECHANISM, "PLAIN"); FormatXmppPassword credential; credential.Append("\0", 1); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc index 959b6f88..f5b9d0b4 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc @@ -86,7 +86,7 @@ public: void OnSocketClosed(); }; -XmppReturnStatus +XmppReturntqStatus XmppClient::Connect(const XmppClientSettings & settings, AsyncSocket * socket, PreXmppAuth * pre_auth) { if (socket == NULL) return XMPP_RETURN_BADARGUMENT; @@ -237,7 +237,7 @@ XmppClient::ProcessResponse() { return STATE_BLOCKED; } -XmppReturnStatus +XmppReturntqStatus XmppClient::Disconnect() { if (d_->socket_.get() == NULL) return XMPP_RETURN_BADSTATE; @@ -245,7 +245,7 @@ XmppClient::Disconnect() { return XMPP_RETURN_OK; } -XmppClient::XmppClient(Task * parent) : Task(parent), +XmppClient::XmppClient(Task * tqparent) : Task(tqparent), delivering_signal_(false) { d_.reset(new Private(this)); } @@ -263,17 +263,17 @@ XmppClient::NextId() { return d_->engine_->NextId(); } -XmppReturnStatus +XmppReturntqStatus XmppClient::SendStanza(const XmlElement * stanza) { return d_->engine_->SendStanza(stanza); } -XmppReturnStatus +XmppReturntqStatus XmppClient::SendStanzaError(const XmlElement * old_stanza, XmppStanzaError xse, const std::string & message) { return d_->engine_->SendStanzaError(old_stanza, xse, message); } -XmppReturnStatus +XmppReturntqStatus XmppClient::SendRaw(const std::string & text) { return d_->engine_->SendRaw(text); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h index f8b4798c..540d774d 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 parent task for XmppTasks. +// See Task first. XmppClient is a tqparent task for XmppTasks. // -// XmppClient is a task which is designed to be the parent task for +// XmppClient is a task which is designed to be the tqparent 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,17 +71,17 @@ class CaptchaChallenge; class XmppClient : public Task, public sigslot::has_slots<> { public: - XmppClient(Task * parent); + XmppClient(Task * tqparent); ~XmppClient(); - XmppReturnStatus Connect(const XmppClientSettings & settings, + XmppReturntqStatus Connect(const XmppClientSettings & settings, AsyncSocket * socket, PreXmppAuth * preauth); virtual Task * GetParent(int code); virtual int ProcessStart(); virtual int ProcessResponse(); - XmppReturnStatus Disconnect(); + XmppReturntqStatus Disconnect(); const Jid & jid(); sigslot::signal1<XmppEngine::State> SignalStateChange; @@ -97,9 +97,9 @@ public: std::string GetAuthCookie(); std::string NextId(); - XmppReturnStatus SendStanza(const XmlElement *stanza); - XmppReturnStatus SendRaw(const std::string & text); - XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, + XmppReturntqStatus SendStanza(const XmlElement *stanza); + XmppReturntqStatus SendRaw(const std::string & text); + XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal, XmppStanzaError code, const std::string & text); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h index ef8f2ea8..58576328 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h @@ -30,7 +30,7 @@ // also part of the API #include "talk/xmpp/jid.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmllite/xmlelement.h" @@ -53,22 +53,22 @@ enum XmppStanzaError { XSE_JID_MALFORMED, XSE_NOT_ACCEPTABLE, XSE_NOT_ALLOWED, - XSE_PAYMENT_REQUIRED, + XSE_PAYMENT_RETQUIRED, XSE_RECIPIENT_UNAVAILABLE, XSE_REDIRECT, - XSE_REGISTRATION_REQUIRED, + XSE_REGISTRATION_RETQUIRED, XSE_SERVER_NOT_FOUND, XSE_SERVER_TIMEOUT, XSE_RESOURCE_CONSTRAINT, XSE_SERVICE_UNAVAILABLE, - XSE_SUBSCRIPTION_REQUIRED, + XSE_SUBSCRIPTION_RETQUIRED, XSE_UNDEFINED_CONDITION, XSE_UNEXPECTED_REQUEST, }; -// XmppReturnStatus +// XmppReturntqStatus // This is used by API functions to synchronously return status. -enum XmppReturnStatus { +enum XmppReturntqStatus { XMPP_RETURN_OK, XMPP_RETURN_BADARGUMENT, XMPP_RETURN_BADSTATE, @@ -171,34 +171,34 @@ public: // SOCKET INPUT AND OUTPUT ------------------------------------------------ //! Registers the handler for socket output - virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0; + virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0; //! Provides socket input to the engine - virtual XmppReturnStatus HandleInput(const char * bytes, size_t len) = 0; + virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len) = 0; //! Advises the engine that the socket has closed - virtual XmppReturnStatus ConnectionClosed() = 0; + virtual XmppReturntqStatus ConnectionClosed() = 0; // SESSION SETUP --------------------------------------------------------- //! Indicates the (bare) JID for the user to use. - virtual XmppReturnStatus SetUser(const Jid & jid)= 0; + virtual XmppReturntqStatus SetUser(const Jid & jid)= 0; //! Get the login (bare) JID. virtual const Jid & GetUser() = 0; //! Provides different methods for credentials for login. //! Takes ownership of this object; deletes when login is done - virtual XmppReturnStatus SetSaslHandler(SaslHandler * h) = 0; + virtual XmppReturntqStatus SetSaslHandler(SaslHandler * h) = 0; //! Sets whether TLS will be used within the connection (default true). - virtual XmppReturnStatus SetUseTls(bool useTls) = 0; + virtual XmppReturntqStatus SetUseTls(bool useTls) = 0; //! Sets an alternate domain from which we allows TLS certificates. //! This is for use in the case where a we want to allow a proxy to //! serve up its own certificate rather than one owned by the underlying //! domain. - virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain) = 0; + virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain) = 0; //! Gets whether TLS will be used within the connection. virtual bool GetUseTls() = 0; @@ -206,7 +206,7 @@ public: //! Sets the request resource name, if any (optional). //! Note that the resource name may be overridden by the server; after //! binding, the actual resource name is available as part of FullJid(). - virtual XmppReturnStatus SetRequestedResource(const std::string& resource) = 0; + virtual XmppReturntqStatus SetRequestedResource(const std::string& resource) = 0; //! Gets the request resource name. virtual const std::string & GetRequestedResource() = 0; @@ -214,12 +214,12 @@ public: // SESSION MANAGEMENT --------------------------------------------------- //! Set callback for state changes. - virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler) = 0; + virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler) = 0; //! Initiates the XMPP connection. //! After supplying connection settings, call this once to initiate, //! (optionally) encrypt, authenticate, and bind the connection. - virtual XmppReturnStatus Connect() = 0; + virtual XmppReturntqStatus Connect() = 0; //! The current engine state. virtual State GetState() = 0; @@ -240,7 +240,7 @@ public: //! Sends CloseConnection to output, and disconnects and registered //! session handlers. After Disconnect completes, it is guaranteed //! that no further callbacks will be made. - virtual XmppReturnStatus Disconnect() = 0; + virtual XmppReturntqStatus Disconnect() = 0; // APPLICATION USE ------------------------------------------------------- @@ -257,33 +257,33 @@ public: //! Adds a listener for session events. //! Stanza delivery is chained to session handlers; the first to //! return 'true' is the last to get each stanza. - virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0; + virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0; //! Removes a listener for session events. - virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0; + virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0; //! Sends a stanza to the server. - virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza) = 0; + virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza) = 0; //! Sends raw text to the server - virtual XmppReturnStatus SendRaw(const std::string & text) = 0; + virtual XmppReturntqStatus SendRaw(const std::string & text) = 0; //! Sends an iq to the server, and registers a callback for the result. //! Returns the cookie passed to the result handler. - virtual XmppReturnStatus SendIq(const XmlElement* pelStanza, + virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza, XmppIqHandler* iq_handler, XmppIqCookie* cookie) = 0; //! Unregisters an iq callback handler given its cookie. //! No callback will come to this handler after it's unregistered. - virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie, + virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie, XmppIqHandler** iq_handler) = 0; //! Forms and sends an error in response to the given stanza. //! Swaps to and from, sets type to "error", and adds error information //! based on the passed code. Text is optional and may be STR_EMPTY. - virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, + virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal, XmppStanzaError code, const std::string & text) = 0; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc index 173d711b..c9569524 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc @@ -85,7 +85,7 @@ XmppEngineImpl::~XmppEngineImpl() { DeleteIqCookies(); } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -95,7 +95,7 @@ XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -105,7 +105,7 @@ XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::HandleInput(const char * bytes, size_t len) { if (state_ < STATE_OPENING || state_ > STATE_OPEN) return XMPP_RETURN_BADSTATE; @@ -117,7 +117,7 @@ XmppEngineImpl::HandleInput(const char * bytes, size_t len) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::ConnectionClosed() { if (state_ != STATE_CLOSED) { EnterExit ee(this); @@ -128,7 +128,7 @@ XmppEngineImpl::ConnectionClosed() { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetUseTls(bool useTls) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -138,7 +138,7 @@ XmppEngineImpl::SetUseTls(bool useTls) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetTlsServerDomain(const std::string & tls_server_domain) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -153,7 +153,7 @@ XmppEngineImpl::GetUseTls() { return tls_needed_; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetUser(const Jid & jid) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -168,7 +168,7 @@ XmppEngineImpl::GetUser() { return user_jid_; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -177,7 +177,7 @@ XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetRequestedResource(const std::string & resource) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -192,7 +192,7 @@ XmppEngineImpl::GetRequestedResource() { return requested_resource_; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler, XmppEngine::HandlerLevel level) { if (state_ == STATE_CLOSED) @@ -203,7 +203,7 @@ XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler, return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) { bool found = false; @@ -227,7 +227,7 @@ XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::Connect() { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -245,7 +245,7 @@ XmppEngineImpl::Connect() { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendStanza(const XmlElement * element) { if (state_ == STATE_CLOSED) return XMPP_RETURN_BADSTATE; @@ -263,7 +263,7 @@ XmppEngineImpl::SendStanza(const XmlElement * element) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendRaw(const std::string & text) { if (state_ == STATE_CLOSED || login_task_.get()) return XMPP_RETURN_BADSTATE; @@ -282,7 +282,7 @@ XmppEngineImpl::NextId() { return ss.str(); } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::Disconnect() { if (state_ != STATE_CLOSED) { @@ -317,7 +317,7 @@ XmppEngineImpl::IncomingStanza(const XmlElement * stanza) { if (HasError() || raised_reset_) return; - if (stanza->Name() == QN_STREAM_ERROR) { + if (stanza->Name() == TQN_STREAM_ERROR) { // Explicit XMPP stream error SignalStreamError(stanza); } else if (login_task_.get()) { @@ -344,8 +344,8 @@ XmppEngineImpl::IncomingStanza(const XmlElement * stanza) { // If nobody wants to handle a stanza then send back an error. // Only do this for IQ stanzas as messages should probably just be dropped // and presence stanzas should certainly be dropped. - std::string type = stanza->Attr(QN_TYPE); - if (stanza->Name() == QN_IQ && + std::string type = stanza->Attr(TQN_TYPE); + if (stanza->Name() == TQN_IQ && !(type == "error" || type == "result")) { SendStanzaError(stanza, XSE_FEATURE_NOT_IMPLEMENTED, STR_EMPTY); } @@ -377,7 +377,7 @@ XmppEngineImpl::InternalSendStanza(const XmlElement * element) { // It should really never be necessary to set a FROM attribute on a stanza. // It is implied by the bind on the stream and if you get it wrong // (by flipping from/to on a message?) the server will close the stream. - ASSERT(!element->HasAttr(QN_FROM)); + ASSERT(!element->HasAttr(TQN_FROM)); // TODO: consider caching the XmlPrinter XmlPrinter::PrintXml(output_.get(), element, diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h index c36f168c..6011d9e8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h @@ -57,33 +57,33 @@ public: // SOCKET INPUT AND OUTPUT ------------------------------------------------ //! Registers the handler for socket output - virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh); + virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh); //! Provides socket input to the engine - virtual XmppReturnStatus HandleInput(const char * bytes, size_t len); + virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len); //! Advises the engine that the socket has closed - virtual XmppReturnStatus ConnectionClosed(); + virtual XmppReturntqStatus ConnectionClosed(); // SESSION SETUP --------------------------------------------------------- //! Indicates the (bare) JID for the user to use. - virtual XmppReturnStatus SetUser(const Jid & jid); + virtual XmppReturntqStatus SetUser(const Jid & jid); //! Get the login (bare) JID. virtual const Jid & GetUser(); //! Indicates the autentication to use. Takes ownership of the object. - virtual XmppReturnStatus SetSaslHandler(SaslHandler * sasl_handler); + virtual XmppReturntqStatus SetSaslHandler(SaslHandler * sasl_handler); //! Sets whether TLS will be used within the connection (default true). - virtual XmppReturnStatus SetUseTls(bool useTls); + virtual XmppReturntqStatus SetUseTls(bool useTls); //! Sets an alternate domain from which we allows TLS certificates. //! This is for use in the case where a we want to allow a proxy to //! serve up its own certificate rather than one owned by the underlying //! domain. - virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain); + virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain); //! Gets whether TLS will be used within the connection. virtual bool GetUseTls(); @@ -91,7 +91,7 @@ public: //! Sets the request resource name, if any (optional). //! Note that the resource name may be overridden by the server; after //! binding, the actual resource name is available as part of FullJid(). - virtual XmppReturnStatus SetRequestedResource(const std::string& resource); + virtual XmppReturntqStatus SetRequestedResource(const std::string& resource); //! Gets the request resource name. virtual const std::string & GetRequestedResource(); @@ -99,12 +99,12 @@ public: // SESSION MANAGEMENT --------------------------------------------------- //! Set callback for state changes. - virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler); + virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler); //! Initiates the XMPP connection. //! After supplying connection settings, call this once to initiate, //! (optionally) encrypt, authenticate, and bind the connection. - virtual XmppReturnStatus Connect(); + virtual XmppReturntqStatus Connect(); //! The current engine state. virtual State GetState() { return state_; } @@ -125,40 +125,40 @@ public: //! Sends CloseConnection to output, and disconnects and registered //! session handlers. After Disconnect completes, it is guaranteed //! that no further callbacks will be made. - virtual XmppReturnStatus Disconnect(); + virtual XmppReturntqStatus Disconnect(); // APPLICATION USE ------------------------------------------------------- //! Adds a listener for session events. //! Stanza delivery is chained to session handlers; the first to //! return 'true' is the last to get each stanza. - virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, + virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, XmppEngine::HandlerLevel level); //! Removes a listener for session events. - virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler); + virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler); //! Sends a stanza to the server. - virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza); + virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza); //! Sends raw text to the server - virtual XmppReturnStatus SendRaw(const std::string & text); + virtual XmppReturntqStatus SendRaw(const std::string & text); //! Sends an iq to the server, and registers a callback for the result. //! Returns the cookie passed to the result handler. - virtual XmppReturnStatus SendIq(const XmlElement* pelStanza, + virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza, XmppIqHandler* iq_handler, XmppIqCookie* cookie); //! Unregisters an iq callback handler given its cookie. //! No callback will come to this handler after it's unregistered. - virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie, + virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie, XmppIqHandler** iq_handler); //! Forms and sends an error in response to the given stanza. //! Swaps to and from, sets type to "error", and adds error information //! based on the passed code. Text is optional and may be STR_EMPTY. - virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, + virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal, XmppStanzaError code, const std::string & text); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc index eb623ed9..50ca23c1 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc @@ -54,26 +54,26 @@ private: }; -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler, XmppIqCookie* cookie) { if (state_ == STATE_CLOSED) return XMPP_RETURN_BADSTATE; if (NULL == iq_handler) return XMPP_RETURN_BADARGUMENT; - if (!element || element->Name() != QN_IQ) + if (!element || element->Name() != TQN_IQ) return XMPP_RETURN_BADARGUMENT; - const std::string& type = element->Attr(QN_TYPE); + const std::string& type = element->Attr(TQN_TYPE); if (type != "get" && type != "set") return XMPP_RETURN_BADARGUMENT; - if (!element->HasAttr(QN_ID)) + if (!element->HasAttr(TQN_ID)) return XMPP_RETURN_BADARGUMENT; - const std::string& id = element->Attr(QN_ID); + const std::string& id = element->Attr(TQN_ID); XmppIqEntry * iq_entry = new XmppIqEntry(id, - element->Attr(QN_TO), + element->Attr(TQN_TO), this, iq_handler); iq_entries_->push_back(iq_entry); SendStanza(element); @@ -85,13 +85,13 @@ XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler, } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie, XmppIqHandler ** iq_handler) { std::vector<XmppIqEntry*, std::allocator<XmppIqEntry*> >::iterator pos; - pos = std::find(iq_entries_->begin(), + pos = std::tqfind(iq_entries_->begin(), iq_entries_->end(), reinterpret_cast<XmppIqEntry*>(cookie)); @@ -118,11 +118,11 @@ XmppEngineImpl::DeleteIqCookies() { } static void -AecImpl(XmlElement * error_element, const QName & name, +AecImpl(XmlElement * error_element, const TQName & name, const char * type, const char * code) { - error_element->AddElement(new XmlElement(QN_ERROR)); - error_element->AddAttr(QN_CODE, code, 1); - error_element->AddAttr(QN_TYPE, type, 1); + error_element->AddElement(new XmlElement(TQN_ERROR)); + error_element->AddAttr(TQN_CODE, code, 1); + error_element->AddAttr(TQN_TYPE, type, 1); error_element->AddElement(new XmlElement(name, true), 1); } @@ -131,75 +131,75 @@ static void AddErrorCode(XmlElement * error_element, XmppStanzaError code) { switch (code) { case XSE_BAD_REQUEST: - AecImpl(error_element, QN_STANZA_BAD_REQUEST, "modify", "400"); + AecImpl(error_element, TQN_STANZA_BAD_REQUEST, "modify", "400"); break; case XSE_CONFLICT: - AecImpl(error_element, QN_STANZA_CONFLICT, "cancel", "409"); + AecImpl(error_element, TQN_STANZA_CONFLICT, "cancel", "409"); break; case XSE_FEATURE_NOT_IMPLEMENTED: - AecImpl(error_element, QN_STANZA_FEATURE_NOT_IMPLEMENTED, + AecImpl(error_element, TQN_STANZA_FEATURE_NOT_IMPLEMENTED, "cancel", "501"); break; case XSE_FORBIDDEN: - AecImpl(error_element, QN_STANZA_FORBIDDEN, "auth", "403"); + AecImpl(error_element, TQN_STANZA_FORBIDDEN, "auth", "403"); break; case XSE_GONE: - AecImpl(error_element, QN_STANZA_GONE, "modify", "302"); + AecImpl(error_element, TQN_STANZA_GONE, "modify", "302"); break; case XSE_INTERNAL_SERVER_ERROR: - AecImpl(error_element, QN_STANZA_INTERNAL_SERVER_ERROR, "wait", "500"); + AecImpl(error_element, TQN_STANZA_INTERNAL_SERVER_ERROR, "wait", "500"); break; case XSE_ITEM_NOT_FOUND: - AecImpl(error_element, QN_STANZA_ITEM_NOT_FOUND, "cancel", "404"); + AecImpl(error_element, TQN_STANZA_ITEM_NOT_FOUND, "cancel", "404"); break; case XSE_JID_MALFORMED: - AecImpl(error_element, QN_STANZA_JID_MALFORMED, "modify", "400"); + AecImpl(error_element, TQN_STANZA_JID_MALFORMED, "modify", "400"); break; case XSE_NOT_ACCEPTABLE: - AecImpl(error_element, QN_STANZA_NOT_ACCEPTABLE, "cancel", "406"); + AecImpl(error_element, TQN_STANZA_NOT_ACCEPTABLE, "cancel", "406"); break; case XSE_NOT_ALLOWED: - AecImpl(error_element, QN_STANZA_NOT_ALLOWED, "cancel", "405"); + AecImpl(error_element, TQN_STANZA_NOT_ALLOWED, "cancel", "405"); break; - case XSE_PAYMENT_REQUIRED: - AecImpl(error_element, QN_STANZA_PAYMENT_REQUIRED, "auth", "402"); + case XSE_PAYMENT_RETQUIRED: + AecImpl(error_element, TQN_STANZA_PAYMENT_RETQUIRED, "auth", "402"); break; case XSE_RECIPIENT_UNAVAILABLE: - AecImpl(error_element, QN_STANZA_RECIPIENT_UNAVAILABLE, "wait", "404"); + AecImpl(error_element, TQN_STANZA_RECIPIENT_UNAVAILABLE, "wait", "404"); break; case XSE_REDIRECT: - AecImpl(error_element, QN_STANZA_REDIRECT, "modify", "302"); + AecImpl(error_element, TQN_STANZA_REDIRECT, "modify", "302"); break; - case XSE_REGISTRATION_REQUIRED: - AecImpl(error_element, QN_STANZA_REGISTRATION_REQUIRED, "auth", "407"); + case XSE_REGISTRATION_RETQUIRED: + AecImpl(error_element, TQN_STANZA_REGISTRATION_RETQUIRED, "auth", "407"); break; case XSE_SERVER_NOT_FOUND: - AecImpl(error_element, QN_STANZA_REMOTE_SERVER_NOT_FOUND, + AecImpl(error_element, TQN_STANZA_REMOTE_SERVER_NOT_FOUND, "cancel", "404"); break; case XSE_SERVER_TIMEOUT: - AecImpl(error_element, QN_STANZA_REMOTE_SERVER_TIMEOUT, "wait", "502"); + AecImpl(error_element, TQN_STANZA_REMOTE_SERVER_TIMEOUT, "wait", "502"); break; case XSE_RESOURCE_CONSTRAINT: - AecImpl(error_element, QN_STANZA_RESOURCE_CONSTRAINT, "wait", "500"); + AecImpl(error_element, TQN_STANZA_RESOURCE_CONSTRAINT, "wait", "500"); break; case XSE_SERVICE_UNAVAILABLE: - AecImpl(error_element, QN_STANZA_SERVICE_UNAVAILABLE, "cancel", "503"); + AecImpl(error_element, TQN_STANZA_SERVICE_UNAVAILABLE, "cancel", "503"); break; - case XSE_SUBSCRIPTION_REQUIRED: - AecImpl(error_element, QN_STANZA_SUBSCRIPTION_REQUIRED, "auth", "407"); + case XSE_SUBSCRIPTION_RETQUIRED: + AecImpl(error_element, TQN_STANZA_SUBSCRIPTION_RETQUIRED, "auth", "407"); break; case XSE_UNDEFINED_CONDITION: - AecImpl(error_element, QN_STANZA_UNDEFINED_CONDITION, "wait", "500"); + AecImpl(error_element, TQN_STANZA_UNDEFINED_CONDITION, "wait", "500"); break; case XSE_UNEXPECTED_REQUEST: - AecImpl(error_element, QN_STANZA_UNEXPECTED_REQUEST, "wait", "400"); + AecImpl(error_element, TQN_STANZA_UNEXPECTED_REQUEST, "wait", "400"); break; } } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text) { @@ -208,22 +208,22 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original, return XMPP_RETURN_BADSTATE; XmlElement error_element(element_original->Name()); - error_element.AddAttr(QN_TYPE, "error"); + error_element.AddAttr(TQN_TYPE, "error"); // copy attrs, copy 'from' to 'to' and strip 'from' for (const XmlAttr * attribute = element_original->FirstAttr(); attribute; attribute = attribute->NextAttr()) { - QName name = attribute->Name(); - if (name == QN_TO) + TQName name = attribute->Name(); + if (name == TQN_TO) continue; // no need to put a from attr. Server will stamp stanza - else if (name == QN_FROM) - name = QN_TO; - else if (name == QN_TYPE) + else if (name == TQN_FROM) + name = TQN_TO; + else if (name == TQN_TYPE) continue; error_element.AddAttr(name, attribute->Value()); } - // copy children + // copy tqchildren for (const XmlChild * child = element_original->FirstChild(); child; child = child->NextChild()) { @@ -237,7 +237,7 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original, // add error information AddErrorCode(&error_element, code); if (text != STR_EMPTY) { - XmlElement * text_element = new XmlElement(QN_STANZA_TEXT, true); + XmlElement * text_element = new XmlElement(TQN_STANZA_TEXT, true); text_element->AddText(text); error_element.AddElement(text_element); } @@ -252,15 +252,15 @@ bool XmppEngineImpl::HandleIqResponse(const XmlElement * element) { if (iq_entries_->empty()) return false; - if (element->Name() != QN_IQ) + if (element->Name() != TQN_IQ) return false; - std::string type = element->Attr(QN_TYPE); + std::string type = element->Attr(TQN_TYPE); if (type != "result" && type != "error") return false; - if (!element->HasAttr(QN_ID)) + if (!element->HasAttr(TQN_ID)) return false; - std::string id = element->Attr(QN_ID); - std::string from = element->Attr(QN_FROM); + std::string id = element->Attr(TQN_ID); + std::string from = element->Attr(TQN_FROM); for (std::vector<XmppIqEntry *>::iterator it = iq_entries_->begin(); it != iq_entries_->end(); it += 1) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc index 470c2dc2..9b3fe9bc 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc @@ -127,11 +127,11 @@ XmppLoginTask::Advance() { } case LOGINSTATE_TLS_INIT: { - const XmlElement * pelTls = GetFeature(QN_TLS_STARTTLS); + const XmlElement * pelTls = GetFeature(TQN_TLS_STARTTLS); if (!pelTls) return Failure(XmppEngine::ERROR_TLS); - XmlElement el(QN_TLS_STARTTLS, true); + XmlElement el(TQN_TLS_STARTTLS, true); pctx_->InternalSendStanza(&el); state_ = LOGINSTATE_TLS_REQUESTED; continue; @@ -140,7 +140,7 @@ XmppLoginTask::Advance() { case LOGINSTATE_TLS_REQUESTED: { if (NULL == (element = NextStanza())) return true; - if (element->Name() != QN_TLS_PROCEED) + if (element->Name() != TQN_TLS_PROCEED) return Failure(XmppEngine::ERROR_TLS); // The proper domain to verify against is the real underlying @@ -155,7 +155,7 @@ XmppLoginTask::Advance() { } case LOGINSTATE_AUTH_INIT: { - const XmlElement * pelSaslAuth = GetFeature(QN_SASL_MECHANISMS); + const XmlElement * pelSaslAuth = GetFeature(TQN_SASL_MECHANISMS); if (!pelSaslAuth) { return Failure(XmppEngine::ERROR_AUTH); } @@ -163,9 +163,9 @@ XmppLoginTask::Advance() { // Collect together the SASL auth mechanisms presented by the server std::vector<std::string> mechanisms; for (const XmlElement * pelMech = - pelSaslAuth->FirstNamed(QN_SASL_MECHANISM); + pelSaslAuth->FirstNamed(TQN_SASL_MECHANISM); pelMech; - pelMech = pelMech->NextNamed(QN_SASL_MECHANISM)) { + pelMech = pelMech->NextNamed(TQN_SASL_MECHANISM)) { mechanisms.push_back(pelMech->BodyText()); } @@ -199,7 +199,7 @@ XmppLoginTask::Advance() { return true; if (element->Name().Namespace() != NS_SASL) return Failure(XmppEngine::ERROR_AUTH); - if (element->Name() == QN_SASL_CHALLENGE) { + if (element->Name() == TQN_SASL_CHALLENGE) { XmlElement * response = sasl_mech_->HandleSaslChallenge(element); if (response == NULL) { return Failure(XmppEngine::ERROR_AUTH); @@ -209,7 +209,7 @@ XmppLoginTask::Advance() { state_ = LOGINSTATE_SASL_RUNNING; continue; } - if (element->Name() != QN_SASL_SUCCESS) { + if (element->Name() != TQN_SASL_SUCCESS) { return Failure(XmppEngine::ERROR_UNAUTHORIZED); } @@ -220,20 +220,20 @@ XmppLoginTask::Advance() { } case LOGINSTATE_BIND_INIT: { - const XmlElement * pelBindFeature = GetFeature(QN_BIND_BIND); - const XmlElement * pelSessionFeature = GetFeature(QN_SESSION_SESSION); + const XmlElement * pelBindFeature = GetFeature(TQN_BIND_BIND); + const XmlElement * pelSessionFeature = GetFeature(TQN_SESSION_SESSION); if (!pelBindFeature || !pelSessionFeature) return Failure(XmppEngine::ERROR_BIND); - XmlElement iq(QN_IQ); - iq.AddAttr(QN_TYPE, "set"); + XmlElement iq(TQN_IQ); + iq.AddAttr(TQN_TYPE, "set"); iqId_ = pctx_->NextId(); - iq.AddAttr(QN_ID, iqId_); - iq.AddElement(new XmlElement(QN_BIND_BIND, true)); + iq.AddAttr(TQN_ID, iqId_); + iq.AddElement(new XmlElement(TQN_BIND_BIND, true)); if (pctx_->requested_resource_ != STR_EMPTY) { - iq.AddElement(new XmlElement(QN_BIND_RESOURCE), 1); + iq.AddElement(new XmlElement(TQN_BIND_RESOURCE), 1); iq.AddText(pctx_->requested_resource_, 2); } pctx_->InternalSendStanza(&iq); @@ -245,15 +245,15 @@ XmppLoginTask::Advance() { if (NULL == (element = NextStanza())) return true; - if (element->Name() != QN_IQ || element->Attr(QN_ID) != iqId_ || - element->Attr(QN_TYPE) == "get" || element->Attr(QN_TYPE) == "set") + if (element->Name() != TQN_IQ || element->Attr(TQN_ID) != iqId_ || + element->Attr(TQN_TYPE) == "get" || element->Attr(TQN_TYPE) == "set") return true; - if (element->Attr(QN_TYPE) != "result" || element->FirstElement() == NULL || - element->FirstElement()->Name() != QN_BIND_BIND) + if (element->Attr(TQN_TYPE) != "result" || element->FirstElement() == NULL || + element->FirstElement()->Name() != TQN_BIND_BIND) return Failure(XmppEngine::ERROR_BIND); - fullJid_ = Jid(element->FirstElement()->TextNamed(QN_BIND_JID)); + fullJid_ = Jid(element->FirstElement()->TextNamed(TQN_BIND_JID)); if (!fullJid_.IsFull()) { return Failure(XmppEngine::ERROR_BIND); } @@ -264,12 +264,12 @@ XmppLoginTask::Advance() { } // now request session - XmlElement iq(QN_IQ); - iq.AddAttr(QN_TYPE, "set"); + XmlElement iq(TQN_IQ); + iq.AddAttr(TQN_TYPE, "set"); iqId_ = pctx_->NextId(); - iq.AddAttr(QN_ID, iqId_); - iq.AddElement(new XmlElement(QN_SESSION_SESSION, true)); + iq.AddAttr(TQN_ID, iqId_); + iq.AddElement(new XmlElement(TQN_SESSION_SESSION, true)); pctx_->InternalSendStanza(&iq); state_ = LOGINSTATE_SESSION_REQUESTED; @@ -279,11 +279,11 @@ XmppLoginTask::Advance() { case LOGINSTATE_SESSION_REQUESTED: { if (NULL == (element = NextStanza())) return true; - if (element->Name() != QN_IQ || element->Attr(QN_ID) != iqId_ || - element->Attr(QN_TYPE) == "get" || element->Attr(QN_TYPE) == "set") + if (element->Name() != TQN_IQ || element->Attr(TQN_ID) != iqId_ || + element->Attr(TQN_TYPE) == "get" || element->Attr(TQN_TYPE) == "set") return false; - if (element->Attr(QN_TYPE) != "result") + if (element->Attr(TQN_TYPE) != "result") return Failure(XmppEngine::ERROR_BIND); pctx_->SignalBound(fullJid_); @@ -301,26 +301,26 @@ XmppLoginTask::Advance() { bool XmppLoginTask::HandleStartStream(const XmlElement *element) { - if (element->Name() != QN_STREAM_STREAM) + if (element->Name() != TQN_STREAM_STREAM) return false; - if (element->Attr(QN_XMLNS) != "jabber:client") + if (element->Attr(TQN_XMLNS) != "jabber:client") return false; - if (element->Attr(QN_VERSION) != "1.0") + if (element->Attr(TQN_VERSION) != "1.0") return false; - if (!element->HasAttr(QN_ID)) + if (!element->HasAttr(TQN_ID)) return false; - streamId_ = element->Attr(QN_ID); + streamId_ = element->Attr(TQN_ID); return true; } bool XmppLoginTask::HandleFeatures(const XmlElement *element) { - if (element->Name() != QN_STREAM_FEATURES) + if (element->Name() != TQN_STREAM_FEATURES) return false; pelFeatures_.reset(new XmlElement(*element)); @@ -328,7 +328,7 @@ XmppLoginTask::HandleFeatures(const XmlElement *element) { } const XmlElement * -XmppLoginTask::GetFeature(const QName & name) { +XmppLoginTask::GetFeature(const TQName & name) { return pelFeatures_->FirstNamed(name); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h index 7f321a30..18c70312 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h @@ -71,7 +71,7 @@ private: bool Advance(); bool HandleStartStream(const XmlElement * element); bool HandleFeatures(const XmlElement * element); - const XmlElement * GetFeature(const QName & name); + const XmlElement * GetFeature(const TQName & name); bool Failure(XmppEngine::Error reason); void FlushQueuedStanzas(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc index 82207f3b..38ed1994 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 * parent, XmppEngine::HandlerLevel level) - : Task(parent), client_(NULL) { - XmppClient * client = (XmppClient*)parent->GetParent(XMPP_CLIENT_TASK_CODE); +XmppTask::XmppTask(Task * tqparent, XmppEngine::HandlerLevel level) + : Task(tqparent), client_(NULL) { + XmppClient * client = (XmppClient*)tqparent->GetParent(XMPP_CLIENT_TASK_CODE); client_ = client; id_ = client->NextId(); client->AddXmppTask(this, level); @@ -55,14 +55,14 @@ XmppTask::StopImpl() { } } -XmppReturnStatus +XmppReturntqStatus XmppTask::SendStanza(const XmlElement * stanza) { if (client_ == NULL) return XMPP_RETURN_BADSTATE; return client_->SendStanza(stanza); } -XmppReturnStatus +XmppReturntqStatus XmppTask::SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text) { @@ -102,37 +102,37 @@ XmppTask::NextStanza() { XmlElement * XmppTask::MakeIq(const std::string & type, const buzz::Jid & to, const std::string id) { - XmlElement * result = new XmlElement(QN_IQ); + XmlElement * result = new XmlElement(TQN_IQ); if (!type.empty()) - result->AddAttr(QN_TYPE, type); + result->AddAttr(TQN_TYPE, type); if (to != JID_EMPTY) - result->AddAttr(QN_TO, to.Str()); + result->AddAttr(TQN_TO, to.Str()); if (!id.empty()) - result->AddAttr(QN_ID, id); + result->AddAttr(TQN_ID, id); return result; } XmlElement * XmppTask::MakeIqResult(const XmlElement * query) { - XmlElement * result = new XmlElement(QN_IQ); - result->AddAttr(QN_TYPE, STR_RESULT); - if (query->HasAttr(QN_FROM)) { - result->AddAttr(QN_TO, query->Attr(QN_FROM)); + XmlElement * result = new XmlElement(TQN_IQ); + result->AddAttr(TQN_TYPE, STR_RESULT); + if (query->HasAttr(TQN_FROM)) { + result->AddAttr(TQN_TO, query->Attr(TQN_FROM)); } - result->AddAttr(QN_ID, query->Attr(QN_ID)); + result->AddAttr(TQN_ID, query->Attr(TQN_ID)); return result; } bool XmppTask::MatchResponseIq(const XmlElement * stanza, const Jid & to, const std::string & id) { - if (stanza->Name() != QN_IQ) + if (stanza->Name() != TQN_IQ) return false; - if (stanza->Attr(QN_ID) != id) + if (stanza->Attr(TQN_ID) != id) return false; - Jid from(stanza->Attr(QN_FROM)); + Jid from(stanza->Attr(TQN_FROM)); if (from != to) { Jid me = client_->jid(); // we address the server as "", but it is legal for the server @@ -152,11 +152,11 @@ XmppTask::MatchResponseIq(const XmlElement * stanza, bool XmppTask::MatchRequestIq(const XmlElement * stanza, - const std::string & type, const QName & qn) { - if (stanza->Name() != QN_IQ) + const std::string & type, const TQName & qn) { + if (stanza->Name() != TQN_IQ) return false; - if (stanza->Attr(QN_TYPE) != type) + if (stanza->Attr(TQN_TYPE) != type) return false; if (stanza->FirstNamed(qn) == NULL) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h index 3b56a1c9..d84019a2 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 parent so you +// useful there. It has a way of finding its XmppClient tqparent 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 * parent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); + XmppTask(Task * tqparent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); virtual ~XmppTask(); virtual XmppClient * GetClient() const { return client_; } @@ -78,9 +78,9 @@ public: protected: friend class XmppClient; - XmppReturnStatus SendStanza(const XmlElement * stanza); - XmppReturnStatus SetResult(const std::string & code); - XmppReturnStatus SendStanzaError(const XmlElement * element_original, + XmppReturntqStatus SendStanza(const XmlElement * stanza); + XmppReturntqStatus SetResult(const std::string & code); + XmppReturntqStatus SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text); @@ -93,7 +93,7 @@ protected: const XmlElement * NextStanza(); bool MatchResponseIq(const XmlElement * stanza, const Jid & to, const std::string & task_id); - bool MatchRequestIq(const XmlElement * stanza, const std::string & type, const QName & qn); + bool MatchRequestIq(const XmlElement * stanza, const std::string & type, const TQName & qn); XmlElement *MakeIqResult(const XmlElement * query); XmlElement *MakeIq(const std::string & type, const Jid & to, const std::string task_id); diff --git a/kopete/protocols/jabber/jingle/voicecaller.h b/kopete/protocols/jabber/jingle/voicecaller.h index 0f0d18bb..6907f09d 100644 --- a/kopete/protocols/jabber/jingle/voicecaller.h +++ b/kopete/protocols/jabber/jingle/voicecaller.h @@ -14,9 +14,10 @@ using namespace XMPP; /** * \brief An abstract class for a voice call implementation. */ -class VoiceCaller : public QObject +class VoiceCaller : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp index 4ceeca09..ae95eadb 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/kioslave/jabberdisco.cpp @@ -57,7 +57,7 @@ void JabberDiscoProtocol::setHost ( const TQString &host, int port, const TQStri m_host = host; m_port = !port ? 5222 : port; - m_user = TQString(user).replace ( "%", "@" ); + m_user = TQString(user).tqreplace ( "%", "@" ); m_password = pass; } @@ -340,7 +340,7 @@ void JabberDiscoProtocol::slotCSError ( int errorCode ) bool breakEventLoop = false; -class EventLoopThread : public QThread +class EventLoopThread : public TQThread { public: void run (); @@ -351,7 +351,7 @@ void EventLoopThread::run () while ( true ) { - qApp->processEvents (); + tqApp->processEvents (); msleep ( 100 ); if ( breakEventLoop ) diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/kioslave/jabberdisco.h index ef6e75fa..19a12d8a 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.h +++ b/kopete/protocols/jabber/kioslave/jabberdisco.h @@ -37,6 +37,7 @@ class JabberDiscoProtocol : public TQObject, public KIO::SlaveBase { Q_OBJECT + TQ_OBJECT public: JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ); diff --git a/kopete/protocols/jabber/libiris/001_last_activity.patch b/kopete/protocols/jabber/libiris/001_last_activity.patch index 24673e80..4e91b8ef 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 *parent) -+:Task(parent) ++JT_GetLastActivity::JT_GetLastActivity(Task *tqparent) ++:Task(tqparent) +{ + d = new Private; +} @@ -110,4 +110,4 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +//---------------------------------------------------------------------------- // JT_GetServices //---------------------------------------------------------------------------- - JT_GetServices::JT_GetServices(Task *parent) + JT_GetServices::JT_GetServices(Task *tqparent) diff --git a/kopete/protocols/jabber/libiris/004_xhtml_im.patch b/kopete/protocols/jabber/libiris/004_xhtml_im.patch index 990ab4f7..feba04bb 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 parent = s.createElement(s.xhtmlImNS(), "html"); ++ QDomElement tqparent = 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()); -+ parent.appendChild(child); ++ tqparent.appendChild(child); + } + } -+ s.appendChild(parent); ++ s.appendChild(tqparent); + } 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 058825db..844d5e3f 100644 --- a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch +++ b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch @@ -7,8 +7,8 @@ Index: iris/include/im.h bool groupChatJoin(const QString &host, const QString &room, const QString &nick); + bool groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString &password); - void groupChatSetStatus(const QString &host, const QString &room, const Status &); - void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &); + void groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &); + void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const tqStatus &); void groupChatLeave(const QString &host, const QString &room); Index: iris/xmpp-im/client.cpp =================================================================== @@ -34,20 +34,20 @@ Index: iris/xmpp-im/client.cpp + ++it; + } + -+ debug(QString("Client: Joined: [%1]\n").arg(jid.full())); ++ debug(QString("Client: Joined: [%1]\n").tqarg(jid.full())); + GroupChat i; + i.j = jid; + i.status = GroupChat::Connecting; + d->groupChatList += i; + + JT_MucPresence *j = new JT_MucPresence(rootTask()); -+ j->pres(jid, Status(), password); ++ j->pres(jid, tqStatus(), password); + j->go(true); + + return true; +} + - void Client::groupChatSetStatus(const QString &host, const QString &room, const Status &_s) + void Client::groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &_s) { Jid jid(room + "@" + host); Index: iris/xmpp-im/xmpp_tasks.h @@ -63,11 +63,11 @@ Index: iris/xmpp-im/xmpp_tasks.h + { + Q_OBJECT + public: -+ JT_MucPresence(Task *parent); ++ JT_MucPresence(Task *tqparent); + ~JT_MucPresence(); + -+ void pres(const Status &); -+ void pres(const Jid &, const Status &, const QString &password); ++ void pres(const tqStatus &); ++ void pres(const Jid &, const tqStatus &, const QString &password); + + void onGo(); + @@ -92,8 +92,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +//---------------------------------------------------------------------------- +// JT_MucPresence +//---------------------------------------------------------------------------- -+JT_MucPresence::JT_MucPresence(Task *parent) -+:Task(parent) ++JT_MucPresence::JT_MucPresence(Task *tqparent) ++:Task(tqparent) +{ + type = -1; +} @@ -102,7 +102,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +{ +} + -+void JT_MucPresence::pres(const Status &s) ++void JT_MucPresence::pres(const tqStatus &s) +{ + type = 0; + @@ -121,7 +121,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + if(!s.status().isEmpty()) + tag.appendChild(textTag(doc(), "status", s.status())); + -+ tag.appendChild( textTag(doc(), "priority", QString("%1").arg(s.priority()) ) ); ++ tag.appendChild( textTag(doc(), "priority", QString("%1").tqarg(s.priority()) ) ); + + if(!s.keyID().isEmpty()) { + QDomElement x = textTag(doc(), "x", s.keyID()); @@ -146,7 +146,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + } +} + -+void JT_MucPresence::pres(const Jid &to, const Status &s, const QString &password) ++void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const QString &password) +{ + pres(s); + tag.setAttribute("to", to.full()); diff --git a/kopete/protocols/jabber/libiris/006_private_storage.patch b/kopete/protocols/jabber/libiris/006_private_storage.patch index 288d24c5..35031fec 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 *parent); ++ JT_PrivateStorage(Task *tqparent); + ~JT_PrivateStorage(); + + void set(const QDomElement &); @@ -53,8 +53,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + int type; +}; + -+JT_PrivateStorage::JT_PrivateStorage(Task *parent) -+ :Task(parent) ++JT_PrivateStorage::JT_PrivateStorage(Task *tqparent) ++ :Task(tqparent) +{ + d = new Private; +} diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp index a60c8040..3d54cc16 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 *parent) -:ByteStream(parent) +BSocket::BSocket(TQObject *tqparent) +:ByteStream(tqparent) { d = new Private; #ifndef NO_NDNS @@ -88,7 +88,7 @@ void BSocket::reset(bool clear) appendRead(block); } - d->sd.deleteLater(d->qsock); + d->sd.deleteLater(TQT_TQOBJECT(d->qsock)); d->qsock = 0; } else { @@ -109,9 +109,7 @@ void BSocket::ensureSocket() { if(!d->qsock) { d->qsock = new TQSocket; -#if QT_VERSION >= 0x030200 d->qsock->setReadBufferSize(READBUFSIZE); -#endif connect(d->qsock, TQT_SIGNAL(hostFound()), TQT_SLOT(qs_hostFound())); connect(d->qsock, TQT_SIGNAL(connected()), TQT_SLOT(qs_connected())); connect(d->qsock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(qs_connectionClosed())); @@ -122,7 +120,7 @@ void BSocket::ensureSocket() } } -void BSocket::connectToHost(const TQString &host, Q_UINT16 port) +void BSocket::connectToHost(const TQString &host, TQ_UINT16 port) { reset(true); d->host = host; @@ -248,7 +246,7 @@ TQHostAddress BSocket::address() const return TQHostAddress(); } -Q_UINT16 BSocket::port() const +TQ_UINT16 BSocket::port() const { if(d->qsock) return d->qsock->port(); @@ -264,7 +262,7 @@ TQHostAddress BSocket::peerAddress() const return TQHostAddress(); } -Q_UINT16 BSocket::peerPort() const +TQ_UINT16 BSocket::peerPort() const { if(d->qsock) return d->qsock->port(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h index 7887b9c0..246f61a0 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h @@ -30,13 +30,14 @@ class BSocket : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound }; enum State { Idle, HostLookup, Connecting, Connected, Closing }; - BSocket(TQObject *parent=0); + BSocket(TQObject *tqparent=0); ~BSocket(); - void connectToHost(const TQString &host, Q_UINT16 port); + void connectToHost(const TQString &host, TQ_UINT16 port); void connectToServer(const TQString &srv, const TQString &type); int socket() const; void setSocket(int); @@ -52,11 +53,11 @@ public: // local TQHostAddress address() const; - Q_UINT16 port() const; + TQ_UINT16 port() const; // remote TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; signals: void hostFound(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp index 6abeb556..2064e4ab 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp @@ -58,13 +58,13 @@ static TQString extractLine(TQByteArray *buf, bool *found) static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg) { - int n = line.find(' '); + int n = line.tqfind(' '); if(n == -1) return false; if(proto) *proto = line.mid(0, n); ++n; - int n2 = line.find(' ', n); + int n2 = line.tqfind(' ', n); if(n2 == -1) return false; if(code) @@ -96,8 +96,8 @@ public: bool active; }; -HttpConnect::HttpConnect(TQObject *parent) -:ByteStream(parent) +HttpConnect::HttpConnect(TQObject *tqparent) +:ByteStream(tqparent) { 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 2acef809..2f2ed13f 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h @@ -28,9 +28,10 @@ class HttpConnect : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpConnect(TQObject *parent=0); + HttpConnect(TQObject *tqparent=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 f20c054f..2e6d0779 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 *parent) -:ByteStream(parent) +HttpPoll::HttpPoll(TQObject *tqparent) +:ByteStream(tqparent) { d = new Private; @@ -229,14 +229,14 @@ void HttpPoll::http_result() // get id and packet TQString id; TQString cookie = d->http.getHeader("Set-Cookie"); - int n = cookie.find("ID="); + int n = cookie.tqfind("ID="); if(n == -1) { reset(); error(ErrRead); return; } n += 3; - int n2 = cookie.find(';', n); + int n2 = cookie.tqfind(';', n); if(n2 != -1) id = cookie.mid(n, n2-n); else @@ -358,7 +358,7 @@ void HttpPoll::resetKey() fprintf(stderr, "HttpPoll: reset key!\n"); #endif TQByteArray a = randomArray(64); - TQString str = TQString::fromLatin1(a.data(), a.size()); + TQString str = TQString::tqfromLatin1(a.data(), a.size()); d->key_n = POLL_KEYS; for(int n = 0; n < POLL_KEYS; ++n) @@ -406,13 +406,13 @@ static TQString extractLine(TQByteArray *buf, bool *found) static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg) { - int n = line.find(' '); + int n = line.tqfind(' '); if(n == -1) return false; if(proto) *proto = line.mid(0, n); ++n; - int n2 = line.find(' ', n); + int n2 = line.tqfind(' ', n); if(n2 == -1) return false; if(code) @@ -438,8 +438,8 @@ public: TQString host; }; -HttpProxyPost::HttpProxyPost(TQObject *parent) -:TQObject(parent) +HttpProxyPost::HttpProxyPost(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); @@ -508,7 +508,7 @@ TQString HttpProxyPost::getHeader(const TQString &var) const { for(TQStringList::ConstIterator it = d->headerLines.begin(); it != d->headerLines.end(); ++it) { const TQString &s = *it; - int n = s.find(": "); + int n = s.tqfind(": "); if(n == -1) continue; TQString v = s.mid(0, n); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h index c38b7a8a..02034fee 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h @@ -28,9 +28,10 @@ class HttpPoll : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpPoll(TQObject *parent=0); + HttpPoll(TQObject *tqparent=0); ~HttpPoll(); void setAuth(const TQString &user, const TQString &pass=""); @@ -67,12 +68,13 @@ private: const TQString & getKey(bool *); }; -class HttpProxyPost : public QObject +class HttpProxyPost : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpProxyPost(TQObject *parent=0); + HttpProxyPost(TQObject *tqparent=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 a060b23a..39fbfdda 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp @@ -21,7 +21,7 @@ //! \class NDns ndns.h //! \brief Simple DNS resolution using native system calls //! -//! This class is to be used when Qt's TQDns is not good enough. Because QDns +//! This class is to be used when TQt's TQDns is not good enough. Because TQDns //! does not use threads, it cannot make a system call asyncronously. Thus, //! TQDns tries to imitate the behavior of each platform's native behavior, and //! generally falls short. @@ -69,7 +69,7 @@ // CS_NAMESPACE_BEGIN //! \if _hide_doc_ -class NDnsWorkerEvent : public QCustomEvent +class NDnsWorkerEvent : public TQCustomEvent { public: enum Type { WorkerEvent = TQEvent::User + 100 }; @@ -78,7 +78,7 @@ public: NDnsWorker *worker; }; -class NDnsWorker : public QThread +class NDnsWorker : public TQThread { public: NDnsWorker(TQObject *, const TQCString &); @@ -116,7 +116,7 @@ public: class NDnsManager::Private { public: - Item *find(const NDns *n) + Item *tqfind(const NDns *n) { TQPtrListIterator<Item> it(list); for(Item *i; (i = it.current()); ++it) { @@ -126,7 +126,7 @@ public: return 0; } - Item *find(const NDnsWorker *w) + Item *tqfind(const NDnsWorker *w) { TQPtrListIterator<Item> it(list); for(Item *i; (i = it.current()); ++it) { @@ -157,7 +157,7 @@ NDnsManager::NDnsManager() d = new Private; d->list.setAutoDelete(true); - connect(qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(app_aboutToQuit())); + connect(tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(app_aboutToQuit())); } NDnsManager::~NDnsManager() @@ -184,7 +184,7 @@ void NDnsManager::resolve(NDns *self, const TQString &name) void NDnsManager::stop(NDns *self) { - Item *i = d->find(self); + Item *i = d->tqfind(self); if(!i) return; // disassociate @@ -200,7 +200,7 @@ void NDnsManager::stop(NDns *self) bool NDnsManager::isBusy(const NDns *self) const { - Item *i = d->find(self); + Item *i = d->tqfind(self); return (i ? true: false); } @@ -210,7 +210,7 @@ bool NDnsManager::event(TQEvent *e) NDnsWorkerEvent *we = static_cast<NDnsWorkerEvent*>(e); we->worker->wait(); // ensure that the thread is terminated - Item *i = d->find(we->worker); + Item *i = d->tqfind(we->worker); if(!i) { // should NOT happen return true; @@ -242,7 +242,7 @@ void NDnsManager::tryDestroy() void NDnsManager::app_aboutToQuit() { while(man) { - TQEventLoop *e = qApp->eventLoop(); + TQEventLoop *e = tqApp->eventLoop(); e->processEvents(TQEventLoop::WaitForMore); } } @@ -256,9 +256,9 @@ void NDnsManager::app_aboutToQuit() //! This signal is emitted when the DNS resolution succeeds or fails. //! -//! Constructs an NDns object with parent \a parent. -NDns::NDns(TQObject *parent) -:TQObject(parent) +//! Constructs an NDns object with tqparent \a tqparent. +NDns::NDns(TQObject *tqparent) +:TQObject(tqparent) { } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h index 48243e30..b48ff75e 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h @@ -32,11 +32,12 @@ class NDnsWorker; class NDnsManager; -class NDns : public QObject +class NDns : public TQObject { Q_OBJECT + TQ_OBJECT public: - NDns(TQObject *parent=0); + NDns(TQObject *tqparent=0); ~NDns(); void resolve(const TQString &); @@ -56,9 +57,10 @@ private: void finished(const TQHostAddress &); }; -class NDnsManager : public QObject +class NDnsManager : public TQObject { Q_OBJECT + TQ_OBJECT public: ~NDnsManager(); class Item; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp index 5b88b4e5..2968968c 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp @@ -1,5 +1,5 @@ /* - * servsock.cpp - simple wrapper to QServerSocket + * servsock.cpp - simple wrapper to TQServerSocket * Copyright (C) 2003 Justin Karneges * * This library is free software; you can redistribute it and/or @@ -33,8 +33,8 @@ public: ServSockSignal *serv; }; -ServSock::ServSock(TQObject *parent) -:TQObject(parent) +ServSock::ServSock(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->serv = 0; @@ -51,7 +51,7 @@ bool ServSock::isActive() const return (d->serv ? true: false); } -bool ServSock::listen(Q_UINT16 port) +bool ServSock::listen(TQ_UINT16 port) { stop(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h index 4628d8ea..0fddf2e0 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h @@ -1,5 +1,5 @@ /* - * servsock.h - simple wrapper to QServerSocket + * servsock.h - simple wrapper to TQServerSocket * Copyright (C) 2003 Justin Karneges * * This library is free software; you can redistribute it and/or @@ -25,15 +25,16 @@ // CS_NAMESPACE_BEGIN -class ServSock : public QObject +class ServSock : public TQObject { Q_OBJECT + TQ_OBJECT public: - ServSock(TQObject *parent=0); + ServSock(TQObject *tqparent=0); ~ServSock(); bool isActive() const; - bool listen(Q_UINT16 port); + bool listen(TQ_UINT16 port); void stop(); int port() const; TQHostAddress address() const; @@ -49,9 +50,10 @@ private: Private *d; }; -class ServSockSignal : public QServerSocket +class ServSockSignal : public TQServerSocket { Q_OBJECT + TQ_OBJECT public: ServSockSignal(int port); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp index 59504170..7948dcd7 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp @@ -49,7 +49,7 @@ //---------------------------------------------------------------------------- // SocksUDP //---------------------------------------------------------------------------- -static TQByteArray sp_create_udp(const TQString &host, Q_UINT16 port, const TQByteArray &buf) +static TQByteArray sp_create_udp(const TQString &host, TQ_UINT16 port, const TQByteArray &buf) { // detect for IP addresses //TQHostAddress addr; @@ -89,7 +89,7 @@ static TQByteArray sp_create_udp(const TQString &host, Q_UINT16 port, const TQBy struct SPS_UDP { TQString host; - Q_UINT16 port; + TQ_UINT16 port; TQByteArray data; }; @@ -107,7 +107,7 @@ static int sp_read_udp(TQByteArray *from, SPS_UDP *s) full_len += 4; if((int)from->size() < full_len) return 0; - Q_UINT32 ip4; + TQ_UINT32 ip4; memcpy(&ip4, from->data() + 4, 4); addr.setAddress(ntohl(ip4)); host = addr.toString(); @@ -122,13 +122,13 @@ static int sp_read_udp(TQByteArray *from, SPS_UDP *s) return 0; TQCString cs(host_len+1); memcpy(cs.data(), from->data() + 5, host_len); - host = TQString::fromLatin1(cs); + host = TQString::tqfromLatin1(cs); } else if(atype == 0x04) { full_len += 16; if((int)from->size() < full_len) return 0; - Q_UINT8 a6[16]; + TQ_UINT8 a6[16]; memcpy(a6, from->data() + 4, 16); addr.setAddress(a6); host = addr.toString(); @@ -138,7 +138,7 @@ static int sp_read_udp(TQByteArray *from, SPS_UDP *s) if((int)from->size() < full_len) return 0; - Q_UINT16 p; + TQ_UINT16 p; memcpy(&p, from->data() + full_len - 2, 2); s->host = host; @@ -208,9 +208,9 @@ void SocksUDP::sn_activated(int) //---------------------------------------------------------------------------- // SocksClient //---------------------------------------------------------------------------- -#define REQ_CONNECT 0x01 -#define REQ_BIND 0x02 -#define REQ_UDPASSOCIATE 0x03 +#define RETQ_CONNECT 0x01 +#define RETQ_BIND 0x02 +#define RETQ_UDPASSOCIATE 0x03 #define RET_SUCCESS 0x00 #define RET_UNREACHABLE 0x04 @@ -366,17 +366,17 @@ static TQByteArray sp_set_request(const TQHostAddress &addr, unsigned short port a[at++] = 0x00; // reserved if(addr.isIp4Addr()) { a[at++] = 0x01; // address type = ipv4 - Q_UINT32 ip4 = htonl(addr.ip4Addr()); + TQ_UINT32 ip4 = htonl(addr.ip4Addr()); a.resize(at+4); memcpy(a.data() + at, &ip4, 4); at += 4; } else { a[at++] = 0x04; - Q_UINT8 a6[16]; + TQ_UINT8 a6[16]; TQStringList s6 = TQStringList::split(':', addr.toString(), true); int at = 0; - Q_UINT16 c; + TQ_UINT16 c; bool ok; for(TQStringList::ConstIterator it = s6.begin(); it != s6.end(); ++it) { c = (*it).toInt(&ok, 16); @@ -396,7 +396,7 @@ static TQByteArray sp_set_request(const TQHostAddress &addr, unsigned short port return a; } -static TQByteArray sp_set_request(const TQString &host, Q_UINT16 port, unsigned char cmd1) +static TQByteArray sp_set_request(const TQString &host, TQ_UINT16 port, unsigned char cmd1) { // detect for IP addresses TQHostAddress addr; @@ -436,7 +436,7 @@ struct SPS_CONNREQ int address_type; TQString host; TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s) @@ -453,7 +453,7 @@ static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s) full_len += 4; if((int)from->size() < full_len) return 0; - Q_UINT32 ip4; + TQ_UINT32 ip4; memcpy(&ip4, from->data() + 4, 4); addr.setAddress(ntohl(ip4)); } @@ -467,13 +467,13 @@ static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s) return 0; TQCString cs(host_len+1); memcpy(cs.data(), from->data() + 5, host_len); - host = TQString::fromLatin1(cs); + host = TQString::tqfromLatin1(cs); } else if(atype == 0x04) { full_len += 16; if((int)from->size() < full_len) return 0; - Q_UINT8 a6[16]; + TQ_UINT8 a6[16]; memcpy(a6, from->data() + 4, 16); addr.setAddress(a6); } @@ -484,7 +484,7 @@ static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s) TQByteArray a = ByteStream::takeArray(from, full_len); - Q_UINT16 p; + TQ_UINT16 p; memcpy(&p, a.data() + full_len - 2, 2); s->version = a[0]; @@ -527,16 +527,16 @@ public: int udpPort; }; -SocksClient::SocksClient(TQObject *parent) -:ByteStream(parent) +SocksClient::SocksClient(TQObject *tqparent) +:ByteStream(tqparent) { init(); d->incoming = false; } -SocksClient::SocksClient(int s, TQObject *parent) -:ByteStream(parent) +SocksClient::SocksClient(int s, TQObject *tqparent) +:ByteStream(tqparent) { init(); @@ -838,7 +838,7 @@ void SocksClient::do_request() fprintf(stderr, "SocksClient: Requesting ...\n"); #endif d->step = StepRequest; - int cmd = d->udp ? REQ_UDPASSOCIATE : REQ_CONNECT; + int cmd = d->udp ? RETQ_UDPASSOCIATE : RETQ_CONNECT; TQByteArray buf; if(!d->real_host.isEmpty()) buf = sp_set_request(d->real_host, d->real_port, cmd); @@ -956,7 +956,7 @@ void SocksClient::continueIncoming() } else if(r == 1) { d->waiting = true; - if(s.cmd == REQ_CONNECT) { + if(s.cmd == RETQ_CONNECT) { if(!s.host.isEmpty()) d->rhost = s.host; else @@ -964,7 +964,7 @@ void SocksClient::continueIncoming() d->rport = s.port; incomingConnectRequest(d->rhost, d->rport); } - else if(s.cmd == REQ_UDPASSOCIATE) { + else if(s.cmd == RETQ_UDPASSOCIATE) { incomingUDPAssociateRequest(); } else { @@ -1068,7 +1068,7 @@ TQHostAddress SocksClient::peerAddress() const return d->sock.peerAddress(); } -Q_UINT16 SocksClient::peerPort() const +TQ_UINT16 SocksClient::peerPort() const { return d->sock.peerPort(); } @@ -1078,7 +1078,7 @@ TQString SocksClient::udpAddress() const return d->udpAddr; } -Q_UINT16 SocksClient::udpPort() const +TQ_UINT16 SocksClient::udpPort() const { return d->udpPort; } @@ -1102,8 +1102,8 @@ public: TQSocketNotifier *sn; }; -SocksServer::SocksServer(TQObject *parent) -:TQObject(parent) +SocksServer::SocksServer(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->sd = 0; @@ -1124,7 +1124,7 @@ bool SocksServer::isActive() const return d->serv.isActive(); } -bool SocksServer::listen(Q_UINT16 port, bool udp) +bool SocksServer::listen(TQ_UINT16 port, bool udp) { stop(); if(!d->serv.listen(port)) diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h index 00ed09b4..d61fef1a 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h @@ -29,9 +29,10 @@ class TQHostAddress; class SocksClient; class SocksServer; -class SocksUDP : public QObject +class SocksUDP : public TQObject { Q_OBJECT + TQ_OBJECT public: ~SocksUDP(); @@ -55,12 +56,13 @@ private: class SocksClient : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; enum Method { AuthNone=0x0001, AuthUsername=0x0002 }; enum Request { ReqConnect, ReqUDPAssociate }; - SocksClient(TQObject *parent=0); - SocksClient(int, TQObject *parent=0); + SocksClient(TQObject *tqparent=0); + SocksClient(int, TQObject *tqparent=0); ~SocksClient(); bool isIncoming() const; @@ -86,11 +88,11 @@ public: // remote address TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; // udp TQString udpAddress() const; - Q_UINT16 udpPort() const; + TQ_UINT16 udpPort() const; SocksUDP *createUDP(const TQString &host, int port, const TQHostAddress &routeAddr, int routePort); signals: @@ -125,15 +127,16 @@ private: void writeData(const TQByteArray &a); }; -class SocksServer : public QObject +class SocksServer : public TQObject { Q_OBJECT + TQ_OBJECT public: - SocksServer(TQObject *parent=0); + SocksServer(TQObject *tqparent=0); ~SocksServer(); bool isActive() const; - bool listen(Q_UINT16 port, bool udp=false); + bool listen(TQ_UINT16 port, bool udp=false); void stop(); int port() const; TQHostAddress address() const; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp index fd1c4992..0bd0ca45 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp @@ -67,7 +67,7 @@ public: bool failed; TQHostAddress resultAddress; - Q_UINT16 resultPort; + TQ_UINT16 resultPort; bool srvonly; TQString srv; @@ -78,8 +78,8 @@ public: SafeDelete sd; }; -SrvResolver::SrvResolver(TQObject *parent) -:TQObject(parent) +SrvResolver::SrvResolver(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->qdns = 0; @@ -180,7 +180,7 @@ TQHostAddress SrvResolver::resultAddress() const return d->resultAddress; } -Q_UINT16 SrvResolver::resultPort() const +TQ_UINT16 SrvResolver::resultPort() const { return d->resultPort; } @@ -205,7 +205,7 @@ void SrvResolver::qdns_done() if(!d->qdns) return; - // apparently we sometimes get this signal even though the results aren't ready + // aptqparently we sometimes get this signal even though the results aren't ready if(d->qdns->isWorking()) return; d->t.stop(); @@ -266,7 +266,7 @@ void SrvResolver::ndns_done() if(!d->qdns) return; - // apparently we sometimes get this signal even though the results aren't ready + // aptqparently we sometimes get this signal even though the results aren't ready if(d->qdns->isWorking()) return; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h index 400639c1..5533790e 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h @@ -26,11 +26,12 @@ // CS_NAMESPACE_BEGIN -class SrvResolver : public QObject +class SrvResolver : public TQObject { Q_OBJECT + TQ_OBJECT public: - SrvResolver(TQObject *parent=0); + SrvResolver(TQObject *tqparent=0); ~SrvResolver(); void resolve(const TQString &server, const TQString &type, const TQString &proto); @@ -43,7 +44,7 @@ public: bool failed() const; TQHostAddress resultAddress() const; - Q_UINT16 resultPort() const; + TQ_UINT16 resultPort() const; signals: void resultsReady(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp index 06df3f73..c9726d75 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp @@ -44,7 +44,7 @@ TQByteArray Base64::encode(const TQByteArray &s) { int i; int len = s.size(); - char tbl[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + char tbl[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; int a, b, c; TQByteArray p((len+2)/3*4); @@ -146,7 +146,7 @@ TQString Base64::arrayToString(const TQByteArray &a) TQCString c; c.resize(b.size()+1); memcpy(c.data(), b.data(), b.size()); - return TQString::fromLatin1(c); + return TQString::tqfromLatin1(c); } //! diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp index e78c2f9a..76d4a799 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 parent \a parent. -ByteStream::ByteStream(TQObject *parent) -:TQObject(parent) +//! Constructs a ByteStream object with tqparent \a tqparent. +ByteStream::ByteStream(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; } diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h index f10b46a1..5706fff6 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h @@ -27,12 +27,13 @@ // CS_NAMESPACE_BEGIN // CS_EXPORT_BEGIN -class ByteStream : public QObject +class ByteStream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *parent=0); + ByteStream(TQObject *tqparent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp index 8f918dde..814b6e9d 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp @@ -23,7 +23,7 @@ #include<openssl/evp.h> #include<openssl/rsa.h> #include"bytestream.h" -#include"qrandom.h" +#include"tqrandom.h" static bool lib_encryptArray(const EVP_CIPHER *type, const TQByteArray &buf, const TQByteArray &key, const TQByteArray &iv, bool pad, TQByteArray *out) { @@ -130,7 +130,7 @@ Cipher::Key Cipher::generateKey(Type t) if(!type) return k; TQByteArray out; - if(!lib_generateKeyIV(type, QRandom::randomArray(128), QRandom::randomArray(2), &out, 0)) + if(!lib_generateKeyIV(type, TQRandom::randomArray(128), TQRandom::randomArray(2), &out, 0)) return k; k.setType(t); k.setData(out); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h index f04c7e0f..b877c1f2 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h @@ -1,5 +1,5 @@ -#ifndef CS_QRANDOM_H -#define CS_QRANDOM_H +#ifndef CS_TQRANDOM_H +#define CS_TQRANDOM_H #include<tqcstring.h> diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp index 12ed189b..8ba6272d 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp @@ -43,13 +43,7 @@ void SafeDelete::deleteAll() void SafeDelete::deleteSingle(TQObject *o) { -#if QT_VERSION < 0x030000 - // roll our own TQObject::deleteLater() - SafeDeleteLater *sdl = SafeDeleteLater::ensureExists(); - sdl->deleteItLater(o); -#else o->deleteLater(); -#endif } //---------------------------------------------------------------------------- diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h index add5af6b..01c47a32 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h @@ -38,9 +38,10 @@ private: void unlock(); }; -class SafeDeleteLater : public QObject +class SafeDeleteLater : public TQObject { Q_OBJECT + TQ_OBJECT public: static SafeDeleteLater *ensureExists(); void deleteItLater(TQObject *o); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp index a3195d89..f7b3c3a9 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp @@ -44,7 +44,7 @@ SHA1::SHA1() qSysInfo(&wordSize, &bigEndian); } -unsigned long SHA1::blk0(Q_UINT32 i) +unsigned long SHA1::blk0(TQ_UINT32 i) { if(bigEndian) return block->l[i]; @@ -53,9 +53,9 @@ unsigned long SHA1::blk0(Q_UINT32 i) } // Hash a single 512-bit block. This is the core of the algorithm. -void SHA1::transform(Q_UINT32 state[5], unsigned char buffer[64]) +void SHA1::transform(TQ_UINT32 state[5], unsigned char buffer[64]) { - Q_UINT32 a, b, c, d, e; + TQ_UINT32 a, b, c, d, e; block = (CHAR64LONG16*)buffer; @@ -112,9 +112,9 @@ void SHA1::init(SHA1_CONTEXT* context) } // Run your data through this -void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len) +void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, TQ_UINT32 len) { - Q_UINT32 i, j; + TQ_UINT32 i, j; j = (context->count[0] >> 3) & 63; if((context->count[0] += len << 3) < (len << 3)) @@ -137,7 +137,7 @@ void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len) // Add padding and return the message digest void SHA1::final(unsigned char digest[20], SHA1_CONTEXT* context) { - Q_UINT32 i, j; + TQ_UINT32 i, j; unsigned char finalcount[8]; for (i = 0; i < 8; i++) { diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h index 7f1a3f9e..093037d3 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h @@ -37,22 +37,22 @@ private: struct SHA1_CONTEXT { - Q_UINT32 state[5]; - Q_UINT32 count[2]; + TQ_UINT32 state[5]; + TQ_UINT32 count[2]; unsigned char buffer[64]; }; typedef union { unsigned char c[64]; - Q_UINT32 l[16]; + TQ_UINT32 l[16]; } CHAR64LONG16; - void transform(Q_UINT32 state[5], unsigned char buffer[64]); + void transform(TQ_UINT32 state[5], unsigned char buffer[64]); void init(SHA1_CONTEXT* context); - void update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len); + void update(SHA1_CONTEXT* context, unsigned char* data, TQ_UINT32 len); void final(unsigned char digest[20], SHA1_CONTEXT* context); - unsigned long blk0(Q_UINT32 i); + unsigned long blk0(TQ_UINT32 i); bool bigEndian; CHAR64LONG16* block; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp index 0c8b46df..2b9407ce 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 *parent, const char *name) -:TQDialog(parent, name, FALSE, WDestructiveClose) +ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *tqparent, const char *name) +:TQDialog(tqparent, 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 3d92dd74..408699f7 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h @@ -23,11 +23,12 @@ #include<tqdialog.h> -class ShowTextDlg : public QDialog +class ShowTextDlg : public TQDialog { Q_OBJECT + TQ_OBJECT public: - ShowTextDlg(const TQString &fname, bool rich=FALSE, TQWidget *parent=0, const char *name=0); + ShowTextDlg(const TQString &fname, bool rich=FALSE, TQWidget *tqparent=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 f4905057..12b9ad55 100644 --- a/kopete/protocols/jabber/libiris/iris/include/im.h +++ b/kopete/protocols/jabber/libiris/iris/include/im.h @@ -136,11 +136,11 @@ namespace XMPP SubType value; }; - class Status + class tqStatus { public: - Status(const TQString &show="", const TQString &status="", int priority=0, bool available=true); - ~Status(); + tqStatus(const TQString &show="", const TQString &status="", int priority=0, bool available=true); + ~tqStatus(); int priority() const; const TQString & show() const; @@ -162,7 +162,7 @@ namespace XMPP void setPriority(int); void setShow(const TQString &); - void setStatus(const TQString &); + void settqStatus(const TQString &); void setTimeStamp(const TQDateTime &); void setKeyID(const TQString &); void setIsAvailable(bool); @@ -197,19 +197,19 @@ namespace XMPP class Resource { public: - Resource(const TQString &name="", const Status &s=Status()); + Resource(const TQString &name="", const tqStatus &s=tqStatus()); ~Resource(); const TQString & name() const; int priority() const; - const Status & status() const; + const tqStatus & status() const; void setName(const TQString &); - void setStatus(const Status &); + void settqStatus(const tqStatus &); private: TQString v_name; - Status v_status; + tqStatus v_status; class ResourcePrivate *d; }; @@ -220,10 +220,10 @@ namespace XMPP ResourceList(); ~ResourceList(); - ResourceList::Iterator find(const TQString &); + ResourceList::Iterator tqfind(const TQString &); ResourceList::Iterator priority(); - ResourceList::ConstIterator find(const TQString &) const; + ResourceList::ConstIterator tqfind(const TQString &) const; ResourceList::ConstIterator priority() const; private: @@ -273,8 +273,8 @@ namespace XMPP Roster(); ~Roster(); - Roster::Iterator find(const Jid &); - Roster::ConstIterator find(const Jid &) const; + Roster::Iterator tqfind(const Jid &); + Roster::ConstIterator tqfind(const Jid &) const; private: class RosterPrivate *d; @@ -492,16 +492,17 @@ namespace XMPP class JidLinkManager; class FileTransferManager; - class Task : public QObject + class Task : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { ErrDisc }; - Task(Task *parent); + Task(Task *tqparent); Task(Client *, bool isRoot); virtual ~Task(); - Task *parent() const; + Task *tqparent() const; Client *client() const; TQDomDocument *doc() const; TQString id() const; @@ -539,12 +540,13 @@ namespace XMPP TaskPrivate *d; }; - class Client : public QObject + class Client : public TQObject { Q_OBJECT + TQ_OBJECT public: - Client(TQObject *parent=0); + Client(TQObject *tqparent=0); ~Client(); bool isActive() const; @@ -568,7 +570,7 @@ namespace XMPP void rosterRequest(); void sendMessage(const Message &); void sendSubscription(const Jid &, const TQString &); - void setPresence(const Status &); + void setPresence(const tqStatus &); void debug(const TQString &); TQString genUniqueId(); @@ -608,8 +610,8 @@ namespace XMPP bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick); bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick, const TQString &password); - void groupChatSetStatus(const TQString &host, const TQString &room, const Status &); - void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &); + void groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &); + void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &); void groupChatLeave(const TQString &host, const TQString &room); signals: @@ -630,7 +632,7 @@ namespace XMPP void xmlOutgoing(const TQString &); void groupChatJoined(const Jid &); void groupChatLeft(const Jid &); - void groupChatPresence(const Jid &, const Status &); + void groupChatPresence(const Jid &, const tqStatus &); void groupChatError(const Jid &, int, const TQString &); void incomingJidLink(); @@ -639,7 +641,7 @@ namespace XMPP //void streamConnected(); //void streamHandshaken(); //void streamError(const StreamError &); - //void streamSSLCertificateReady(const QSSLCert &); + //void streamSSLCertificateReady(const TQSSLCert &); //void streamCloseFinished(); void streamError(int); void streamReadyRead(); @@ -650,7 +652,7 @@ namespace XMPP // basic daemons void ppSubscription(const Jid &, const TQString &); - void ppPresence(const Jid &, const Status &); + void ppPresence(const Jid &, const tqStatus &); void pmMessage(const Message &); void prRoster(const Roster &); @@ -664,8 +666,8 @@ namespace XMPP void distribute(const TQDomElement &); void importRoster(const Roster &); void importRosterItem(const RosterItem &); - void updateSelfPresence(const Jid &, const Status &); - void updatePresence(LiveRosterItem *, const Jid &, const Status &); + void updateSelfPresence(const Jid &, const tqStatus &); + void updatePresence(LiveRosterItem *, const Jid &, const tqStatus &); class ClientPrivate; ClientPrivate *d; @@ -687,15 +689,15 @@ namespace XMPP ResourceList::ConstIterator priority() const; bool isAvailable() const; - const Status & lastUnavailableStatus() const; + const tqStatus & lastUnavailabletqStatus() const; bool flagForDelete() const; - void setLastUnavailableStatus(const Status &); + void setLastUnavailabletqStatus(const tqStatus &); void setFlagForDelete(bool); private: ResourceList v_resourceList; - Status v_lastUnavailableStatus; + tqStatus v_lastUnavailabletqStatus; bool v_flagForDelete; class LiveRosterItemPrivate; @@ -709,8 +711,8 @@ namespace XMPP ~LiveRoster(); void flagAllForDelete(); - LiveRoster::Iterator find(const Jid &, bool compareRes=true); - LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const; + LiveRoster::Iterator tqfind(const Jid &, bool compareRes=true); + LiveRoster::ConstIterator tqfind(const Jid &, bool compareRes=true) const; private: class LiveRosterPrivate; diff --git a/kopete/protocols/jabber/libiris/iris/include/xmpp.h b/kopete/protocols/jabber/libiris/iris/include/xmpp.h index 12d87d18..a59a4827 100644 --- a/kopete/protocols/jabber/libiris/iris/include/xmpp.h +++ b/kopete/protocols/jabber/libiris/iris/include/xmpp.h @@ -60,11 +60,12 @@ namespace XMPP void setDebug(Debug *); - class Connector : public QObject + class Connector : public TQObject { Q_OBJECT + TQ_OBJECT public: - Connector(TQObject *parent=0); + Connector(TQObject *tqparent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; @@ -74,7 +75,7 @@ namespace XMPP bool useSSL() const; bool havePeerAddress() const; TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; signals: void connected(); @@ -83,21 +84,22 @@ namespace XMPP protected: void setUseSSL(bool b); void setPeerAddressNone(); - void setPeerAddress(const TQHostAddress &addr, Q_UINT16 port); + void setPeerAddress(const TQHostAddress &addr, TQ_UINT16 port); private: bool ssl; bool haveaddr; TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; class AdvancedConnector : public Connector { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream }; - AdvancedConnector(TQObject *parent=0); + AdvancedConnector(TQObject *tqparent=0); virtual ~AdvancedConnector(); class Proxy @@ -109,28 +111,28 @@ namespace XMPP int type() const; TQString host() const; - Q_UINT16 port() const; + TQ_UINT16 port() const; TQString url() const; TQString user() const; TQString pass() const; int pollInterval() const; - void setHttpConnect(const TQString &host, Q_UINT16 port); - void setHttpPoll(const TQString &host, Q_UINT16 port, const TQString &url); - void setSocks(const TQString &host, Q_UINT16 port); + void setHttpConnect(const TQString &host, TQ_UINT16 port); + void setHttpPoll(const TQString &host, TQ_UINT16 port, const TQString &url); + void setSocks(const TQString &host, TQ_UINT16 port); void setUserPass(const TQString &user, const TQString &pass); void setPollInterval(int secs); private: int t; TQString v_host, v_url; - Q_UINT16 v_port; + TQ_UINT16 v_port; TQString v_user, v_pass; int v_poll; }; void setProxy(const Proxy &proxy); - void setOptHostPort(const TQString &host, Q_UINT16 port); + void setOptHostPort(const TQString &host, TQ_UINT16 port); void setOptProbe(bool); void setOptSSL(bool); @@ -166,11 +168,12 @@ namespace XMPP void tryNextSrv(); }; - class TLSHandler : public QObject + class TLSHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - TLSHandler(TQObject *parent=0); + TLSHandler(TQObject *tqparent=0); virtual ~TLSHandler(); virtual void reset()=0; @@ -189,8 +192,9 @@ namespace XMPP class QCATLSHandler : public TLSHandler { Q_OBJECT + TQ_OBJECT public: - QCATLSHandler(QCA::TLS *parent); + QCATLSHandler(QCA::TLS *tqparent); ~QCATLSHandler(); QCA::TLS *tls() const; @@ -353,9 +357,10 @@ namespace XMPP Private *d; }; - class Stream : public QObject + class Stream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 }; enum StreamCond { @@ -370,7 +375,7 @@ namespace XMPP SystemShutdown }; - Stream(TQObject *parent=0); + Stream(TQObject *tqparent=0); virtual ~Stream(); virtual TQDomDocument & doc() const=0; @@ -404,6 +409,7 @@ namespace XMPP class ClientStream : public Stream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up @@ -450,8 +456,8 @@ namespace XMPP BindConflict // resource in-use }; - 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(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(); Jid jid() const; @@ -479,7 +485,7 @@ namespace XMPP void setSSFRange(int low, int high); void setOldOnly(bool); void setSASLMechanism(const TQString &s); - void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port); + void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port); // reimplemented TQDomDocument & doc() const; diff --git a/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp b/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp index b76a2837..8532fd4a 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp @@ -1,5 +1,5 @@ /* - * all_mocs.cpp - #include all .moc files in this directory + * all_tqmocs.cpp - #include all .tqmoc files in this directory * Copyright (C) 2004 Richard Smith * * This library is free software; you can redistribute it and/or diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp index 87743e7f..2a9553a2 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp @@ -53,11 +53,11 @@ public: JT_FT *ft; Jid peer; TQString fname; - Q_LLONG size; - Q_LLONG sent; + TQ_LLONG size; + TQ_LLONG sent; TQString desc; bool rangeSupported; - Q_LLONG rangeOffset, rangeLength, length; + TQ_LLONG rangeOffset, rangeLength, length; TQString streamType; bool needStream; TQString id, iq_id; @@ -67,8 +67,8 @@ public: bool sender; }; -FileTransfer::FileTransfer(FileTransferManager *m, TQObject *parent) -:TQObject(parent) +FileTransfer::FileTransfer(FileTransferManager *m, TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->m = m; @@ -104,7 +104,7 @@ void FileTransfer::setProxy(const Jid &proxy) d->proxy = proxy; } -void FileTransfer::sendFile(const Jid &to, const TQString &fname, Q_LLONG size, const TQString &desc) +void FileTransfer::sendFile(const Jid &to, const TQString &fname, TQ_LLONG size, const TQString &desc) { d->state = Requesting; d->peer = to; @@ -127,9 +127,9 @@ int FileTransfer::dataSizeNeeded() const int pending = d->c->bytesToWrite(); if(pending >= SENDBUFSIZE) return 0; - Q_LLONG left = d->length - (d->sent + pending); + TQ_LLONG left = d->length - (d->sent + pending); int size = SENDBUFSIZE - pending; - if((Q_LLONG)size > left) + if((TQ_LLONG)size > left) size = (int)left; return size; } @@ -137,12 +137,12 @@ int FileTransfer::dataSizeNeeded() const void FileTransfer::writeFileData(const TQByteArray &a) { int pending = d->c->bytesToWrite(); - Q_LLONG left = d->length - (d->sent + pending); + TQ_LLONG left = d->length - (d->sent + pending); if(left == 0) return; TQByteArray block; - if((Q_LLONG)a.size() > left) { + if((TQ_LLONG)a.size() > left) { block = a.copy(); block.resize((uint)left); } @@ -161,7 +161,7 @@ TQString FileTransfer::fileName() const return d->fname; } -Q_LLONG FileTransfer::fileSize() const +TQ_LLONG FileTransfer::fileSize() const { return d->size; } @@ -176,17 +176,17 @@ bool FileTransfer::rangeSupported() const return d->rangeSupported; } -Q_LLONG FileTransfer::offset() const +TQ_LLONG FileTransfer::offset() const { return d->rangeOffset; } -Q_LLONG FileTransfer::length() const +TQ_LLONG FileTransfer::length() const { return d->length; } -void FileTransfer::accept(Q_LLONG offset, Q_LLONG length) +void FileTransfer::accept(TQ_LLONG offset, TQ_LLONG length) { d->state = Connecting; d->rangeOffset = offset; @@ -275,8 +275,8 @@ void FileTransfer::s5b_connectionClosed() void FileTransfer::s5b_readyRead() { TQByteArray a = d->c->read(); - Q_LLONG need = d->length - d->sent; - if((Q_LLONG)a.size() > need) + TQ_LLONG need = d->length - d->sent; + if((TQ_LLONG)a.size() > need) a.resize((uint)need); d->sent += a.size(); if(d->sent == d->length) @@ -445,13 +445,13 @@ class JT_FT::Private public: TQDomElement iq; Jid to; - Q_LLONG size, rangeOffset, rangeLength; + TQ_LLONG size, rangeOffset, rangeLength; TQString streamType; TQStringList streamTypes; }; -JT_FT::JT_FT(Task *parent) -:Task(parent) +JT_FT::JT_FT(Task *tqparent) +:Task(tqparent) { d = new Private; } @@ -461,7 +461,7 @@ JT_FT::~JT_FT() delete d; } -void JT_FT::request(const Jid &to, const TQString &_id, const TQString &fname, Q_LLONG size, const TQString &desc, const TQStringList &streamTypes) +void JT_FT::request(const Jid &to, const TQString &_id, const TQString &fname, TQ_LLONG size, const TQString &desc, const TQStringList &streamTypes) { TQDomElement iq; d->to = to; @@ -512,12 +512,12 @@ void JT_FT::request(const Jid &to, const TQString &_id, const TQString &fname, Q d->iq = iq; } -Q_LLONG JT_FT::rangeOffset() const +TQ_LLONG JT_FT::rangeOffset() const { return d->rangeOffset; } -Q_LLONG JT_FT::rangeLength() const +TQ_LLONG JT_FT::rangeLength() const { return d->rangeLength; } @@ -546,8 +546,8 @@ bool JT_FT::take(const TQDomElement &x) TQString id = si.attribute("id"); - Q_LLONG range_offset = 0; - Q_LLONG range_length = 0; + TQ_LLONG range_offset = 0; + TQ_LLONG range_length = 0; TQDomElement file = si.elementsByTagName("file").item(0).toElement(); if(!file.isNull()) { @@ -556,11 +556,7 @@ bool JT_FT::take(const TQDomElement &x) int x; bool ok; if(range.hasAttribute("offset")) { -#if QT_VERSION >= 0x030200 x = range.attribute("offset").toLongLong(&ok); -#else - x = range.attribute("offset").toLong(&ok); -#endif if(!ok || x < 0) { setError(900, ""); return true; @@ -568,11 +564,7 @@ bool JT_FT::take(const TQDomElement &x) range_offset = x; } if(range.hasAttribute("length")) { -#if QT_VERSION >= 0x030200 x = range.attribute("length").toLongLong(&ok); -#else - x = range.attribute("length").toLong(&ok); -#endif if(!ok || x < 0) { setError(900, ""); return true; @@ -627,8 +619,8 @@ bool JT_FT::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_PushFT //---------------------------------------------------------------------------- -JT_PushFT::JT_PushFT(Task *parent) -:Task(parent) +JT_PushFT::JT_PushFT(Task *tqparent) +:Task(tqparent) { } @@ -636,7 +628,7 @@ JT_PushFT::~JT_PushFT() { } -void JT_PushFT::respondSuccess(const Jid &to, const TQString &id, Q_LLONG rangeOffset, Q_LLONG rangeLength, const TQString &streamType) +void JT_PushFT::respondSuccess(const Jid &to, const TQString &id, TQ_LLONG rangeOffset, TQ_LLONG rangeLength, const TQString &streamType) { TQDomElement iq = createIQ(doc(), "result", to.full(), id); TQDomElement si = doc()->createElement("si"); @@ -717,11 +709,7 @@ bool JT_PushFT::take(const TQDomElement &e) } bool ok; -#if QT_VERSION >= 0x030200 - Q_LLONG size = file.attribute("size").toLongLong(&ok); -#else - Q_LLONG size = file.attribute("size").toLong(&ok); -#endif + TQ_LLONG size = file.attribute("size").toLongLong(&ok); if(!ok || size < 0) { respondError(from, id, 400, "Bad file size"); return true; diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h index 9026b478..6ad8f7ff 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h @@ -21,20 +21,17 @@ #ifndef XMPP_FILETRANSFER_H #define XMPP_FILETRANSFER_H -#include"im.h" - -#if QT_VERSION < 0x030200 -typedef long int Q_LLONG; -#endif +#include "im.h" namespace XMPP { class S5BConnection; struct FTRequest; - class FileTransfer : public QObject + class FileTransfer : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { ErrReject, ErrNeg, ErrConnect, ErrProxy, ErrStream }; enum { Idle, Requesting, Connecting, WaitingForAccept, Active }; @@ -43,19 +40,19 @@ namespace XMPP void setProxy(const Jid &proxy); // send - void sendFile(const Jid &to, const TQString &fname, Q_LLONG size, const TQString &desc); - Q_LLONG offset() const; - Q_LLONG length() const; + void sendFile(const Jid &to, const TQString &fname, TQ_LLONG size, const TQString &desc); + TQ_LLONG offset() const; + TQ_LLONG length() const; int dataSizeNeeded() const; void writeFileData(const TQByteArray &a); // receive Jid peer() const; TQString fileName() const; - Q_LLONG fileSize() const; + TQ_LLONG fileSize() const; TQString description() const; bool rangeSupported() const; - void accept(Q_LLONG offset=0, Q_LLONG length=0); + void accept(TQ_LLONG offset=0, TQ_LLONG length=0); // both void close(); // reject, or stop sending/receiving @@ -84,14 +81,15 @@ namespace XMPP void reset(); friend class FileTransferManager; - FileTransfer(FileTransferManager *, TQObject *parent=0); + FileTransfer(FileTransferManager *, TQObject *tqparent=0); void man_waitForAccept(const FTRequest &req); void takeConnection(S5BConnection *c); }; - class FileTransferManager : public QObject + class FileTransferManager : public TQObject { Q_OBJECT + TQ_OBJECT public: FileTransferManager(Client *); ~FileTransferManager(); @@ -123,13 +121,14 @@ namespace XMPP class JT_FT : public Task { Q_OBJECT + TQ_OBJECT public: - JT_FT(Task *parent); + JT_FT(Task *tqparent); ~JT_FT(); - void request(const Jid &to, const TQString &id, const TQString &fname, Q_LLONG size, const TQString &desc, const TQStringList &streamTypes); - Q_LLONG rangeOffset() const; - Q_LLONG rangeLength() const; + void request(const Jid &to, const TQString &id, const TQString &fname, TQ_LLONG size, const TQString &desc, const TQStringList &streamTypes); + TQ_LLONG rangeOffset() const; + TQ_LLONG rangeLength() const; TQString streamType() const; void onGo(); @@ -145,7 +144,7 @@ namespace XMPP Jid from; TQString iq_id, id; TQString fname; - Q_LLONG size; + TQ_LLONG size; TQString desc; bool rangeSupported; TQStringList streamTypes; @@ -153,11 +152,12 @@ namespace XMPP class JT_PushFT : public Task { Q_OBJECT + TQ_OBJECT public: - JT_PushFT(Task *parent); + JT_PushFT(Task *tqparent); ~JT_PushFT(); - void respondSuccess(const Jid &to, const TQString &id, Q_LLONG rangeOffset, Q_LLONG rangeLength, const TQString &streamType); + void respondSuccess(const Jid &to, const TQString &id, TQ_LLONG rangeOffset, TQ_LLONG rangeLength, const TQString &streamType); void respondError(const Jid &to, const TQString &id, int code, const TQString &str); bool take(const TQDomElement &); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp index df753925..1914ad26 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp @@ -61,9 +61,10 @@ static bool haveHost(const StreamHostList &list, const Jid &j) return false; } -class S5BManager::Item : public QObject +class S5BManager::Item : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { Idle, Initiator, Target, Active }; enum { ErrRefused, ErrConnect, ErrWrongHost, ErrProxy }; @@ -184,8 +185,8 @@ public: static int id_conn = 0; static int num_conn = 0; -S5BConnection::S5BConnection(S5BManager *m, TQObject *parent) -:ByteStream(parent) +S5BConnection::S5BConnection(S5BManager *m, TQObject *tqparent) +:ByteStream(tqparent) { d = new Private; d->m = m; @@ -574,15 +575,15 @@ public: JT_PushS5B *ps; }; -S5BManager::S5BManager(Client *parent) -:TQObject(parent) +S5BManager::S5BManager(Client *tqparent) +:TQObject(tqparent) { // S5B needs SHA1 if(!QCA::isSupported(QCA::CAP_SHA1)) QCA::insertProvider(createProviderHash()); d = new Private; - d->client = parent; + d->client = tqparent; d->serv = 0; d->activeList.setAutoDelete(true); @@ -1745,9 +1746,10 @@ void S5BManager::Item::finished() //---------------------------------------------------------------------------- // S5BConnector //---------------------------------------------------------------------------- -class S5BConnector::Item : public QObject +class S5BConnector::Item : public TQObject { Q_OBJECT + TQ_OBJECT public: SocksClient *client; SocksUDP *client_udp; @@ -1863,8 +1865,8 @@ public: TQTimer t; }; -S5BConnector::S5BConnector(TQObject *parent) -:TQObject(parent) +S5BConnector::S5BConnector(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->active = 0; @@ -1976,9 +1978,10 @@ void S5BConnector::man_udpSuccess(const Jid &streamHost) //---------------------------------------------------------------------------- // S5BServer //---------------------------------------------------------------------------- -class S5BServer::Item : public QObject +class S5BServer::Item : public TQObject { Q_OBJECT + TQ_OBJECT public: SocksClient *client; TQString host; @@ -2051,8 +2054,8 @@ public: TQPtrList<Item> itemList; }; -S5BServer::S5BServer(TQObject *parent) -:TQObject(parent) +S5BServer::S5BServer(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->itemList.setAutoDelete(true); @@ -2192,8 +2195,8 @@ public: TQTimer t; }; -JT_S5B::JT_S5B(Task *parent) -:Task(parent) +JT_S5B::JT_S5B(Task *tqparent) +:Task(tqparent) { d = new Private; d->mode = -1; @@ -2353,8 +2356,8 @@ StreamHost JT_S5B::proxyInfo() const //---------------------------------------------------------------------------- // JT_PushS5B //---------------------------------------------------------------------------- -JT_PushS5B::JT_PushS5B(Task *parent) -:Task(parent) +JT_PushS5B::JT_PushS5B(Task *tqparent) +:Task(tqparent) { } diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h index d8c301c1..d9818503 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h @@ -60,6 +60,7 @@ namespace XMPP class S5BConnection : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Mode { Stream, Datagram }; enum Error { ErrRefused, ErrConnect, ErrProxy, ErrSocket }; @@ -124,12 +125,13 @@ namespace XMPP void man_clientReady(SocksClient *, SocksUDP *); void man_udpReady(const TQByteArray &buf); void man_failed(int); - S5BConnection(S5BManager *, TQObject *parent=0); + S5BConnection(S5BManager *, TQObject *tqparent=0); }; - class S5BManager : public QObject + class S5BManager : public TQObject { Q_OBJECT + TQ_OBJECT public: S5BManager(Client *); ~S5BManager(); @@ -196,11 +198,12 @@ namespace XMPP void doActivate(const Jid &peer, const TQString &sid, const Jid &streamHost); }; - class S5BConnector : public QObject + class S5BConnector : public TQObject { Q_OBJECT + TQ_OBJECT public: - S5BConnector(TQObject *parent=0); + S5BConnector(TQObject *tqparent=0); ~S5BConnector(); void reset(); @@ -227,9 +230,10 @@ namespace XMPP }; // listens on a port for serving - class S5BServer : public QObject + class S5BServer : public TQObject { Q_OBJECT + TQ_OBJECT public: S5BServer(TQObject *par=0); ~S5BServer(); @@ -263,6 +267,7 @@ namespace XMPP class JT_S5B : public Task { Q_OBJECT + TQ_OBJECT public: JT_S5B(Task *); ~JT_S5B(); @@ -297,6 +302,7 @@ namespace XMPP class JT_PushS5B : public Task { Q_OBJECT + TQ_OBJECT public: JT_PushS5B(Task *); ~JT_PushS5B(); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp index 2ca012c1..6bf15aa2 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 *parent) -:TQObject(parent) +IBBManager::IBBManager(Client *tqparent) +:TQObject(tqparent) { d = new Private; - d->client = parent; + d->client = tqparent; 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 *parent, bool serve) -:Task(parent) +JT_IBB::JT_IBB(Task *tqparent, bool serve) +:Task(tqparent) { d = new Private; d->serve = serve; diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h index e5a0ed93..27df2465 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h @@ -37,6 +37,7 @@ namespace XMPP class IBBConnection : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum { ErrRequest, ErrData }; enum { Idle, Requesting, WaitingForAccept, Active }; @@ -78,9 +79,10 @@ namespace XMPP typedef TQPtrList<IBBConnection> IBBConnectionList; typedef TQPtrListIterator<IBBConnection> IBBConnectionListIt; - class IBBManager : public QObject + class IBBManager : public TQObject { Q_OBJECT + TQ_OBJECT public: IBBManager(Client *); ~IBBManager(); @@ -114,6 +116,7 @@ namespace XMPP class JT_IBB : public Task { Q_OBJECT + TQ_OBJECT public: enum { ModeRequest, ModeSendData }; JT_IBB(Task *, bool serve=false); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h index 40d3d4eb..a10547ff 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h @@ -35,9 +35,10 @@ namespace XMPP { class Client; - class JidLink : public QObject + class JidLink : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { None, DTCP, IBB }; enum { Idle, Connecting, WaitingForAccept, Active }; @@ -94,9 +95,10 @@ namespace XMPP }; // the job of JidLinkManager is to keep track of streams and properly shut them down - class JidLinkManager : public QObject + class JidLinkManager : public TQObject { Q_OBJECT + TQ_OBJECT public: JidLinkManager(Client *); ~JidLinkManager(); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp index 3c8e5435..a8ad7bd9 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 *parent) -:TQObject(parent) +Connector::Connector(TQObject *tqparent) +:TQObject(tqparent) { setUseSSL(false); setPeerAddressNone(); @@ -81,7 +81,7 @@ TQHostAddress Connector::peerAddress() const return addr; } -Q_UINT16 Connector::peerPort() const +TQ_UINT16 Connector::peerPort() const { return port; } @@ -98,7 +98,7 @@ void Connector::setPeerAddressNone() port = 0; } -void Connector::setPeerAddress(const TQHostAddress &_addr, Q_UINT16 _port) +void Connector::setPeerAddress(const TQHostAddress &_addr, TQ_UINT16 _port) { haveaddr = true; addr = _addr; @@ -129,7 +129,7 @@ TQString AdvancedConnector::Proxy::host() const return v_host; } -Q_UINT16 AdvancedConnector::Proxy::port() const +TQ_UINT16 AdvancedConnector::Proxy::port() const { return v_port; } @@ -154,14 +154,14 @@ int AdvancedConnector::Proxy::pollInterval() const return v_poll; } -void AdvancedConnector::Proxy::setHttpConnect(const TQString &host, Q_UINT16 port) +void AdvancedConnector::Proxy::setHttpConnect(const TQString &host, TQ_UINT16 port) { t = HttpConnect; v_host = host; v_port = port; } -void AdvancedConnector::Proxy::setHttpPoll(const TQString &host, Q_UINT16 port, const TQString &url) +void AdvancedConnector::Proxy::setHttpPoll(const TQString &host, TQ_UINT16 port, const TQString &url) { t = HttpPoll; v_host = host; @@ -169,7 +169,7 @@ void AdvancedConnector::Proxy::setHttpPoll(const TQString &host, Q_UINT16 port, v_url = url; } -void AdvancedConnector::Proxy::setSocks(const TQString &host, Q_UINT16 port) +void AdvancedConnector::Proxy::setSocks(const TQString &host, TQ_UINT16 port) { t = Socks; v_host = host; @@ -223,8 +223,8 @@ public: SafeDelete sd; }; -AdvancedConnector::AdvancedConnector(TQObject *parent) -:Connector(parent) +AdvancedConnector::AdvancedConnector(TQObject *tqparent) +:Connector(tqparent) { d = new Private; d->bs = 0; @@ -285,7 +285,7 @@ void AdvancedConnector::setProxy(const Proxy &proxy) d->proxy = proxy; } -void AdvancedConnector::setOptHostPort(const TQString &host, Q_UINT16 _port) +void AdvancedConnector::setOptHostPort(const TQString &host, TQ_UINT16 _port) { if(d->mode != Idle) return; @@ -409,7 +409,7 @@ void AdvancedConnector::dns_done() //if(!d->qdns) // return; - // apparently we sometimes get this signal even though the results aren' t ready + // aptqparently we sometimes get this signal even though the results aren' t ready //if(d->qdns->isWorking()) // return; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp index 4c8307cb..1b1dc1c7 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp @@ -104,8 +104,8 @@ static void ensureEndian() * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined. */ -typedef Q_UINT8 md5_byte_t; /* 8-bit byte */ -typedef Q_UINT32 md5_word_t; /* 32-bit word */ +typedef TQ_UINT8 md5_byte_t; /* 8-bit byte */ +typedef TQ_UINT32 md5_word_t; /* 32-bit word */ /* Define the state of the MD5 Algorithm. */ typedef struct md5_state_s { @@ -437,14 +437,14 @@ md5_finish(md5_state_t *pms, md5_byte_t digest[16]) struct SHA1_CONTEXT { - Q_UINT32 state[5]; - Q_UINT32 count[2]; + TQ_UINT32 state[5]; + TQ_UINT32 count[2]; unsigned char buffer[64]; }; typedef union { unsigned char c[64]; - Q_UINT32 l[16]; + TQ_UINT32 l[16]; } CHAR64LONG16; class SHA1Context : public QCA_HashContext @@ -480,7 +480,7 @@ public: *out = b; } - unsigned long blk0(Q_UINT32 i) + unsigned long blk0(TQ_UINT32 i) { if(bigEndian) return block->l[i]; @@ -489,9 +489,9 @@ public: } // Hash a single 512-bit block. This is the core of the algorithm. - void transform(Q_UINT32 state[5], unsigned char buffer[64]) + void transform(TQ_UINT32 state[5], unsigned char buffer[64]) { - Q_UINT32 a, b, c, d, e; + TQ_UINT32 a, b, c, d, e; block = (CHAR64LONG16*)buffer; @@ -548,9 +548,9 @@ public: } // Run your data through this - void sha1_update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len) + void sha1_update(SHA1_CONTEXT* context, unsigned char* data, TQ_UINT32 len) { - Q_UINT32 i, j; + TQ_UINT32 i, j; j = (context->count[0] >> 3) & 63; if((context->count[0] += len << 3) < (len << 3)) @@ -573,7 +573,7 @@ public: // Add padding and return the message digest void sha1_final(unsigned char digest[20], SHA1_CONTEXT* context) { - Q_UINT32 i, j; + TQ_UINT32 i, j; unsigned char finalcount[8]; for (i = 0; i < 8; i++) { diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp index 090cc9df..90cf1364 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp @@ -42,7 +42,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->nameprep_table.find(in); + Result *r = that->nameprep_table.tqfind(in); if(r) { if(!r->norm) @@ -78,7 +78,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->nodeprep_table.find(in); + Result *r = that->nodeprep_table.tqfind(in); if(r) { if(!r->norm) @@ -114,7 +114,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->resourceprep_table.find(in); + Result *r = that->resourceprep_table.tqfind(in); if(r) { if(!r->norm) @@ -248,7 +248,7 @@ void Jid::set(const TQString &s) { TQString rest, domain, node, resource; TQString norm_domain, norm_node, norm_resource; - int x = s.find('/'); + int x = s.tqfind('/'); if(x != -1) { rest = s.mid(0, x); resource = s.mid(x+1); @@ -262,7 +262,7 @@ void Jid::set(const TQString &s) return; } - x = rest.find('@'); + x = rest.tqfind('@'); if(x != -1) { node = rest.mid(0, x); domain = rest.mid(x+1); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp index 4c10bd53..ba14f404 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp @@ -22,7 +22,7 @@ TODO: For XMPP::Parser to be "perfect", some things must be solved/changed in the - Qt library: + TQt library: - Fix weird TQDomElement::haveAttributeNS() bug (patch submitted to Trolltech on Aug 31st, 2003). @@ -31,7 +31,7 @@ the final '>' is reached. - Fix incremental parsing bugs in TQXmlSimpleReader. At the moment, the only bug I've found is related to attribute parsing, but there might - be more (search for '###' in $QTDIR/src/xml/qxml.cpp). + be more (search for '###' in $TQTDIR/src/xml/qxml.cpp). We have workarounds for all of the above problems in the code below. @@ -44,7 +44,7 @@ - Make TQXmlInputSource capable of accepting data incrementally, to ensure proper text encoding detection and processing over a network. This is technically not a bug, as we have our own subclass below to do it, but - it would be nice if Qt had this already. + it would be nice if TQt had this already. */ #include"parser.h" @@ -61,7 +61,7 @@ static bool qt_bug_have; //---------------------------------------------------------------------------- // StreamInput //---------------------------------------------------------------------------- -class StreamInput : public QXmlInputSource +class StreamInput : public TQXmlInputSource { public: StreamInput() @@ -232,10 +232,10 @@ private: if(mightChangeEncoding) { while(1) { - int n = out.find('<'); + int n = out.tqfind('<'); if(n != -1) { // we need a closing bracket - int n2 = out.find('>', n); + int n2 = out.tqfind('>', n); if(n2 != -1) { ++n2; TQString h = out.mid(n, n2-n); @@ -278,8 +278,8 @@ private: if(h.left(5) != "<?xml") return ""; - int endPos = h.find(">"); - int startPos = h.find("encoding"); + int endPos = h.tqfind(">"); + int startPos = h.tqfind("encoding"); if(startPos < endPos && startPos != -1) { TQString encoding; do { @@ -335,7 +335,7 @@ private: bool checkForBadChars(const TQString &s) { - int len = s.find('<'); + int len = s.tqfind('<'); if(len == -1) len = s.length(); else @@ -354,7 +354,7 @@ private: //---------------------------------------------------------------------------- namespace XMPP { - class ParserHandler : public QXmlDefaultHandler + class ParserHandler : public TQXmlDefaultHandler { public: ParserHandler(StreamInput *_in, TQDomDocument *_doc) @@ -465,7 +465,7 @@ namespace XMPP current = TQDomElement(); } else - current = current.parentNode().toElement(); + current = current.tqparentNode().toElement(); } if(in->lastRead() == '/') @@ -610,7 +610,7 @@ TQString Parser::Event::nsprefix(const TQString &s) const return (*it2); ++it2; } - return TQString::null; + return TQString(); } TQString Parser::Event::namespaceURI() const @@ -737,7 +737,7 @@ Parser::Parser() { d = new Private; - // check for evil bug in Qt <= 3.2.1 + // check for evil bug in TQt <= 3.2.1 if(!qt_bug_check) { qt_bug_check = true; TQDomElement e = d->doc->createElementNS("someuri", "somename"); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h index b702ad55..55dcdde9 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h @@ -45,7 +45,7 @@ namespace XMPP int type() const; // for document open - TQString nsprefix(const TQString &s=TQString::null) const; + TQString nsprefix(const TQString &s=TQString()) const; // for document open / close TQString namespaceURI() const; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp index 76d3c781..5a6bc64f 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp @@ -39,7 +39,7 @@ using namespace XMPP; // // This function prints out an array of bytes as latin characters, converting // non-printable bytes into hex values as necessary. Useful for displaying -// QByteArrays for debugging purposes. +// TQByteArrays for debugging purposes. static TQString printArray(const TQByteArray &a) { TQString s; @@ -440,7 +440,7 @@ void BasicProtocol::handleDocOpen(const Parser::Event &pe) int minor = 0; TQString verstr = atts.value("version"); if(!verstr.isEmpty()) { - int n = verstr.find('.'); + int n = verstr.tqfind('.'); if(n != -1) { major = verstr.mid(0, n).toInt(); minor = verstr.mid(n+1).toInt(); @@ -1109,7 +1109,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) e.setAttribute("mechanism", sasl_mech); if(!sasl_step.isEmpty()) { #ifdef XMPP_TEST - TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step))); + TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step))); #endif e.appendChild(doc.createTextNode(Base64::arrayToString(sasl_step))); } @@ -1143,7 +1143,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) else { TQByteArray stepData = sasl_step; #ifdef XMPP_TEST - TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step))); + TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step))); #endif TQDomElement e = doc.createElementNS(NS_SASL, "response"); if(!stepData.isEmpty()) @@ -1289,7 +1289,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) #ifdef XMPP_TEST TQString s = "SASL mechs:"; for(TQStringList::ConstIterator it = f.sasl_mechs.begin(); it != f.sasl_mechs.end(); ++it) - s += TQString(" [%1]").arg((*it)); + s += TQString(" [%1]").tqarg((*it)); TD::msg(s); #endif } @@ -1341,7 +1341,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) if(e.tagName() == "challenge") { TQByteArray a = Base64::stringToArray(e.text()); #ifdef XMPP_TEST - TD::msg(TQString("SASL IN: [%1]").arg(printArray(a))); + TD::msg(TQString("SASL IN: [%1]").tqarg(printArray(a))); #endif sasl_step = a; need = NSASLNext; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/qcaprovider.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/qcaprovider.h index 6eda17f9..9f4fa1fb 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/qcaprovider.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/qcaprovider.h @@ -141,7 +141,7 @@ public: struct QCA_SASLHostPort { TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; struct QCA_SASLNeedParams diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp index f7d44db4..40872ce0 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp @@ -109,9 +109,10 @@ int LayerTracker::finished(int encoded) //---------------------------------------------------------------------------- // SecureStream //---------------------------------------------------------------------------- -class SecureLayer : public QObject +class SecureLayer : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { TLS, SASL, TLSH }; int type; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h index 844fd3d1..f76bd617 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h @@ -36,6 +36,7 @@ namespace XMPP class SecureStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrTLS = ErrCustom, ErrSASL }; SecureStream(ByteStream *s); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp index c825a2ca..da78fef1 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp @@ -78,7 +78,7 @@ public: PropList list; int at = 0; while(1) { - int n = str.find('=', at); + int n = str.tqfind('=', at); if(n == -1) break; TQCString var, val; @@ -86,14 +86,14 @@ public: at = n + 1; if(str[at] == '\"') { ++at; - n = str.find('\"', at); + n = str.tqfind('\"', at); if(n == -1) break; val = str.mid(at, n-at); at = n + 1; } else { - n = str.find(',', at); + n = str.tqfind(',', at); if(n != -1) { val = str.mid(at, n-at); at = n; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index d3182ffe..fe7275ad 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 *parent) -:TQObject(parent) +Stream::Stream(TQObject *tqparent) +:TQObject(tqparent) { } @@ -574,7 +574,7 @@ public: bool allowPlain, mutualAuth; bool haveLocalAddr; TQHostAddress localAddr; - Q_UINT16 localPort; + TQ_UINT16 localPort; int minimumSSF, maximumSSF; TQString sasl_mech; bool doBinding; @@ -612,8 +612,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *parent) -:Stream(parent) +ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tqparent) +:Stream(tqparent) { d = new Private; d->mode = Client; @@ -627,8 +627,8 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *pa d->tlsHandler = tlsHandler; } -ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *parent) -:Stream(parent) +ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *tqparent) +:Stream(tqparent) { d = new Private; d->mode = Server; @@ -832,7 +832,7 @@ void ClientStream::setSASLMechanism(const TQString &s) d->sasl_mech = s; } -void ClientStream::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port) +void ClientStream::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->haveLocalAddr = true; d->localAddr = addr; @@ -1115,7 +1115,7 @@ void ClientStream::sasl_authCheck(const TQString &user, const TQString &) // printf("authcheck: [%s], [%s]\n", user.latin1(), authzid.latin1()); //#endif TQString u = user; - int n = u.find('@'); + int n = u.tqfind('@'); if(n != -1) u.truncate(n); d->srv.user = u; @@ -1241,7 +1241,7 @@ void ClientStream::srvProcessNext() printf("Break (RecvOpen)\n"); // calculate key - TQCString str = QCA::SHA1::hashToString("secret").utf8(); + TQCString str = QCA::SHA1::hashToString(TQCString("secret")).utf8(); str = QCA::SHA1::hashToString(str + "im.pyxa.org").utf8(); str = QCA::SHA1::hashToString(str + d->srv.id.utf8()).utf8(); d->srv.setDialbackKey(str); @@ -1358,9 +1358,9 @@ void ClientStream::processNext() #endif #ifdef XMPP_TEST - TQString s = TQString("handshake success (lang=[%1]").arg(d->client.lang); + TQString s = TQString("handshake success (lang=[%1]").tqarg(d->client.lang); if(!d->client.from.isEmpty()) - s += TQString(", from=[%1]").arg(d->client.from); + s += TQString(", from=[%1]").tqarg(d->client.from); s += ')'; TD::msg(s); #endif diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp index 313c6b6a..996727ea 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 *parent) -:TQObject(parent) +TLSHandler::TLSHandler(TQObject *tqparent) +:TQObject(tqparent) { } @@ -48,11 +48,11 @@ public: int state, err; }; -QCATLSHandler::QCATLSHandler(QCA::TLS *parent) -:TLSHandler(parent) +QCATLSHandler::QCATLSHandler(QCA::TLS *tqparent) +:TLSHandler(tqparent) { d = new Private; - d->tls = parent; + d->tls = tqparent; 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 de321e7c..0f8b17a7 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -28,14 +28,14 @@ using namespace XMPP; // // This function removes namespace information from various nodes for // display purposes only (the element is pretty much useless for processing -// after this). We do this because QXml is a bit overzealous about outputting +// after this). We do this because TQXml is a bit overzealous about outputting // redundant namespaces. static TQDomElement stripExtraNS(const TQDomElement &e) { - // find closest parent with a namespace - TQDomNode par = e.parentNode(); + // find closest tqparent with a namespace + TQDomNode par = e.tqparentNode(); while(!par.isNull() && par.namespaceURI().isNull()) - par = par.parentNode(); + par = par.tqparentNode(); bool noShowNS = false; if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) noShowNS = true; @@ -66,7 +66,7 @@ static TQDomElement stripExtraNS(const TQDomElement &e) i.setAttributeNodeNS(a); } - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -82,13 +82,13 @@ static TQDomElement stripExtraNS(const TQDomElement &e) // // This function converts a TQDomElement into a TQString, using stripExtraNS // to make it pretty. -static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const TQString &fakeQName, bool clip) +static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const TQString &fakeTQName, bool clip) { TQDomElement i = e.cloneNode().toElement(); - // It seems QDom can only have one namespace attribute at a time (see docElement 'HACK'). + // It seems TQDom can only have one namespace attribute at a time (see docElement 'HACK'). // Fortunately we only need one kind depending on the input, so it is specified here. - TQDomElement fake = e.ownerDocument().createElementNS(fakeNS, fakeQName); + TQDomElement fake = e.ownerDocument().createElementNS(fakeNS, fakeTQName); fake.appendChild(i); fake = stripExtraNS(fake); TQString out; @@ -98,7 +98,7 @@ static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const } // 'clip' means to remove any unwanted (and unneeded) characters, such as a trailing newline if(clip) { - int n = out.findRev('>'); + int n = out.tqfindRev('>'); out.truncate(n+1); } return out; @@ -106,11 +106,11 @@ static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const // createRootXmlTags // -// This function creates three QStrings, one being an <?xml .. ?> processing +// This function creates three TQStrings, one being an <?xml .. ?> processing // instruction, and the others being the opening and closing tags of an // element, <foo> and </foo>. This basically allows us to get the raw XML // text needed to open/close an XML stream, without resorting to generating -// the XML ourselves. This function uses QDom to do the generation, which +// the XML ourselves. This function uses TQDom to do the generation, which // ensures proper encoding and entity output. static void createRootXmlTags(const TQDomElement &root, TQString *xmlHeader, TQString *tagOpen, TQString *tagClose) { @@ -128,12 +128,12 @@ static void createRootXmlTags(const TQDomElement &root, TQString *xmlHeader, TQS } // parse the tags out - int n = str.find('<'); - int n2 = str.find('>', n); + int n = str.tqfind('<'); + int n2 = str.tqfind('>', n); ++n2; *tagOpen = str.mid(n, n2-n); - n2 = str.findRev('>'); - n = str.findRev('<'); + n2 = str.tqfindRev('>'); + n = str.tqfindRev('<'); ++n2; *tagClose = str.mid(n, n2-n); @@ -329,7 +329,7 @@ TQString XmlProtocol::elementToString(const TQDomElement &e, bool clip) for(n = 0; n < al.count(); ++n) { TQDomAttr a = al.item(n).toAttr(); TQString s = a.name(); - int x = s.find(':'); + int x = s.tqfind(':'); if(x != -1) s = s.mid(x+1); else diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index c78875bc..9d56467c 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -34,8 +34,8 @@ //! Client, you will need to manually invoke Tasks. Fortunately, the //! process is very simple. //! -//! The entire Task system is heavily founded on Qt. All Tasks have a parent, -//! except for the root Task, and are considered QObjects. By using Qt's RTTI +//! The entire Task system is heavily founded on TQt. All Tasks have a tqparent, +//! 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. //! @@ -96,7 +96,7 @@ using namespace Jabber;*/ -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #define vsnprintf _vsnprintf #endif @@ -191,7 +191,7 @@ void Client::connectToServer(ClientStream *s, const Jid &j, bool auth) //connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected())); //connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken())); connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int))); - //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const QSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const QSSLCert &))); + //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &))); connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead())); //connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished())); connect(d->stream, TQT_SIGNAL(incomingXml(const TQString &)), TQT_SLOT(streamIncomingXml(const TQString &))); @@ -208,13 +208,13 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p d->pass = pass; d->resource = _resource; - Status stat; + tqStatus stat; stat.setIsAvailable(false); d->resourceList += Resource(resource(), stat); JT_PushPresence *pp = new JT_PushPresence(rootTask()); connect(pp, TQT_SIGNAL(subscription(const Jid &, const TQString &)), TQT_SLOT(ppSubscription(const Jid &, const TQString &))); - connect(pp, TQT_SIGNAL(presence(const Jid &, const Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &))); + connect(pp, TQT_SIGNAL(presence(const Jid &, const tqStatus &)), TQT_SLOT(ppPresence(const Jid &, const tqStatus &))); JT_PushMessage *pm = new JT_PushMessage(rootTask()); connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &))); @@ -266,7 +266,7 @@ bool Client::isActive() const return d->active; } -void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &_s) +void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &_s) { Jid jid(room + "@" + host + "/" + nick); for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { @@ -274,7 +274,7 @@ void Client::groupChatChangeNick(const TQString &host, const TQString &room, con if(i.j.compare(jid, false)) { i.j = jid; - Status s = _s; + tqStatus s = _s; s.setIsAvailable(true); JT_Presence *j = new JT_Presence(rootTask()); @@ -302,14 +302,14 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS ++it; } - debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; d->groupChatList += i; JT_Presence *j = new JT_Presence(rootTask()); - j->pres(jid, Status()); + j->pres(jid, tqStatus()); j->go(true); return true; @@ -331,20 +331,20 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS ++it; } - debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; d->groupChatList += i; JT_MucPresence *j = new JT_MucPresence(rootTask()); - j->pres(jid, Status(), password); + j->pres(jid, tqStatus(), password); j->go(true); return true; } -void Client::groupChatSetStatus(const TQString &host, const TQString &room, const Status &_s) +void Client::groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &_s) { Jid jid(room + "@" + host); bool found = false; @@ -359,7 +359,7 @@ void Client::groupChatSetStatus(const TQString &host, const TQString &room, cons if(!found) return; - Status s = _s; + tqStatus s = _s; s.setIsAvailable(true); JT_Presence *j = new JT_Presence(rootTask()); @@ -377,10 +377,10 @@ void Client::groupChatLeave(const TQString &host, const TQString &room) continue; i.status = GroupChat::Closing; - debug(TQString("Client: Leaving: [%1]\n").arg(i.j.full())); + debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full())); JT_Presence *j = new JT_Presence(rootTask()); - Status s; + tqStatus s; s.setIsAvailable(false); j->pres(i.j, s); j->go(true); @@ -409,7 +409,7 @@ void Client::close(bool) i.status = GroupChat::Closing; JT_Presence *j = new JT_Presence(rootTask()); - Status s; + tqStatus s; s.setIsAvailable(false); j->pres(i.j, s); j->go(true); @@ -457,7 +457,7 @@ void Client::streamError(int) //} } -/*void Client::streamSSLCertificateReady(const QSSLCert &cert) +/*void Client::streamSSLCertificateReady(const TQSSLCert &cert) { sslCertReady(cert); } @@ -469,10 +469,10 @@ void Client::streamCloseFinished() static TQDomElement oldStyleNS(const TQDomElement &e) { - // find closest parent with a namespace - TQDomNode par = e.parentNode(); + // find closest tqparent with a namespace + TQDomNode par = e.tqparentNode(); while(!par.isNull() && par.namespaceURI().isNull()) - par = par.parentNode(); + par = par.tqparentNode(); bool noShowNS = false; if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) noShowNS = true; @@ -492,7 +492,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e) if(!noShowNS) i.setAttribute("xmlns", e.namespaceURI()); - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -513,7 +513,7 @@ void Client::streamReadyRead() Stanza s = d->stream->read(); TQString out = s.toString(); - debug(TQString("Client: incoming: [\n%1]\n").arg(out)); + debug(TQString("Client: incoming: [\n%1]\n").tqarg(out)); xmlIncoming(out); TQDomElement x = oldStyleNS(s.element()); @@ -588,7 +588,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) // find closest xmlns TQDomNode n = e; while(!n.isNull() && !n.toElement().hasAttribute("xmlns")) - n = n.parentNode(); + n = n.tqparentNode(); TQString ns; if(n.isNull() || !n.toElement().hasAttribute("xmlns")) ns = "jabber:client"; @@ -606,7 +606,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) i.setAttributeNodeNS(a.cloneNode().toAttr()); } - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -630,7 +630,7 @@ void Client::send(const TQDomElement &x) //x.save(ts, 0); //TQString out = Stream::xmlToString(x); - //debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); + //debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); //xmlOutgoing(out); TQDomElement e = addCorrectNS(x); @@ -641,7 +641,7 @@ void Client::send(const TQDomElement &x) } TQString out = s.toString(); - debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); + debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); xmlOutgoing(out); //printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).latin1(), Stream::xmlToString(e).latin1(), s.toString().latin1()); @@ -653,7 +653,7 @@ void Client::send(const TQString &str) if(!d->stream) return; - debug(TQString("Client: outgoing: [\n%1]\n").arg(str)); + debug(TQString("Client: outgoing: [\n%1]\n").tqarg(str)); xmlOutgoing(str); static_cast<ClientStream*>(d->stream)->writeDirect(str); } @@ -712,12 +712,12 @@ void Client::ppSubscription(const Jid &j, const TQString &s) subscription(j, s); } -void Client::ppPresence(const Jid &j, const Status &s) +void Client::ppPresence(const Jid &j, const tqStatus &s) { if(s.isAvailable()) - debug(TQString("Client: %1 is available.\n").arg(j.full())); + debug(TQString("Client: %1 is available.\n").tqarg(j.full())); else - debug(TQString("Client: %1 is unavailable.\n").arg(j.full())); + debug(TQString("Client: %1 is unavailable.\n").tqarg(j.full())); for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { GroupChat &i = *it; @@ -725,7 +725,7 @@ void Client::ppPresence(const Jid &j, const Status &s) if(i.j.compare(j, false)) { bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true: false; - debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full()).arg(j.full()).arg(us)); + debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").tqarg(i.j.full()).tqarg(j.full()).tqarg(us)); switch(i.status) { case GroupChat::Connecting: if(us && s.hasError()) { @@ -788,16 +788,16 @@ void Client::ppPresence(const Jid &j, const Status &s) } } -void Client::updateSelfPresence(const Jid &j, const Status &s) +void Client::updateSelfPresence(const Jid &j, const tqStatus &s) { - ResourceList::Iterator rit = d->resourceList.find(j.resource()); + ResourceList::Iterator rit = d->resourceList.tqfind(j.resource()); bool found = (rit == d->resourceList.end()) ? false: true; // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - debug(TQString("Client: Removing self resource: name=[%1]\n").arg(j.resource())); - (*rit).setStatus(s); + debug(TQString("Client: Removing self resource: name=[%1]\n").tqarg(j.resource())); + (*rit).settqStatus(s); resourceUnavailable(j, *rit); d->resourceList.remove(rit); } @@ -808,31 +808,31 @@ void Client::updateSelfPresence(const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); d->resourceList += r; - debug(TQString("Client: Adding self resource: name=[%1]\n").arg(j.resource())); + debug(TQString("Client: Adding self resource: name=[%1]\n").tqarg(j.resource())); } else { - (*rit).setStatus(s); + (*rit).settqStatus(s); r = *rit; - debug(TQString("Client: Updating self resource: name=[%1]\n").arg(j.resource())); + debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource())); } resourceAvailable(j, r); } } -void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) +void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) { - ResourceList::Iterator rit = i->resourceList().find(j.resource()); + ResourceList::Iterator rit = i->resourceList().tqfind(j.resource()); bool found = (rit == i->resourceList().end()) ? false: true; // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - (*rit).setStatus(s); - debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); + (*rit).settqStatus(s); + debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); resourceUnavailable(j, *rit); i->resourceList().remove(rit); - i->setLastUnavailableStatus(s); + i->setLastUnavailabletqStatus(s); } } // available? add/update the resource @@ -841,12 +841,12 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); i->resourceList() += r; - debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); + debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); } else { - (*rit).setStatus(s); + (*rit).settqStatus(s); r = *rit; - debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); + debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); } resourceAvailable(j, r); @@ -855,7 +855,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) void Client::pmMessage(const Message &m) { - debug(TQString("Client: Message from %1\n").arg(m.from().full())); + debug(TQString("Client: Message from %1\n").tqarg(m.from().full())); if(m.type() == "groupchat") { for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { @@ -950,7 +950,7 @@ void Client::importRosterItem(const RosterItem &item) // Remove if(item.subscription().type() == Subscription::Remove) { - LiveRoster::Iterator it = d->roster.find(item.jid()); + LiveRoster::Iterator it = d->roster.tqfind(item.jid()); if(it != d->roster.end()) { rosterItemRemoved(*it); d->roster.remove(it); @@ -959,7 +959,7 @@ void Client::importRosterItem(const RosterItem &item) } // Add/Update else { - LiveRoster::Iterator it = d->roster.find(item.jid()); + LiveRoster::Iterator it = d->roster.tqfind(item.jid()); if(it != d->roster.end()) { LiveRosterItem &i = *it; i.setFlagForDelete(false); @@ -993,7 +993,7 @@ void Client::sendSubscription(const Jid &jid, const TQString &type) j->go(true); } -void Client::setPresence(const Status &s) +void Client::setPresence(const tqStatus &s) { JT_Presence *j = new JT_Presence(rootTask()); j->pres(s); @@ -1001,9 +1001,9 @@ void Client::setPresence(const Status &s) // update our resourceList ppPresence(jid(), s); - //ResourceList::Iterator rit = d->resourceList.find(resource()); + //ResourceList::Iterator rit = d->resourceList.tqfind(resource()); //Resource &r = *rit; - //r.setStatus(s); + //r.settqStatus(s); } TQString Client::OSName() const @@ -1097,7 +1097,7 @@ void Client::addExtension(const TQString& ext, const Features& features) void Client::removeExtension(const TQString& ext) { - if (d->extension_features.contains(ext)) { + if (d->extension_features.tqcontains(ext)) { d->extension_features.remove(ext); d->capsExt = extensions().join(" "); } @@ -1155,22 +1155,22 @@ public: bool done; }; -Task::Task(Task *parent) -:TQObject(parent) +Task::Task(Task *tqparent) +:TQObject(tqparent) { init(); - d->client = parent->client(); + d->client = tqparent->client(); d->id = client()->genUniqueId(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Client *parent, bool) +Task::Task(Client *tqparent, bool) :TQObject(0) { init(); - d->client = parent; + d->client = tqparent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -1189,9 +1189,9 @@ void Task::init() d->done = false; } -Task *Task::parent() const +Task *Task::tqparent() const { - return (Task *)TQObject::parent(); + return (Task *)TQObject::tqparent(); } Client *Task::client() const @@ -1233,12 +1233,12 @@ void Task::go(bool autoDelete) bool Task::take(const TQDomElement &x) { - const TQObjectList *p = children(); - if(!p) + const TQObjectList p = childrenListObject(); + if(p.isEmpty()) return false; // pass along the xml - TQObjectListIt it(*p); + TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { TQObject *obj = it.current(); @@ -1362,7 +1362,7 @@ void Task::debug(const char *fmt, ...) void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").arg(className()) + str); + client()->debug(TQString("%1: ").tqarg(className()) + str); } bool Task::iqVerify(const TQDomElement &x, const Jid &to, const TQString &id, const TQString &xmlns) @@ -1461,9 +1461,9 @@ bool LiveRosterItem::isAvailable() const return false; } -const Status & LiveRosterItem::lastUnavailableStatus() const +const tqStatus & LiveRosterItem::lastUnavailabletqStatus() const { - return v_lastUnavailableStatus; + return v_lastUnavailabletqStatus; } bool LiveRosterItem::flagForDelete() const @@ -1471,9 +1471,9 @@ bool LiveRosterItem::flagForDelete() const return v_flagForDelete; } -void LiveRosterItem::setLastUnavailableStatus(const Status &s) +void LiveRosterItem::setLastUnavailabletqStatus(const tqStatus &s) { - v_lastUnavailableStatus = s; + v_lastUnavailabletqStatus = s; } void LiveRosterItem::setFlagForDelete(bool b) @@ -1499,7 +1499,7 @@ void LiveRoster::flagAllForDelete() (*it).setFlagForDelete(true); } -LiveRoster::Iterator LiveRoster::find(const Jid &j, bool compareRes) +LiveRoster::Iterator LiveRoster::tqfind(const Jid &j, bool compareRes) { Iterator it; for(it = begin(); it != end(); ++it) { @@ -1509,7 +1509,7 @@ LiveRoster::Iterator LiveRoster::find(const Jid &j, bool compareRes) return it; } -LiveRoster::ConstIterator LiveRoster::find(const Jid &j, bool compareRes) const +LiveRoster::ConstIterator LiveRoster::tqfind(const Jid &j, bool compareRes) const { ConstIterator it; for(it = begin(); it != end(); ++it) { diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index f2fcf7c9..fb9de2e8 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -274,7 +274,7 @@ TQString Message::subject(const TQString &lang) const //! This function will return a plain text or the Richtext version if it //! it exists. //! \param rich - Returns richtext if true and plain text if false. (default: false) -//! \note Richtext is in Qt's richtext format and not in xhtml. +//! \note Richtext is in TQt's richtext format and not in xhtml. TQString Message::body(const TQString &lang) const { return d->body[lang]; @@ -295,7 +295,7 @@ Stanza::Error Message::error() const return d->error; } -//! \brief Set receivers information +//! \brief Set tqreceivers information //! //! \param to - Receivers Jabber id void Message::setTo(const Jid &j) @@ -421,12 +421,12 @@ bool Message::containsEvents() const bool Message::containsEvent(MsgEvent e) const { - return d->eventList.contains(e); + return d->eventList.tqcontains(e); } void Message::addEvent(MsgEvent e) { - if (!d->eventList.contains(e)) { + if (!d->eventList.tqcontains(e)) { if (e == CancelEvent || containsEvent(CancelEvent)) d->eventList.clear(); // Reset list d->eventList += e; @@ -503,17 +503,17 @@ Stanza Message::toStanza(Stream *stream) const } } if ( !d->xHTMLBody.isEmpty()) { - TQDomElement parent = s.createElement(s.xhtmlImNS(), "html"); + TQDomElement tqparent = 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()); - parent.appendChild(child); + tqparent.appendChild(child); } } - s.appendChild(parent); + s.appendChild(tqparent); } if(d->type == "error") s.setError(d->error); @@ -658,7 +658,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset) if(e.tagName() == "active") { //like in JEP-0022 we let the client know that we can receive ComposingEvent - // (we can do that according to §4.6 of the JEP-0085) + // (we can do that according to �4.6 of the JEP-0085) d->eventList += ComposingEvent; d->eventList += InactiveEvent; d->eventList += GoneEvent; @@ -697,7 +697,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset) d->spooled = true; } else { - d->timeStamp = TQDateTime::currentDateTime(); + d->timeStamp = TQDateTime::tqcurrentDateTime(); d->spooled = false; } @@ -801,100 +801,100 @@ bool Subscription::fromString(const TQString &s) //--------------------------------------------------------------------------- -// Status +// tqStatus //--------------------------------------------------------------------------- -Status::Status(const TQString &show, const TQString &status, int priority, bool available) +tqStatus::tqStatus(const TQString &show, const TQString &status, int priority, bool available) { v_isAvailable = available; v_show = show; v_status = status; v_priority = priority; - v_timeStamp = TQDateTime::currentDateTime(); + v_timeStamp = TQDateTime::tqcurrentDateTime(); v_isInvisible = false; ecode = -1; } -Status::~Status() +tqStatus::~tqStatus() { } -bool Status::hasError() const +bool tqStatus::hasError() const { return (ecode != -1); } -void Status::setError(int code, const TQString &str) +void tqStatus::setError(int code, const TQString &str) { ecode = code; estr = str; } -void Status::setIsAvailable(bool available) +void tqStatus::setIsAvailable(bool available) { v_isAvailable = available; } -void Status::setIsInvisible(bool invisible) +void tqStatus::setIsInvisible(bool invisible) { v_isInvisible = invisible; } -void Status::setPriority(int x) +void tqStatus::setPriority(int x) { v_priority = x; } -void Status::setShow(const TQString & _show) +void tqStatus::setShow(const TQString & _show) { v_show = _show; } -void Status::setStatus(const TQString & _status) +void tqStatus::settqStatus(const TQString & _status) { v_status = _status; } -void Status::setTimeStamp(const TQDateTime & _timestamp) +void tqStatus::setTimeStamp(const TQDateTime & _timestamp) { v_timeStamp = _timestamp; } -void Status::setKeyID(const TQString &key) +void tqStatus::setKeyID(const TQString &key) { v_key = key; } -void Status::setXSigned(const TQString &s) +void tqStatus::setXSigned(const TQString &s) { v_xsigned = s; } -void Status::setSongTitle(const TQString & _songtitle) +void tqStatus::setSongTitle(const TQString & _songtitle) { v_songTitle = _songtitle; } -void Status::setCapsNode(const TQString & _capsNode) +void tqStatus::setCapsNode(const TQString & _capsNode) { v_capsNode = _capsNode; } -void Status::setCapsVersion(const TQString & _capsVersion) +void tqStatus::setCapsVersion(const TQString & _capsVersion) { v_capsVersion = _capsVersion; } -void Status::setCapsExt(const TQString & _capsExt) +void tqStatus::setCapsExt(const TQString & _capsExt) { v_capsExt = _capsExt; } -bool Status::isAvailable() const +bool tqStatus::isAvailable() const { return v_isAvailable; } -bool Status::isAway() const +bool tqStatus::isAway() const { if(v_show == "away" || v_show == "xa" || v_show == "dnd") return true; @@ -902,66 +902,66 @@ bool Status::isAway() const return false; } -bool Status::isInvisible() const +bool tqStatus::isInvisible() const { return v_isInvisible; } -int Status::priority() const +int tqStatus::priority() const { return v_priority; } -const TQString & Status::show() const +const TQString & tqStatus::show() const { return v_show; } -const TQString & Status::status() const +const TQString & tqStatus::status() const { return v_status; } -TQDateTime Status::timeStamp() const +TQDateTime tqStatus::timeStamp() const { return v_timeStamp; } -const TQString & Status::keyID() const +const TQString & tqStatus::keyID() const { return v_key; } -const TQString & Status::xsigned() const +const TQString & tqStatus::xsigned() const { return v_xsigned; } -const TQString & Status::songTitle() const +const TQString & tqStatus::songTitle() const { return v_songTitle; } -const TQString & Status::capsNode() const +const TQString & tqStatus::capsNode() const { return v_capsNode; } -const TQString & Status::capsVersion() const +const TQString & tqStatus::capsVersion() const { return v_capsVersion; } -const TQString & Status::capsExt() const +const TQString & tqStatus::capsExt() const { return v_capsExt; } -int Status::errorCode() const +int tqStatus::errorCode() const { return ecode; } -const TQString & Status::errorString() const +const TQString & tqStatus::errorString() const { return estr; } @@ -970,7 +970,7 @@ const TQString & Status::errorString() const //--------------------------------------------------------------------------- // Resource //--------------------------------------------------------------------------- -Resource::Resource(const TQString &name, const Status &stat) +Resource::Resource(const TQString &name, const tqStatus &stat) { v_name = name; v_status = stat; @@ -990,7 +990,7 @@ int Resource::priority() const return v_status.priority(); } -const Status & Resource::status() const +const tqStatus & Resource::status() const { return v_status; } @@ -1000,7 +1000,7 @@ void Resource::setName(const TQString & _name) v_name = _name; } -void Resource::setStatus(const Status & _status) +void Resource::settqStatus(const tqStatus & _status) { v_status = _status; } @@ -1018,10 +1018,10 @@ ResourceList::~ResourceList() { } -ResourceList::Iterator ResourceList::find(const TQString & _find) +ResourceList::Iterator ResourceList::tqfind(const TQString & _tqfind) { for(ResourceList::Iterator it = begin(); it != end(); ++it) { - if((*it).name() == _find) + if((*it).name() == _tqfind) return it; } @@ -1040,10 +1040,10 @@ ResourceList::Iterator ResourceList::priority() return highest; } -ResourceList::ConstIterator ResourceList::find(const TQString & _find) const +ResourceList::ConstIterator ResourceList::tqfind(const TQString & _tqfind) const { for(ResourceList::ConstIterator it = begin(); it != end(); ++it) { - if((*it).name() == _find) + if((*it).name() == _tqfind) return it; } @@ -1222,7 +1222,7 @@ Roster::~Roster() { } -Roster::Iterator Roster::find(const Jid &j) +Roster::Iterator Roster::tqfind(const Jid &j) { for(Roster::Iterator it = begin(); it != end(); ++it) { if((*it).jid().compare(j)) @@ -1232,7 +1232,7 @@ Roster::Iterator Roster::find(const Jid &j) return end(); } -Roster::ConstIterator Roster::find(const Jid &j) const +Roster::ConstIterator Roster::tqfind(const Jid &j) const { for(Roster::ConstIterator it = begin(); it != end(); ++it) { if((*it).jid().compare(j)) @@ -1512,7 +1512,7 @@ bool Features::test(const TQStringList &ns) const { TQStringList::ConstIterator it = ns.begin(); for ( ; it != ns.end(); ++it) - if ( _list.find( *it ) != _list.end() ) + if ( _list.tqfind( *it ) != _list.end() ) return true; return false; @@ -1597,12 +1597,13 @@ bool Features::haveVCard() const // custom Psi acitons #define FID_ADD "psi:add" -class Features::FeatureName : public QObject +class Features::FeatureName : public TQObject { Q_OBJECT + TQ_OBJECT public: FeatureName() - : TQObject(qApp) + : TQObject(tqApp) { id2s[FID_Invalid] = tr("ERROR: Incorrect usage of Features class"); id2s[FID_None] = tr("None"); @@ -1866,7 +1867,7 @@ TQString DiscoItem::action2string(Action a) else if ( a == Remove ) s = "remove"; else - s = TQString::null; + s = TQString(); return s; } 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 9e2fc061..2d13db79 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -35,9 +35,9 @@ using namespace XMPP; static TQString lineEncode(TQString str) { - str.replace(TQRegExp("\\\\"), "\\\\"); // backslash to double-backslash - str.replace(TQRegExp("\\|"), "\\p"); // pipe to \p - str.replace(TQRegExp("\n"), "\\n"); // newline to \n + str.tqreplace(TQRegExp("\\\\"), "\\\\"); // backslash to double-backslash + str.tqreplace(TQRegExp("\\|"), "\\p"); // pipe to \p + str.tqreplace(TQRegExp("\n"), "\\n"); // newline to \n return str; } @@ -103,8 +103,8 @@ public: int type; }; -JT_Register::JT_Register(Task *parent) -:Task(parent) +JT_Register::JT_Register(Task *tqparent) +:Task(tqparent) { d = new Private; d->type = -1; @@ -246,8 +246,8 @@ public: JT_Register *jt_reg; }; -JT_UnRegister::JT_UnRegister(Task *parent) -: Task(parent) +JT_UnRegister::JT_UnRegister(Task *tqparent) +: Task(tqparent) { d = new Private; d->jt_reg = 0; @@ -306,8 +306,8 @@ public: TQValueList<TQDomElement> itemList; }; -JT_Roster::JT_Roster(Task *parent) -:Task(parent) +JT_Roster::JT_Roster(Task *tqparent) +:Task(tqparent) { type = -1; d = new Private; @@ -448,8 +448,8 @@ bool JT_Roster::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_PushRoster //---------------------------------------------------------------------------- -JT_PushRoster::JT_PushRoster(Task *parent) -:Task(parent) +JT_PushRoster::JT_PushRoster(Task *tqparent) +:Task(tqparent) { } @@ -475,8 +475,8 @@ bool JT_PushRoster::take(const TQDomElement &e) //---------------------------------------------------------------------------- // JT_Presence //---------------------------------------------------------------------------- -JT_Presence::JT_Presence(Task *parent) -:Task(parent) +JT_Presence::JT_Presence(Task *tqparent) +:Task(tqparent) { type = -1; } @@ -485,7 +485,7 @@ JT_Presence::~JT_Presence() { } -void JT_Presence::pres(const Status &s) +void JT_Presence::pres(const tqStatus &s) { type = 0; @@ -504,7 +504,7 @@ void JT_Presence::pres(const Status &s) if(!s.status().isEmpty()) tag.appendChild(textTag(doc(), "status", s.status())); - tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) ); + tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) ); if(!s.keyID().isEmpty()) { TQDomElement x = textTag(doc(), "x", s.keyID()); @@ -529,7 +529,7 @@ void JT_Presence::pres(const Status &s) } } -void JT_Presence::pres(const Jid &to, const Status &s) +void JT_Presence::pres(const Jid &to, const tqStatus &s) { pres(s); tag.setAttribute("to", to.full()); @@ -554,8 +554,8 @@ void JT_Presence::onGo() //---------------------------------------------------------------------------- // JT_PushPresence //---------------------------------------------------------------------------- -JT_PushPresence::JT_PushPresence(Task *parent) -:Task(parent) +JT_PushPresence::JT_PushPresence(Task *tqparent) +:Task(tqparent) { } @@ -569,7 +569,7 @@ bool JT_PushPresence::take(const TQDomElement &e) return false; Jid j(e.attribute("from")); - Status p; + tqStatus p; if(e.hasAttribute("type")) { TQString type = e.attribute("type"); @@ -593,7 +593,7 @@ bool JT_PushPresence::take(const TQDomElement &e) tag = findSubTag(e, "status", &found); if(found) - p.setStatus(tagContent(tag)); + p.settqStatus(tagContent(tag)); tag = findSubTag(e, "show", &found); if(found) p.setShow(tagContent(tag)); @@ -653,10 +653,10 @@ bool JT_PushPresence::take(const TQDomElement &e) //---------------------------------------------------------------------------- static TQDomElement oldStyleNS(const TQDomElement &e) { - // find closest parent with a namespace - TQDomNode par = e.parentNode(); + // find closest tqparent with a namespace + TQDomNode par = e.tqparentNode(); while(!par.isNull() && par.namespaceURI().isNull()) - par = par.parentNode(); + par = par.tqparentNode(); bool noShowNS = false; if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) noShowNS = true; @@ -676,7 +676,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e) if(!noShowNS) i.setAttribute("xmlns", e.namespaceURI()); - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -688,8 +688,8 @@ static TQDomElement oldStyleNS(const TQDomElement &e) return i; } -JT_Message::JT_Message(Task *parent, const Message &msg) -:Task(parent) +JT_Message::JT_Message(Task *tqparent, const Message &msg) +:Task(tqparent) { m = msg; m.setId(id()); @@ -724,7 +724,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) // find closest xmlns TQDomNode n = e; while(!n.isNull() && !n.toElement().hasAttribute("xmlns")) - n = n.parentNode(); + n = n.tqparentNode(); TQString ns; if(n.isNull() || !n.toElement().hasAttribute("xmlns")) ns = "jabber:client"; @@ -742,7 +742,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) i.setAttributeNodeNS(al.item(x).cloneNode().toAttr()); } - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -756,8 +756,8 @@ static TQDomElement addCorrectNS(const TQDomElement &e) return i; } -JT_PushMessage::JT_PushMessage(Task *parent) -:Task(parent) +JT_PushMessage::JT_PushMessage(Task *tqparent) +:Task(tqparent) { } @@ -799,8 +799,8 @@ public: TQString message; }; -JT_GetLastActivity::JT_GetLastActivity(Task *parent) -:Task(parent) +JT_GetLastActivity::JT_GetLastActivity(Task *tqparent) +:Task(tqparent) { d = new Private; } @@ -858,8 +858,8 @@ bool JT_GetLastActivity::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_GetServices //---------------------------------------------------------------------------- -JT_GetServices::JT_GetServices(Task *parent) -:Task(parent) +JT_GetServices::JT_GetServices(Task *tqparent) +:Task(tqparent) { } @@ -955,8 +955,8 @@ public: VCard vcard; }; -JT_VCard::JT_VCard(Task *parent) -:Task(parent) +JT_VCard::JT_VCard(Task *tqparent) +:Task(tqparent) { type = -1; d = new Private; @@ -1055,8 +1055,8 @@ public: TQValueList<SearchResult> resultList; }; -JT_Search::JT_Search(Task *parent) -:Task(parent) +JT_Search::JT_Search(Task *tqparent) +:Task(tqparent) { d = new Private; type = -1; @@ -1187,8 +1187,8 @@ bool JT_Search::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_ClientVersion //---------------------------------------------------------------------------- -JT_ClientVersion::JT_ClientVersion(Task *parent) -:Task(parent) +JT_ClientVersion::JT_ClientVersion(Task *tqparent) +:Task(tqparent) { } @@ -1258,8 +1258,8 @@ const TQString & JT_ClientVersion::os() const //---------------------------------------------------------------------------- // JT_ClientTime //---------------------------------------------------------------------------- -/*JT_ClientTime::JT_ClientTime(Task *parent, const Jid &_j) -:Task(parent) +/*JT_ClientTime::JT_ClientTime(Task *tqparent, const Jid &_j) +:Task(tqparent) { 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 *parent) -:Task(parent) +JT_ServInfo::JT_ServInfo(Task *tqparent) +:Task(tqparent) { } @@ -1338,12 +1338,12 @@ bool JT_ServInfo::take(const TQDomElement &e) // TQDomElement query = doc()->createElement("query"); // query.setAttribute("xmlns", "jabber:iq:time"); // iq.appendChild(query); - // TQDateTime local = TQDateTime::currentDateTime(); + // TQDateTime local = TQDateTime::tqcurrentDateTime(); // TQDateTime utc = local.addSecs(-getTZOffset() * 3600); // TQString str = getTZString(); // query.appendChild(textTag("utc", TS2stamp(utc))); // query.appendChild(textTag("tz", str)); - // query.appendChild(textTag("display", TQString("%1 %2").arg(local.toString()).arg(str))); + // query.appendChild(textTag("display", TQString("%1 %2").tqarg(local.toString()).tqarg(str))); // send(iq); // return TRUE; //} @@ -1417,7 +1417,7 @@ bool JT_ServInfo::take(const TQDomElement &e) } else if (node.startsWith(client()->capsNode() + "#")) { TQString ext = node.right(node.length()-client()->capsNode().length()-1); - if (client()->extensions().contains(ext)) { + if (client()->extensions().tqcontains(ext)) { const TQStringList& l = client()->extension(ext).list(); for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { feature = doc()->createElement("feature"); @@ -1444,8 +1444,8 @@ bool JT_ServInfo::take(const TQDomElement &e) //---------------------------------------------------------------------------- // JT_Gateway //---------------------------------------------------------------------------- -JT_Gateway::JT_Gateway(Task *parent) -:Task(parent) +JT_Gateway::JT_Gateway(Task *tqparent) +:Task(tqparent) { type = -1; } @@ -1539,8 +1539,8 @@ public: AgentItem root; }; -JT_Browse::JT_Browse (Task *parent) -:Task (parent) +JT_Browse::JT_Browse (Task *tqparent) +:Task (tqparent) { d = new Private; } @@ -1664,8 +1664,8 @@ public: DiscoList items; }; -JT_DiscoItems::JT_DiscoItems(Task *parent) -: Task(parent) +JT_DiscoItems::JT_DiscoItems(Task *tqparent) +: Task(tqparent) { d = new Private; } @@ -1753,8 +1753,8 @@ public: DiscoItem item; }; -JT_DiscoInfo::JT_DiscoInfo(Task *parent) -: Task(parent) +JT_DiscoInfo::JT_DiscoInfo(Task *tqparent) +: Task(tqparent) { d = new Private; } @@ -1895,8 +1895,8 @@ public: DiscoList list; }; -JT_DiscoPublish::JT_DiscoPublish(Task *parent) -: Task(parent) +JT_DiscoPublish::JT_DiscoPublish(Task *tqparent) +: Task(tqparent) { d = new Private; } @@ -1959,8 +1959,8 @@ bool JT_DiscoPublish::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_MucPresence //---------------------------------------------------------------------------- -JT_MucPresence::JT_MucPresence(Task *parent) -:Task(parent) +JT_MucPresence::JT_MucPresence(Task *tqparent) +:Task(tqparent) { type = -1; } @@ -1969,7 +1969,7 @@ JT_MucPresence::~JT_MucPresence() { } -void JT_MucPresence::pres(const Status &s) +void JT_MucPresence::pres(const tqStatus &s) { type = 0; @@ -1988,7 +1988,7 @@ void JT_MucPresence::pres(const Status &s) if(!s.status().isEmpty()) tag.appendChild(textTag(doc(), "status", s.status())); - tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) ); + tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) ); if(!s.keyID().isEmpty()) { TQDomElement x = textTag(doc(), "x", s.keyID()); @@ -2013,7 +2013,7 @@ void JT_MucPresence::pres(const Status &s) } } -void JT_MucPresence::pres(const Jid &to, const Status &s, const TQString &password) +void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const TQString &password) { pres(s); tag.setAttribute("to", to.full()); @@ -2043,8 +2043,8 @@ class JT_PrivateStorage::Private int type; }; -JT_PrivateStorage::JT_PrivateStorage(Task *parent) - :Task(parent) +JT_PrivateStorage::JT_PrivateStorage(Task *tqparent) + :Task(tqparent) { 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 c8085013..9d5125d9 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h @@ -30,13 +30,14 @@ namespace XMPP { class Roster; - class Status; + class tqStatus; class JT_Register : public Task { Q_OBJECT + TQ_OBJECT public: - JT_Register(Task *parent); + JT_Register(Task *tqparent); ~JT_Register(); void reg(const TQString &user, const TQString &pass); @@ -61,8 +62,9 @@ namespace XMPP class JT_UnRegister : public Task { Q_OBJECT + TQ_OBJECT public: - JT_UnRegister(Task *parent); + JT_UnRegister(Task *tqparent); ~JT_UnRegister(); void unreg(const Jid &); @@ -81,8 +83,9 @@ namespace XMPP class JT_Roster : public Task { Q_OBJECT + TQ_OBJECT public: - JT_Roster(Task *parent); + JT_Roster(Task *tqparent); ~JT_Roster(); void get(); @@ -109,8 +112,9 @@ namespace XMPP class JT_PushRoster : public Task { Q_OBJECT + TQ_OBJECT public: - JT_PushRoster(Task *parent); + JT_PushRoster(Task *tqparent); ~JT_PushRoster(); bool take(const TQDomElement &); @@ -126,12 +130,13 @@ namespace XMPP class JT_Presence : public Task { Q_OBJECT + TQ_OBJECT public: - JT_Presence(Task *parent); + JT_Presence(Task *tqparent); ~JT_Presence(); - void pres(const Status &); - void pres(const Jid &, const Status &); + void pres(const tqStatus &); + void pres(const Jid &, const tqStatus &); void sub(const Jid &, const TQString &subType); void onGo(); @@ -147,14 +152,15 @@ namespace XMPP class JT_PushPresence : public Task { Q_OBJECT + TQ_OBJECT public: - JT_PushPresence(Task *parent); + JT_PushPresence(Task *tqparent); ~JT_PushPresence(); bool take(const TQDomElement &); signals: - void presence(const Jid &, const Status &); + void presence(const Jid &, const tqStatus &); void subscription(const Jid &, const TQString &); private: @@ -165,8 +171,9 @@ namespace XMPP class JT_Message : public Task { Q_OBJECT + TQ_OBJECT public: - JT_Message(Task *parent, const Message &); + JT_Message(Task *tqparent, const Message &); ~JT_Message(); void onGo(); @@ -181,8 +188,9 @@ namespace XMPP class JT_PushMessage : public Task { Q_OBJECT + TQ_OBJECT public: - JT_PushMessage(Task *parent); + JT_PushMessage(Task *tqparent); ~JT_PushMessage(); bool take(const TQDomElement &); @@ -198,6 +206,7 @@ namespace XMPP class JT_GetLastActivity : public Task { Q_OBJECT + TQ_OBJECT public: JT_GetLastActivity(Task *); ~JT_GetLastActivity(); @@ -221,6 +230,7 @@ namespace XMPP class JT_GetServices : public Task { Q_OBJECT + TQ_OBJECT public: JT_GetServices(Task *); @@ -243,8 +253,9 @@ namespace XMPP class JT_VCard : public Task { Q_OBJECT + TQ_OBJECT public: - JT_VCard(Task *parent); + JT_VCard(Task *tqparent); ~JT_VCard(); void get(const Jid &); @@ -266,8 +277,9 @@ namespace XMPP class JT_Search : public Task { Q_OBJECT + TQ_OBJECT public: - JT_Search(Task *parent); + JT_Search(Task *tqparent); ~JT_Search(); const Form & form() const; @@ -290,6 +302,7 @@ namespace XMPP class JT_ClientVersion : public Task { Q_OBJECT + TQ_OBJECT public: JT_ClientVersion(Task *); @@ -312,6 +325,7 @@ namespace XMPP class JT_ClientTime : public Task { Q_OBJECT + TQ_OBJECT public: JT_ClientTime(Task *, const Jid &); @@ -329,6 +343,7 @@ namespace XMPP class JT_ServInfo : public Task { Q_OBJECT + TQ_OBJECT public: JT_ServInfo(Task *); ~JT_ServInfo(); @@ -339,6 +354,7 @@ namespace XMPP class JT_Gateway : public Task { Q_OBJECT + TQ_OBJECT public: JT_Gateway(Task *); @@ -362,6 +378,7 @@ namespace XMPP class JT_Browse : public Task { Q_OBJECT + TQ_OBJECT public: JT_Browse(Task *); ~JT_Browse(); @@ -384,11 +401,12 @@ namespace XMPP class JT_DiscoItems : public Task { Q_OBJECT + TQ_OBJECT public: JT_DiscoItems(Task *); ~JT_DiscoItems(); - void get(const Jid &, const TQString &node = TQString::null); + void get(const Jid &, const TQString &node = TQString()); void get(const DiscoItem &); const DiscoList &items() const; @@ -404,11 +422,12 @@ namespace XMPP class JT_DiscoInfo : public Task { Q_OBJECT + TQ_OBJECT public: JT_DiscoInfo(Task *); ~JT_DiscoInfo(); - void get(const Jid &, const TQString &node = TQString::null, const DiscoItem::Identity = DiscoItem::Identity()); + void get(const Jid &, const TQString &node = TQString(), const DiscoItem::Identity = DiscoItem::Identity()); void get(const DiscoItem &); const DiscoItem &item() const; @@ -426,6 +445,7 @@ namespace XMPP class JT_DiscoPublish : public Task { Q_OBJECT + TQ_OBJECT public: JT_DiscoPublish(Task *); ~JT_DiscoPublish(); @@ -443,12 +463,13 @@ namespace XMPP class JT_MucPresence : public Task { Q_OBJECT + TQ_OBJECT public: - JT_MucPresence(Task *parent); + JT_MucPresence(Task *tqparent); ~JT_MucPresence(); - void pres(const Status &); - void pres(const Jid &, const Status &, const TQString &password); + void pres(const tqStatus &); + void pres(const Jid &, const tqStatus &, const TQString &password); void onGo(); @@ -463,8 +484,9 @@ namespace XMPP class JT_PrivateStorage : public Task { Q_OBJECT + TQ_OBJECT public: - JT_PrivateStorage(Task *parent); + JT_PrivateStorage(Task *tqparent); ~JT_PrivateStorage(); void set(const TQDomElement &); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp index 5f5214fd..009f0136 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp @@ -81,7 +81,7 @@ static TQString subTagText(const TQDomElement &e, const TQString &name) TQDomElement i = findSubTag(e, name, &found); if ( found ) return i.text().stripWhiteSpace(); - return TQString::null; + return TQString(); } using namespace XMPP; @@ -93,7 +93,7 @@ static TQString image2type(const TQByteArray &ba) { TQBuffer buf(ba); buf.open(IO_ReadOnly); - TQString format = TQImageIO::imageFormat( &buf ); + TQString format = TQImageIO::imageFormat( TQT_TQIODEVICE(&buf) ); // TODO: add more formats if ( format == "PNG" || format == "PsiPNG" ) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp index d7b5c82d..65c3b8b3 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp @@ -185,7 +185,7 @@ TQString subTagText(const TQDomElement &e, const TQString &name) TQDomElement i = findSubTag(e, name, &found); if ( found ) return i.text(); - return TQString::null; + return TQString(); } TQDomElement textTag(TQDomDocument &doc, const TQString &name, const TQString &content) diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch index 41acad0e..2fcf782b 100644 --- a/kopete/protocols/jabber/libiris/jingle_iris.patch +++ b/kopete/protocols/jabber/libiris/jingle_iris.patch @@ -159,7 +159,7 @@ diff -ur psi/iris/xmpp-im/client.cpp psi-jingle/iris/xmpp-im/client.cpp + +void Client::removeExtension(const QString& ext) +{ -+ if (d->extension_features.contains(ext)) { ++ if (d->extension_features.tqcontains(ext)) { + d->extension_features.remove(ext); + d->capsExt = extensions().join(" "); + } @@ -185,44 +185,44 @@ diff -ur psi/iris/xmpp-im/types.cpp psi-jingle/iris/xmpp-im/types.cpp v_songTitle = _songtitle; } -+void Status::setCapsNode(const QString & _capsNode) ++void tqStatus::setCapsNode(const QString & _capsNode) +{ + v_capsNode = _capsNode; +} + -+void Status::setCapsVersion(const QString & _capsVersion) ++void tqStatus::setCapsVersion(const QString & _capsVersion) +{ + v_capsVersion = _capsVersion; +} + -+void Status::setCapsExt(const QString & _capsExt) ++void tqStatus::setCapsExt(const QString & _capsExt) +{ + v_capsExt = _capsExt; +} + - bool Status::isAvailable() const + bool tqStatus::isAvailable() const { return v_isAvailable; @@ -836,6 +851,21 @@ return v_songTitle; } -+const QString & Status::capsNode() const ++const QString & tqStatus::capsNode() const +{ + return v_capsNode; +} + -+const QString & Status::capsVersion() const ++const QString & tqStatus::capsVersion() const +{ + return v_capsVersion; +} + -+const QString & Status::capsExt() const ++const QString & tqStatus::capsExt() const +{ + return v_capsExt; +} + - int Status::errorCode() const + int tqStatus::errorCode() const { return ecode; @@ -1427,6 +1457,15 @@ @@ -354,7 +354,7 @@ diff -ur psi/iris/xmpp-im/xmpp_tasks.cpp psi-jingle/iris/xmpp-im/xmpp_tasks.cpp + } + else if (node.startsWith(client()->capsNode() + "#")) { + QString ext = node.right(node.length()-client()->capsNode().length()-1); -+ if (client()->extensions().contains(ext)) { ++ if (client()->extensions().tqcontains(ext)) { + const QStringList& l = client()->extension(ext).list(); + for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { + feature = doc()->createElement("feature"); diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/qca.cpp index 4a197527..ee51335f 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp +++ b/kopete/protocols/jabber/libiris/qca/src/qca.cpp @@ -1,5 +1,5 @@ /* - * qca.cpp - Qt Cryptographic Architecture + * qca.cpp - TQt Cryptographic Architecture * Copyright (C) 2003 Justin Karneges * * This library is free software; you can redistribute it and/or @@ -586,7 +586,7 @@ TQString RSAKey::toPEM(bool publicOnly) const TQCString cs; cs.resize(out.size()+1); memcpy(cs.data(), out.data(), out.size()); - return TQString::fromLatin1(cs); + return TQString::tqfromLatin1(cs); } bool RSAKey::fromPEM(const TQString &str) @@ -794,7 +794,7 @@ TQString Cert::toPEM() const TQCString cs; cs.resize(out.size()+1); memcpy(cs.data(), out.data(), out.size()); - return TQString::fromLatin1(cs); + return TQString::tqfromLatin1(cs); } bool Cert::fromPEM(const TQString &str) @@ -859,8 +859,8 @@ public: TQPtrList<QCA_CertContext> store; }; -TLS::TLS(TQObject *parent) -:TQObject(parent) +TLS::TLS(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; } @@ -1127,8 +1127,8 @@ public: TQByteArray inbuf, outbuf; }; -SASL::SASL(TQObject *parent) -:TQObject(parent) +SASL::SASL(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; reset(); @@ -1227,13 +1227,13 @@ void SASL::setExternalSSF(int x) d->ext_ssf = x; } -void SASL::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port) +void SASL::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->localAddr = addr; d->localPort = port; } -void SASL::setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port) +void SASL::setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->remoteAddr = addr; d->remotePort = port; diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.h b/kopete/protocols/jabber/libiris/qca/src/qca.h index 9df6f7cd..dab99d5a 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qca.h +++ b/kopete/protocols/jabber/libiris/qca/src/qca.h @@ -1,5 +1,5 @@ /* - * qca.h - Qt Cryptographic Architecture + * qca.h - TQt Cryptographic Architecture * Copyright (C) 2003 Justin Karneges * * This library is free software; you can redistribute it and/or @@ -311,9 +311,10 @@ namespace QCA void fromContext(QCA_CertContext *); }; - class QCA_EXPORT TLS : public QObject + class QCA_EXPORT TLS : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Validity { NoCert, @@ -332,7 +333,7 @@ namespace QCA }; enum Error { ErrHandshake, ErrCrypt }; - TLS(TQObject *parent=0); + TLS(TQObject *tqparent=0); ~TLS(); void setCertificate(const Cert &cert, const RSAKey &key); @@ -372,9 +373,10 @@ namespace QCA Private *d; }; - class QCA_EXPORT SASL : public QObject + class QCA_EXPORT SASL : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrAuth, ErrCrypt }; enum ErrorCond { @@ -390,7 +392,7 @@ namespace QCA NoUser, RemoteUnavail }; - SASL(TQObject *parent=0); + SASL(TQObject *tqparent=0); ~SASL(); static void setAppName(const TQString &name); @@ -412,8 +414,8 @@ namespace QCA void setExternalAuthID(const TQString &authid); void setExternalSSF(int); - void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port); - void setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port); + void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port); + void setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port); // initialize bool startClient(const TQString &service, const TQString &host, const TQStringList &mechlist, bool allowClientSendFirst=true); diff --git a/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h b/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h index 6eda17f9..9f4fa1fb 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h +++ b/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h @@ -141,7 +141,7 @@ public: struct QCA_SASLHostPort { TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; struct QCA_SASLNeedParams diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index 20a4ab98..f39e81ef 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>dlgAddContact</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>dlgAddContact</cstring> </property> @@ -25,22 +25,22 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblID</cstring> </property> <property name="text"> <string>&Jabber ID:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -66,14 +66,14 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string><i>(for example: joe@jabber.org)</i></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>190</height> @@ -98,7 +98,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui index f45f224a..1b73dd95 100644 --- a/kopete/protocols/jabber/ui/dlgbrowse.ui +++ b/kopete/protocols/jabber/ui/dlgbrowse.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>dlgBrowse</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>dlgBrowse</cstring> </property> @@ -19,14 +19,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter" row="0" column="0"> + <widget class="TQSplitter" row="0" column="0"> <property name="name"> <cstring>splitter1</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>dynamicForm</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblWait</cstring> </property> @@ -47,13 +47,13 @@ <property name="text"> <string>Please wait while retrieving search form...</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> </vbox> </widget> - <widget class="QTable"> + <widget class="TQTable"> <column> <property name="text"> <string>JID</string> @@ -110,7 +110,7 @@ </property> </widget> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>buttonsLayout</cstring> </property> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -193,7 +193,7 @@ <slot>close()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui index c3e34de6..18c0b439 100644 --- a/kopete/protocols/jabber/ui/dlgchangepassword.ui +++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DlgChangePassword</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgChangePassword</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Current password:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -32,7 +32,7 @@ <string>New password:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -55,9 +55,9 @@ <cstring>peNewPassword2</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>lblStatus</cstring> + <cstring>lbltqStatus</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -71,7 +71,7 @@ <string>Please enter your current password first and then your new password twice.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -79,7 +79,7 @@ and then your new password twice.</string> </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpassdlg.h</includehint> <includehint>kpassdlg.h</includehint> diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui index 699f9ef4..db1bbfcb 100644 --- a/kopete/protocols/jabber/ui/dlgchatjoin.ui +++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblNick</cstring> </property> @@ -24,22 +24,22 @@ <string>Nick:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leServer</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>leNick</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>leRoom</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblRoom</cstring> </property> @@ -47,7 +47,7 @@ <string>Room:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblServer</cstring> </property> @@ -55,9 +55,9 @@ <string>Server:</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -73,14 +73,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbJoin</cstring> </property> @@ -91,7 +91,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbBrowse</cstring> </property> @@ -122,9 +122,9 @@ <tabstop>leServer</tabstop> <tabstop>leNick</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotBowse()</slot> <slot>slotJoin()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index f4624de3..0c5e07be 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblServer</cstring> </property> @@ -35,12 +35,12 @@ <string>Server</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leServer</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbQuery</cstring> </property> @@ -50,7 +50,7 @@ </widget> </hbox> </widget> - <widget class="QTable"> + <widget class="TQTable"> <column> <property name="text"> <string>Chatroom Name</string> @@ -95,9 +95,9 @@ <enum>FollowStyle</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -113,14 +113,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbJoin</cstring> </property> @@ -128,7 +128,7 @@ <string>&Join</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbClose</cstring> </property> @@ -172,13 +172,13 @@ <slot>slotDoubleClick(int,int,int,const QPoint&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotQuery()</slot> <slot>slotJoin()</slot> <slot>slotClick(int row, int col, int button, const QPoint& mousePos)</slot> <slot>slotDoubleClick(int row, int col, int button, const QPoint& mousePos)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> </includehints> diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index be558388..22c228c7 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 * parent, const char *name):dlgBrowse (parent, name) +dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent, const char *name):dlgBrowse (tqparent, name) { m_account = account; @@ -68,7 +68,7 @@ void dlgJabberBrowse::slotGotForm () // translate the form and create it inside the display widget translator = new JabberFormTranslator (task->form (), dynamicForm); - dynamicForm->layout()->add( translator ); + dynamicForm->tqlayout()->add( translator ); translator->show(); // enable the send button diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.h b/kopete/protocols/jabber/ui/dlgjabberbrowse.h index 20886005..85b67fb9 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.h +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.h @@ -35,9 +35,10 @@ class dlgJabberBrowse:public dlgBrowse { Q_OBJECT + TQ_OBJECT public: - dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); + dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent = 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 948a594e..ec7d1d10 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 *parent, const char *name ) - : KDialogBase ( parent, name, true, i18n("Change Jabber Password"), +DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, TQWidget *tqparent, const char *name ) + : KDialogBase ( tqparent, 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*>(parent()), KMessageBox::Information, + KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(tqparent()), 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*>(parent()), KMessageBox::Sorry, + KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(tqparent()), 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 023485ec..2dd8d8dd 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h @@ -32,9 +32,10 @@ class DlgJabberChangePassword : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent = 0, const char *name = 0); + DlgJabberChangePassword ( JabberAccount *account, TQWidget *tqparent = 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 9d69beae..e24815d5 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* parent, const char* name) : -dlgChatJoin(parent, name), +dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, TQWidget* tqparent, const char* name) : +dlgChatJoin(tqparent, 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 d68ae78e..6263fd32 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h @@ -25,9 +25,10 @@ class dlgJabberChatJoin : public dlgChatJoin { Q_OBJECT + TQ_OBJECT public: - dlgJabberChatJoin(JabberAccount *account, TQWidget* parent = 0, const char* name = 0); + dlgJabberChatJoin(JabberAccount *account, TQWidget* tqparent = 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 1803a013..838eb84f 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 *parent, const char *name) : -dlgChatRoomsList(parent, name), +dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const TQString& server, const TQString &nick, TQWidget *tqparent, const char *name) : +dlgChatRoomsList(tqparent, 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 6b1dce7b..5bb8b4a9 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h @@ -21,9 +21,10 @@ class dlgJabberChatRoomsList : public dlgChatRoomsList { Q_OBJECT + TQ_OBJECT public: - dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString::null, const TQString& nick = TQString::null, TQWidget* parent = 0, const char* name = 0); + dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString(), const TQString& nick = TQString(), TQWidget* tqparent = 0, const char* name = 0); ~dlgJabberChatRoomsList(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui index 0a04b388..51943ee4 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui +++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgJabberChooseServer</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgJabberChooseServer</cstring> </property> @@ -12,7 +12,7 @@ <height>343</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>300</height> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTable" row="0" column="0"> + <widget class="TQTable" row="0" column="0"> <column> <property name="text"> <string>Server</string> @@ -85,9 +85,9 @@ <string><a href="http://www.jabber.org/network/">Details about free public Jabber servers</a></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> - <cstring>lblStatus</cstring> + <cstring>lbltqStatus</cstring> </property> <property name="text"> <string></string> @@ -100,7 +100,7 @@ <data format="XPM.GZ" length="2846">789c75d54953dd381007f03b9fe255fa969aea585ea59a9a039084256c0f0810a6e6204b32fbfe58a7e6bb8fddff3609c90ce6f27b6acbea764bfef07e72b0b53e79ff61ee6ee6672761128efdede47dbcbfb878fef3af3ffe9e7b67eac9f05fb849feeeb7b977d3d9244c36ae2ed300ef7b50664cac337127b626cf9db885f3a22e075325762694324edfc4de74954c4e6b705ed595dc4fe2ceb842c6fdd16093e5be6e24be1e9ce7856f647e7f227685ad647db4230e65d178194fe26eb8c43cb8903f89df1e5d4a3c1d8a7d9559acff40dccf57c1e5e0d20c97b811fb2ad928f31f8b43e59b56c6dde0aa1d2ef1ba3895b194f5901d5cd7755307b93f8add70c9f87470636a5be2fe7d71d5b416f905b1b399433db706dbcc3695d4930ab1192ef1e660d7b8429fbf216e6dd2f9b3c1a18d59443df7c4a9772dcec5dd70897707f7a355c2f33f8a8bc66678fe17b5cb50bf4f62eb7223fd430fe2d0a40cf7afc2ce1658cff9e0646c9521fe515cfad2209f457555607ee99f543bafcf3f1337aecbe4fdd005eccb4ceacd976217cacccaf8bdd8b719fa830fd57926f5e62b38984ceac12fea5ac7a5bf53eb23c689e156f3e5353834fafc67b5c3faf862b491fcf949dd66526f967aa61082ce77a04e46eac7f23e536c8b1ce3ab70e80cf291fe4ba96f70a91fefc33137c8675edcb555867807c7d220bf95d139eedf53d746fa95b3d1fafc85c15dd666b9bc0fb670b4c88fbcba3f2164fcebab518f1bb1f10eef9f23dc6abf7003c760a45f7977748efbafc579db68fc231cfb05cbf34fd429c7fb3f1d5da0decba3b15fb85677c89fe4bceb8a7e39c8bf529b1cfd78acce612e5f8d7c315eb699e697d441dfcf0e9c8c9e4f97ea02f5a4237595cbf9c84be2fe80a9b17fa3ba413da8535bac97d2abf17ee53ce9ea100af8014ed6211f1d4faec27e9c8d463d19eb69fa7a231f525b7501275fa3bfcd683d9feed46d055fa9638e7c3e8fd6f3fbf6d518bf51a702cf43beb61dfbe71c4efd8692f8157572a8dff6abd10fd7ea0ef3d1c2e806cf43bfdace75a817d6e3a2b7e8974db8df7118bf57772df617fadf875062ff213fdf7738ce8f2775897a30fab58d49e7cfe1ae6ad11ff3eadae23c5d52fb12df4fa3ee2fb91ffd1b626cb05fb6e0ae8ea8d799ba89e8d799daeaf7e159ed1accff32da62bfcbf7a08b7dc658ffa2da27d47baa6e615a56077d1fe887d4cf88f59caa6327ef87e57bd20d7fb2fee90c17137b6e3970e4c41d1f8dbf7f8fe1633ee1533ee373bee04bbee26b3e7e1bc3377ccb773ce37b7ee0477ee2677ee179be7913b3c08bfc913ff1675ee2655ee155fec26bbcfe26668337798ba7bccd3bbccb5f798ff7f980bfbd8939e48c0de75c70c915d7dcb06547fc630c11796a2950a4441d1dd1319dd0299dbd8939a70bbaecc7afe89a6ee896ee6846f774fe36777aa0c73ee2899ee985e6698116e9e1e7faf4511fe9137da6255aa6155aa52fbfd6b08f59a375daa04ddaa2296d8fbffe14b343bbf495f6689f0ee8dbffc41c524686722aa8a4ea7f626a6ac892f3ecc9fbff8e99ce7ceb838f3ef9eefb6fbfc4787fe48ffdc98fb3f431fffc3ef72fd6519eaa</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index 099e84a6..085f0b91 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DlgJabberEditAccountWidget</class> <author>Daniel Stone</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgJabberEditAccountWidget</cstring> </property> @@ -26,14 +26,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget10</cstring> </property> <property name="margin"> <number>0</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox65</cstring> </property> @@ -55,15 +55,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout61</cstring> + <cstring>tqlayout61</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -80,7 +80,7 @@ <string>The Jabber ID for the account you would like to use. Note that this must include the username and the domain (like an E-mail address), as there are many Jabber servers.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mID</cstring> </property> @@ -101,7 +101,7 @@ <cstring>mPass</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbAutoConnect</cstring> </property> @@ -112,7 +112,7 @@ <string>Check to disable automatic connection. If checked, you may connect to this account manually using the icon in the bottom of the main Kopete window</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbGlobalIdentity</cstring> </property> @@ -122,7 +122,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -141,7 +141,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblRegistration</cstring> </property> @@ -153,7 +153,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -162,11 +162,11 @@ <property name="text"> <string>To connect to the Jabber network, you will need an account on a Jabber server. If you do not yet have an account, please click the button to create one.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRegister</cstring> </property> @@ -182,7 +182,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox8_2</cstring> </property> @@ -201,7 +201,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>btnChangePassword</cstring> </property> @@ -209,7 +209,7 @@ <string>Change &Your Password</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>tlChangePwSuccess</cstring> </property> @@ -227,7 +227,7 @@ <property name="text"> <string>If you have an existing Jabber account and would like to change its password, you can use this button to enter a new password.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -252,7 +252,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -263,7 +263,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox66</cstring> </property> @@ -274,7 +274,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbUseSSL</cstring> </property> @@ -288,7 +288,7 @@ <string>Check this box to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbAllowPlainTextPassword</cstring> </property> @@ -299,7 +299,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbCustomServer</cstring> </property> @@ -310,15 +310,15 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout66</cstring> + <cstring>tqlayout66</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelServer</cstring> </property> @@ -346,7 +346,7 @@ <string>The IP address or hostname of the server you would like to connect to (for example jabber.org).</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mServer</cstring> </property> @@ -363,7 +363,7 @@ <string>The IP address or hostname of the server you would like to connect to (for example jabber.org).</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelPort</cstring> </property> @@ -391,7 +391,7 @@ <string>The port on the server that you would like to connect to (default is 5222).</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>mPort</cstring> </property> @@ -429,7 +429,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox8</cstring> </property> @@ -440,7 +440,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> @@ -457,7 +457,7 @@ <string>The resource name you would like to use on the Jabber network. Jabber allows you to sign on with the same account from multiple locations with different resource names, so you may wish to enter 'Home' or 'Work' here, for example.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mResource</cstring> </property> @@ -469,7 +469,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>100</width> <height>32767</height> @@ -495,14 +495,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_3_2</cstring> </property> @@ -517,7 +517,7 @@ <property name="text"> <string>P&riority:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -530,7 +530,7 @@ <string>The resource name you would like to use on the Jabber network. Jabber allows you to sign on with the same account from multiple locations with different resource names, so you may wish to enter 'Home' or 'Work' here, for example.</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>mPriority</cstring> </property> @@ -542,13 +542,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>100</width> <height>32767</height> @@ -575,7 +575,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>200</height> @@ -584,7 +584,7 @@ If two resources have the same priority, the messages will be sent to the one co </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -595,7 +595,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -606,20 +606,20 @@ If two resources have the same priority, the messages will be sent to the one co <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout70</cstring> + <cstring>tqlayout70</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leProxyJID</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -630,20 +630,20 @@ If two resources have the same priority, the messages will be sent to the one co <cstring>leProxyJID</cstring> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout68</cstring> + <cstring>tqlayout68</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leLocalIP</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -654,7 +654,7 @@ If two resources have the same priority, the messages will be sent to the one co <cstring>sbLocalPort</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>sbLocalPort</cstring> </property> @@ -667,7 +667,7 @@ If two resources have the same priority, the messages will be sent to the one co </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -680,7 +680,7 @@ If two resources have the same priority, the messages will be sent to the one co </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -691,7 +691,7 @@ If two resources have the same priority, the messages will be sent to the one co <li>Changes to these fields will only take effect the next time you start Kopete.</li> <li>The "Proxy JID" can be configured per account.</li></ul></i></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -707,7 +707,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>241</height> @@ -716,7 +716,7 @@ If two resources have the same priority, the messages will be sent to the one co </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -727,7 +727,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -748,14 +748,14 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>cbHideSystemInfo</cstring> </property> @@ -768,7 +768,7 @@ If two resources have the same priority, the messages will be sent to the one co </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -779,7 +779,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendEvents</cstring> </property> @@ -796,9 +796,9 @@ If two resources have the same priority, the messages will be sent to the one co <string>Check this box if you want to always send notifications to your contacts.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -814,22 +814,22 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendDeliveredEvent</cstring> </property> @@ -846,7 +846,7 @@ If two resources have the same priority, the messages will be sent to the one co <string><qt>Check this box to send the <b>Delivered notification</b> to your contacts : when a message is delivered to Kopete, Kopete can notify your contact that it has received the message.</qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendDisplayedEvent</cstring> </property> @@ -863,7 +863,7 @@ If two resources have the same priority, the messages will be sent to the one co <string><qt>Check this box to send the <b>Displayed notification</b> to your contacts : when a message is displayed in Kopete, Kopete can notify your contact that it has displayed the message.</qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendComposingEvent</cstring> </property> @@ -880,7 +880,7 @@ If two resources have the same priority, the messages will be sent to the one co <string><qt>Check this box to send the <b>Typing notification</b> to your contacts : when you are composing a message, you might want your contact to know that you are typing so that he knows you are answering.</qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendGoneEvent</cstring> </property> @@ -907,7 +907,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>110</height> @@ -986,7 +986,7 @@ If two resources have the same priority, the messages will be sent to the one co <tabstop>cbSendDisplayedEvent</tabstop> <tabstop>cbSendComposingEvent</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kopetepasswordwidget.h</includehint> </includehints> diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index ff324085..5f6b05a2 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 * parent, const char *name):dlgRegister (parent, name) +dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent, const char *name):dlgRegister (tqparent, name) { m_account = account; @@ -59,9 +59,9 @@ void dlgJabberRegister::slotGotForm () // translate the form and create it inside the box widget translator = new JabberFormTranslator (task->form (), grpForm); - static_cast<TQBoxLayout*>(grpForm->layout())->insertWidget(1, translator); + static_cast<TQBoxLayout*>(grpForm->tqlayout())->insertWidget(1, translator); translator->show(); - resize(sizeHint()); + resize(tqsizeHint()); // enable the send button btnRegister->setEnabled (true); diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h index 5cb0af67..86100852 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.h +++ b/kopete/protocols/jabber/ui/dlgjabberregister.h @@ -39,9 +39,10 @@ class dlgJabberRegister:public dlgRegister { Q_OBJECT + TQ_OBJECT public: - dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); + dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent = 0, const char *name = 0); ~dlgJabberRegister (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index c411bb96..96c91ec1 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgJabberRegisterAccount</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgJabberRegisterAccount</cstring> </property> @@ -12,7 +12,7 @@ <height>376</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>350</height> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblJID</cstring> </property> @@ -36,32 +36,32 @@ <cstring>leJID</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>pixPasswordVerify</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> </size> </property> </widget> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layoutServerEntry</cstring> + <cstring>tqlayoutServerEntry</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leServer</cstring> </property> @@ -79,7 +79,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>lblPassword</cstring> </property> @@ -106,7 +106,7 @@ <number>65535</number> </property> </widget> - <widget class="QCheckBox" row="5" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="5" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>cbUseSSL</cstring> </property> @@ -131,24 +131,24 @@ <string>Check this box to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>pixJID</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> </size> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>lblPort</cstring> </property> @@ -159,7 +159,7 @@ <cstring>sbPort</cstring> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>lblPasswordVerify</cstring> </property> @@ -181,24 +181,24 @@ <enum>Password</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixServer</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> </size> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblServer</cstring> </property> @@ -209,17 +209,17 @@ <cstring>leServer</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>pixPassword</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -237,7 +237,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>leJID</cstring> </property> @@ -245,19 +245,19 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblJIDInformation</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>100</height> @@ -266,7 +266,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -280,21 +280,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblStatusMessage</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -309,7 +309,7 @@ <tabstop>lePassword</tabstop> <tabstop>lePasswordVerify</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp index 4b9192dc..f16d927a 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 *parent, const char *name ) - : DlgSendRaw (parent, name) +dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *tqparent, const char *name ) + : DlgSendRaw (tqparent, 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 44e1a9ad..8a16f3e7 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.h +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.h @@ -28,7 +28,7 @@ class JabberClient; * A dialog to send raw strings to the jabber server. * * It comes with a TQComboBox to choose some "template" strings - * like "Availability Status", "Subscription",... + * like "Availability tqStatus", "Subscription",... * * @author Till Gerken <till@tantalo.net> * @author Chris TenHarmsel <tenharmsel@users.sf.net> @@ -36,9 +36,10 @@ class JabberClient; class dlgJabberSendRaw:public DlgSendRaw { Q_OBJECT + TQ_OBJECT public: - dlgJabberSendRaw ( JabberClient *client, TQWidget * parent = 0, const char *name = 0); + dlgJabberSendRaw ( JabberClient *client, TQWidget * tqparent = 0, const char *name = 0); virtual ~ dlgJabberSendRaw (); public slots: @@ -54,7 +55,7 @@ public slots: void slotClear (); /** - * Sets a xml message in tePacket(QTextWidget) + * Sets a xml message in tePacket(TQTextWidget) * according to the state of inputWidget. */ void slotCreateMessage (int); diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index 1bd1310c..e0e1a315 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 *parent, const char *name):dlgServices (parent, name) +dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *tqparent, const char *name):dlgServices (tqparent, name) { m_account = account; @@ -122,7 +122,7 @@ void dlgJabberServices::slotServiceFinished () if (!task->success ()) { TQString error = task->statusString(); - KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").arg(error), i18n ("Jabber Error")); + KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").tqarg(error), i18n ("Jabber Error")); return; } diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.h b/kopete/protocols/jabber/ui/dlgjabberservices.h index c64fb045..9672cc55 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.h +++ b/kopete/protocols/jabber/ui/dlgjabberservices.h @@ -34,9 +34,10 @@ class dlgJabberServices:public dlgServices { Q_OBJECT + TQ_OBJECT public: - dlgJabberServices (JabberAccount *account, TQWidget *parent = 0, const char *name = 0); + dlgJabberServices (JabberAccount *account, TQWidget *tqparent = 0, const char *name = 0); ~dlgJabberServices (); private slots: @@ -59,9 +60,10 @@ private: class dlgJabberServies_item : protected TQObject, public TQListViewItem { Q_OBJECT + TQ_OBJECT public: - dlgJabberServies_item( TQListView *parent , const TQString &s1 , const TQString &s2 ) - : TQListViewItem(parent,s1,s2), can_browse(false) , can_register(false) {} + dlgJabberServies_item( TQListView *tqparent , const TQString &s1 , const TQString &s2 ) + : TQListViewItem(tqparent,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 19070798..44278511 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -22,7 +22,7 @@ #include "dlgjabbervcard.h" -// Qt includes +// TQt includes #include <tqtextedit.h> #include <tqwidgetstack.h> #include <tqregexp.h> @@ -56,12 +56,12 @@ #include "dlgvcard.h" /* - * Constructs a dlgJabberVCard which is a child of 'parent', with the + * Constructs a dlgJabberVCard which is a child of 'tqparent', with the * name 'name' * */ -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") ) +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") ) { m_account = account; @@ -92,7 +92,7 @@ dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *conta */ dlgJabberVCard::~dlgJabberVCard () { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -296,7 +296,7 @@ void dlgJabberVCard::setEnabled(bool state) void dlgJabberVCard::slotSaveVCard() { setEnabled(false); - m_mainWidget->lblStatus->setText( i18n("Saving vCard to server...") ); + m_mainWidget->lbltqStatus->setText( i18n("Saving vCard to server...") ); XMPP::VCard vCard; XMPP::VCard::AddressList addressList; @@ -418,12 +418,12 @@ void dlgJabberVCard::slotVCardSaved() if( vCard->success() ) { - m_mainWidget->lblStatus->setText( i18n("vCard save sucessful.") ); + m_mainWidget->lbltqStatus->setText( i18n("vCard save sucessful.") ); m_contact->setPropertiesFromVCard( vCard->vcard() ); } else { - m_mainWidget->lblStatus->setText( i18n("Error: Unable to save vCard.") ); + m_mainWidget->lbltqStatus->setText( i18n("Error: Unable to save vCard.") ); } setEnabled(true); @@ -431,7 +431,7 @@ void dlgJabberVCard::slotVCardSaved() void dlgJabberVCard::slotGetVCard() { - m_mainWidget->lblStatus->setText( i18n("Fetching contact vCard...") ); + m_mainWidget->lbltqStatus->setText( i18n("Fetching contact vCard...") ); setReadOnly(true); setEnabled(false); @@ -454,11 +454,11 @@ void dlgJabberVCard::slotGotVCard() assignContactProperties(); - m_mainWidget->lblStatus->setText( i18n("vCard fetching Done.") ); + m_mainWidget->lbltqStatus->setText( i18n("vCard fetching Done.") ); } else { - m_mainWidget->lblStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") ); + m_mainWidget->lbltqStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") ); //it is maybe possible to anyway edit our own vCard (if it is new if(m_account->myself() == m_contact) setEnabled( true ); @@ -469,7 +469,7 @@ void dlgJabberVCard::slotSelectPhoto() { TQString path; bool remoteFile = false; - KURL filePath = KFileDialog::getImageOpenURL( TQString::null, this, i18n( "Jabber Photo" ) ); + KURL filePath = KFileDialog::getImageOpenURL( TQString(), this, i18n( "Jabber Photo" ) ); if( filePath.isEmpty() ) return; @@ -493,7 +493,7 @@ void dlgJabberVCard::slotSelectPhoto() if(img.width() > 96 || img.height() > 96) { // Scale and crop the picture. - img = img.smoothScale( 96, 96, TQImage::ScaleMin ); + img = img.smoothScale( 96, 96, TQ_ScaleMin ); // crop image if not square if(img.width() < img.height()) img = img.copy((img.width()-img.height())/2, 0, 96, 96); @@ -504,7 +504,7 @@ void dlgJabberVCard::slotSelectPhoto() else if (img.width() < 32 || img.height() < 32) { // Scale and crop the picture. - img = img.smoothScale( 32, 32, TQImage::ScaleMin ); + img = img.smoothScale( 32, 32, TQ_ScaleMin ); // crop image if not square if(img.width() < img.height()) img = img.copy((img.width()-img.height())/2, 0, 32, 32); @@ -520,14 +520,14 @@ void dlgJabberVCard::slotSelectPhoto() img = img.copy(0, (img.height()-img.width())/2, img.height(), img.height()); } - m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().replace(TQRegExp("[./~]"),"-") +".png"); + m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().tqreplace(TQRegExp("[./~]"),"-") +".png"); if( img.save(m_photoPath, "PNG") ) { m_mainWidget->lblPhoto->setPixmap( TQPixmap(img) ); } else { - m_photoPath = TQString::null; + m_photoPath = TQString(); } } else @@ -542,12 +542,12 @@ void dlgJabberVCard::slotSelectPhoto() void dlgJabberVCard::slotClearPhoto() { m_mainWidget->lblPhoto->setPixmap( TQPixmap() ); - m_photoPath = TQString::null; + m_photoPath = TQString(); } void dlgJabberVCard::slotOpenURL(const TQString &url) { - if ( !url.isEmpty () || (url == TQString::fromLatin1("mailto:") ) ) + if ( !url.isEmpty () || (url == TQString::tqfromLatin1("mailto:") ) ) new KRun(KURL( url ) ); } diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.h b/kopete/protocols/jabber/ui/dlgjabbervcard.h index a3794ee4..0ab95193 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.h +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.h @@ -45,6 +45,7 @@ class dlgVCard; class dlgJabberVCard : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** @@ -55,7 +56,7 @@ public: * @param widget Parent widget. * @param name widget name. */ - dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * parent = 0, const char *name = 0); + dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * tqparent = 0, const char *name = 0); ~dlgJabberVCard (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui index a3930c2e..76c8cc84 100644 --- a/kopete/protocols/jabber/ui/dlgregister.ui +++ b/kopete/protocols/jabber/ui/dlgregister.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>dlgRegister</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>dlgRegister</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>grpForm</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblWait</cstring> </property> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -87,7 +87,7 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -111,14 +111,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRegister</cstring> </property> @@ -135,7 +135,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnCancel</cstring> </property> @@ -158,5 +158,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui index 08e31f66..20c01e7c 100644 --- a/kopete/protocols/jabber/ui/dlgsendraw.ui +++ b/kopete/protocols/jabber/ui/dlgsendraw.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>DlgSendRaw</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DlgSendRaw</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblInfo</cstring> </property> @@ -42,15 +42,15 @@ <string>Type in the packet that should be sent to the server:</string> </property> <property name="buddy" stdset="0"> - <cstring>lblRealStatus</cstring> + <cstring>lblRealtqStatus</cstring> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>tePacket</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>User Defined</string> @@ -63,7 +63,7 @@ </item> <item> <property name="text"> - <string>Availability Status</string> + <string>Availability tqStatus</string> </property> </item> <item> @@ -100,15 +100,15 @@ <cstring>inputWidget</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnClear</cstring> </property> @@ -116,7 +116,7 @@ <string>Clea&r</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnSend</cstring> </property> @@ -134,14 +134,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>25</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnClose</cstring> </property> @@ -155,5 +155,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui index 7679309d..03022c61 100644 --- a/kopete/protocols/jabber/ui/dlgservices.ui +++ b/kopete/protocols/jabber/ui/dlgservices.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>dlgServices</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>dlgServices</cstring> </property> @@ -22,15 +22,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblServer</cstring> </property> @@ -46,7 +46,7 @@ <string>Server:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leServer</cstring> </property> @@ -59,7 +59,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnQuery</cstring> </property> @@ -83,7 +83,7 @@ </widget> </hbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Jid</string> @@ -110,9 +110,9 @@ <cstring>lvServices</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -128,14 +128,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRegister</cstring> </property> @@ -151,7 +151,7 @@ <string>&Register</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnBrowse</cstring> </property> @@ -167,7 +167,7 @@ <string>&Browse</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnClose</cstring> </property> @@ -195,5 +195,5 @@ <slot>close()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui index efaf5519..857a2890 100644 --- a/kopete/protocols/jabber/ui/dlgvcard.ui +++ b/kopete/protocols/jabber/ui/dlgvcard.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>dlgVCard</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>dlgVCard</cstring> </property> @@ -16,11 +16,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget3</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -31,15 +31,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblBirthday</cstring> </property> @@ -47,7 +47,7 @@ <string>Birthday:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leBirthday</cstring> </property> @@ -62,15 +62,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblHomepage</cstring> </property> @@ -78,7 +78,7 @@ <string>Homepage:</string> </property> </widget> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>wsHomepage</cstring> </property> @@ -90,13 +90,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -125,14 +125,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> <attribute name="id"> <number>1</number> </attribute> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leHomepage</cstring> </property> @@ -157,15 +157,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblTimezone</cstring> </property> @@ -173,7 +173,7 @@ <string>Timezone:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leTimezone</cstring> </property> @@ -188,15 +188,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblJID</cstring> </property> @@ -204,7 +204,7 @@ <string>Jabber ID:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leJID</cstring> </property> @@ -219,15 +219,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblName</cstring> </property> @@ -235,7 +235,7 @@ <string>Full name:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leName</cstring> </property> @@ -253,15 +253,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblNick</cstring> </property> @@ -269,7 +269,7 @@ <string>Nickname:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leNick</cstring> </property> @@ -294,7 +294,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -311,14 +311,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -329,7 +329,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>btnSelectPhoto</cstring> </property> @@ -337,7 +337,7 @@ <string>&Select Photo...</string> </property> </widget> - <widget class="QPushButton" row="1" column="2" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>btnClearPhoto</cstring> </property> @@ -345,7 +345,7 @@ <string>Clear Pho&to</string> </property> </widget> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lblPhoto</cstring> </property> @@ -357,13 +357,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>96</width> <height>96</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>96</width> <height>96</height> @@ -386,7 +386,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -414,7 +414,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -425,15 +425,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout36</cstring> + <cstring>tqlayout36</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lblState</cstring> </property> @@ -441,7 +441,7 @@ <string>Postal code:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblPOBox</cstring> </property> @@ -449,12 +449,12 @@ <string>PO box:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leHomeExtAddr</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblCity</cstring> </property> @@ -472,14 +472,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QWidgetStack" row="6" column="1" rowspan="2" colspan="1"> + <widget class="TQWidgetStack" row="6" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>wsHomeEmail</cstring> </property> @@ -491,7 +491,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -512,14 +512,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> <attribute name="id"> <number>1</number> </attribute> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leHomeEmail</cstring> </property> @@ -534,7 +534,7 @@ </widget> </widget> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lblCountry</cstring> </property> @@ -542,7 +542,7 @@ <string>Country:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblStreet</cstring> </property> @@ -550,7 +550,7 @@ <string>Street:</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>lblEmail</cstring> </property> @@ -566,12 +566,12 @@ <string>Email:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>leHomePOBox</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>leHomePostalCode</cstring> </property> @@ -586,24 +586,24 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> </size> </property> </spacer> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>leHomeCountry</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>leHomeCity</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>leHomeStreet</cstring> </property> @@ -612,7 +612,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -623,9 +623,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout37</cstring> + <cstring>tqlayout37</cstring> </property> <grid> <property name="name"> @@ -641,24 +641,24 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>leWorkPOBox</cstring> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>leWorkCountry</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblCity_2</cstring> </property> @@ -666,12 +666,12 @@ <string>City:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leWorkExtAddr</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblPOBox_2</cstring> </property> @@ -679,17 +679,17 @@ <string>PO box:</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>leWorkCity</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>leWorkStreet</cstring> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>lblEmail_2</cstring> </property> @@ -697,7 +697,7 @@ <string>Email:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lblCountry_2</cstring> </property> @@ -705,7 +705,7 @@ <string>Country:</string> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>leWorkPostalCode</cstring> </property> @@ -720,14 +720,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lblState_2</cstring> </property> @@ -735,7 +735,7 @@ <string>Postal code:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblStreet_2</cstring> </property> @@ -743,7 +743,7 @@ <string>Street:</string> </property> </widget> - <widget class="QWidgetStack" row="6" column="1" rowspan="2" colspan="1"> + <widget class="TQWidgetStack" row="6" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>wsWorkEmail</cstring> </property> @@ -755,7 +755,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -776,14 +776,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> <attribute name="id"> <number>1</number> </attribute> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leWorkEmail</cstring> </property> @@ -810,7 +810,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -821,20 +821,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout57</cstring> + <cstring>tqlayout57</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leDepartment</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>leCompany</cstring> </property> @@ -849,14 +849,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblPosition</cstring> </property> @@ -864,17 +864,17 @@ <string>Position:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lePosition</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>leRole</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblRole</cstring> </property> @@ -882,7 +882,7 @@ <string>Role:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDepartment</cstring> </property> @@ -890,7 +890,7 @@ <string>Department:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblCompany</cstring> </property> @@ -902,7 +902,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -913,9 +913,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout59</cstring> + <cstring>tqlayout59</cstring> </property> <grid> <property name="name"> @@ -931,24 +931,24 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lePhoneFax</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>lePhoneCell</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblPhoneFax</cstring> </property> @@ -956,12 +956,12 @@ <string>Fax:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lePhoneHome</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblPhoneCell</cstring> </property> @@ -969,12 +969,12 @@ <string>Cell:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lePhoneWork</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblPhoneWork</cstring> </property> @@ -982,7 +982,7 @@ <string>Work:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblPhoneHome</cstring> </property> @@ -994,7 +994,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -1005,7 +1005,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>teAbout</cstring> </property> @@ -1013,9 +1013,9 @@ </grid> </widget> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> - <cstring>lblStatus</cstring> + <cstring>lbltqStatus</cstring> </property> <property name="text"> <string></string> @@ -1055,7 +1055,7 @@ <tabstop>lePhoneCell</tabstop> <tabstop>teAbout</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurllabel.h</includehint> <includehint>kurllabel.h</includehint> diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index 076b92b8..90f4f1e0 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 * parent, const char *name):AddContactPage (parent, name) +JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent, const char *name):AddContactPage (tqparent, name) { (new TQVBoxLayout (this))->setAutoAdd (true); @@ -76,7 +76,7 @@ bool JabberAddContactPage::validateData () } -bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *parentContact ) +bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *tqparentContact ) { if( canadd && validateData () ) @@ -90,25 +90,25 @@ bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact { XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () ); JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND *workaround = - new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask ); + new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , tqparentContact , gatewayTask ); TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived())); gatewayTask->set ( transport->myself()->contactId() , contactId ); gatewayTask->go ( true ); return true; } - TQString displayName = parentContact->displayName (); + TQString displayName = tqparentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names TQStringList groupNames; - Kopete::GroupList groupList = parentContact->groups(); + Kopete::GroupList groupList = tqparentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); - if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ) + if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) { XMPP::RosterItem item; XMPP::Jid jid ( contactId ); @@ -167,25 +167,25 @@ void JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::slot TQString contactId=task->prompt(); - Kopete::MetaContact* parentContact=metacontact; + Kopete::MetaContact* tqparentContact=metacontact; JabberAccount *jaccount=transport->account();; /*\ * this is a copy of the end of JabberAddContactPage::apply \*/ - TQString displayName = parentContact->displayName (); + TQString displayName = tqparentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names TQStringList groupNames; - Kopete::GroupList groupList = parentContact->groups(); + Kopete::GroupList groupList = tqparentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); - if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ) + if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) { XMPP::RosterItem item; XMPP::Jid jid ( contactId ); diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.h b/kopete/protocols/jabber/ui/jabberaddcontactpage.h index 09cdaae1..bb4e0271 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.h +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.h @@ -32,9 +32,10 @@ class TQLabel; class JabberAddContactPage:public AddContactPage { Q_OBJECT + TQ_OBJECT public: - JabberAddContactPage (Kopete::Account * owner, TQWidget * parent = 0, const char *name = 0); + JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent = 0, const char *name = 0); ~JabberAddContactPage (); virtual bool validateData (); virtual bool apply (Kopete::Account *, Kopete::MetaContact *); @@ -52,10 +53,11 @@ class JabberTransport; * @author Olivier Goffart * this class is just there to workaround the fact that it's not possible to add contact assync with Kopete::AddContactPage::apply */ -class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : public QObject +class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : public TQObject { Q_OBJECT + TQ_OBJECT public: - JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *parent); + JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *tqparent); Kopete::MetaContact *metacontact; JabberTransport *transport; public slots: diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 63339158..b5fef8f3 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -30,18 +30,18 @@ #include "dlgjabberchooseserver.h" #include "jabberregisteraccount.h" -JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const char *name ) - : KDialogBase ( parent, name, true, i18n("Choose Jabber Server"), +JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *tqparent, const char *name ) + : KDialogBase ( tqparent, name, true, i18n("Choose Jabber Server"), KDialogBase::Ok | KDialogBase::Cancel ) { - mParentWidget = parent; + mParentWidget = tqparent; mSelectedRow = -1; mMainWidget = new DlgJabberChooseServer ( this ); setMainWidget ( mMainWidget ); - mMainWidget->lblStatus->setText ( i18n ( "Retrieving server list...") ); + mMainWidget->lbltqStatus->setText ( i18n ( "Retrieving server list...") ); mMainWidget->listServers->setLeftMargin ( 0 ); @@ -108,7 +108,7 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job ) if ( job->error () || mTransferJob->isErrorPage () ) { - mMainWidget->lblStatus->setText ( i18n ( "Could not retrieve server list." ) ); + mMainWidget->lbltqStatus->setText ( i18n ( "Could not retrieve server list." ) ); return; } else @@ -116,14 +116,14 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job ) kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Received server list ok!" << endl; // clear status message - mMainWidget->lblStatus->setText ( "" ); + mMainWidget->lbltqStatus->setText ( "" ); // parse XML list TQDomDocument doc; if ( !doc.setContent ( xmlServerList ) ) { - mMainWidget->lblStatus->setText ( i18n ( "Could not parse the server list.") ); + mMainWidget->lbltqStatus->setText ( i18n ( "Could not parse the server list.") ); return; } diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h index cc64040b..bd74575d 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.h +++ b/kopete/protocols/jabber/ui/jabberchooseserver.h @@ -39,9 +39,10 @@ class JabberChooseServer : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - JabberChooseServer ( JabberRegisterAccount *parent = 0, const char *name = 0); + JabberChooseServer ( JabberRegisterAccount *tqparent = 0, const char *name = 0); ~JabberChooseServer(); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 6c928ad6..9a769122 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 * parent, const char *name) - : DlgJabberEditAccountWidget (parent, name), KopeteEditAccountWidget (ident) +JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, TQWidget * tqparent, const char *name) + : DlgJabberEditAccountWidget (tqparent, name), KopeteEditAccountWidget (ident) { m_protocol = proto; @@ -88,15 +88,15 @@ void JabberEditAccountWidget::reopen () mPass->load (&account()->password ()); cbAutoConnect->setChecked (account()->excludeConnect()); - mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::fromLatin1("Kopete"))); + mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::tqfromLatin1("Kopete"))); mPriority->setValue (account()->configGroup()->readNumEntry ("Priority", 5)); - mServer->setText (account()->configGroup()->readEntry ("Server", TQString::null)); + mServer->setText (account()->configGroup()->readEntry ("Server", TQString())); cbUseSSL->setChecked (account()->configGroup()->readBoolEntry( "UseSSL", false)); mPort->setValue (account()->configGroup()->readNumEntry("Port", 5222)); - TQString auth = account()->configGroup()->readEntry("AuthType", TQString::null); + TQString auth = account()->configGroup()->readEntry("AuthType", TQString()); cbCustomServer->setChecked (account()->configGroup()->readBoolEntry("CustomServer",false)); @@ -119,7 +119,7 @@ void JabberEditAccountWidget::reopen () leLocalIP->setText (KGlobal::config()->readEntry("LocalIP", "")); sbLocalPort->setValue (KGlobal::config()->readNumEntry("LocalPort", 8010)); - leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", TQString::null)); + leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", TQString())); // Privacy cbSendEvents->setChecked( account()->configGroup()->readBoolEntry("SendEvents", true) ); @@ -200,7 +200,7 @@ void JabberEditAccountWidget::writeConfig () bool JabberEditAccountWidget::validateData () { - if(!mID->text().contains('@')) + if(!mID->text().tqcontains('@')) { KMessageBox::sorry(this, i18n("The Jabber ID you have chosen is invalid. " "Please make sure it is in the form user@server.com, like an email address."), diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h index e56dcbd2..e1ce2d30 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h @@ -35,9 +35,10 @@ class JabberEditAccountWidget:public DlgJabberEditAccountWidget, public KopeteEd { Q_OBJECT + TQ_OBJECT public: - JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * parent = 0, const char *name = 0); + JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * tqparent = 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 bb20611b..dee7534a 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -47,18 +47,18 @@ #include "jabberchooseserver.h" #include "dlgjabberregisteraccount.h" -JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, const char *name ) - : KDialogBase ( parent, name, true, i18n("Register New Jabber Account"), +JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent, const char *name ) + : KDialogBase ( tqparent, name, true, i18n("Register New Jabber Account"), KDialogBase::Ok | KDialogBase::Cancel ) { - mParentWidget = parent; + mParentWidget = tqparent; // setup main dialog mMainWidget = new DlgJabberRegisterAccount ( this ); setMainWidget ( mMainWidget ); - // replace "Ok" button with a "Register" button + // tqreplace "Ok" button with a "Register" button KGuiItem registerButton = KStdGuiItem::ok(); registerButton.setText ( i18n ( "Register" ) ); setButtonOK ( registerButton ); @@ -78,12 +78,12 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, mSuccess = false; // get all settings from the main dialog - 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 () ); + 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 () ); // connect buttons to slots, ok is already connected by default connect ( this, TQT_SIGNAL ( cancelClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); @@ -146,8 +146,8 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || - TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) + ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || + TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Please enter the same password twice." ) ); valid = false; @@ -155,8 +155,8 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ) != - TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) + ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ) != + TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Password entries do not match." ) ); valid = false; @@ -259,7 +259,7 @@ void JabberRegisterAccount::slotOk () jabberClient->setOverrideHost ( true, mMainWidget->leServer->text (), mMainWidget->sbPort->value () ); // start connection, no authentication - switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString::null, false ) ) + switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString(), false ) ) { case JabberClient::NoTLS: // no SSL support, at the connecting stage this means the problem is client-side @@ -341,7 +341,7 @@ void JabberRegisterAccount::slotRegisterUserDone () { mMainWidget->lblStatusMessage->setText ( i18n ( "Registration successful." ) ); - // save settings to parent + // save settings to tqparent 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 727d61fb..5d8b9b5f 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.h +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.h @@ -36,9 +36,10 @@ class JabberRegisterAccount : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - JabberRegisterAccount ( JabberEditAccountWidget *parent = 0, const char *name = 0 ); + JabberRegisterAccount ( JabberEditAccountWidget *tqparent = 0, const char *name = 0 ); ~JabberRegisterAccount (); |