diff options
Diffstat (limited to 'kopete/protocols/groupwise')
161 files changed, 1000 insertions, 933 deletions
diff --git a/kopete/protocols/groupwise/DESIGN b/kopete/protocols/groupwise/DESIGN index aa976191..86fb1dac 100644 --- a/kopete/protocols/groupwise/DESIGN +++ b/kopete/protocols/groupwise/DESIGN @@ -19,7 +19,7 @@ Add new event tasks ChatOwner changed - vlarge Event proto update (large update -> requires new EventTransfer subclass) -Update Client with event signals +Update Client with event Q_SIGNALS Broadcast DONE Chatroom diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index b2951233..ff5b53b4 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -65,8 +65,8 @@ #include "gwaccount.h" -GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const TQString& accountID, const char *name ) -: Kopete::ManagedConnectionAccount ( parent, accountID, 0, "groupwiseaccount" ) +GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *tqparent, const TQString& accountID, const char *name ) +: Kopete::ManagedConnectionAccount ( tqparent, accountID, 0, "groupwiseaccount" ) { Q_UNUSED( name ); // Init the myself contact @@ -79,11 +79,11 @@ GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const TQString& a TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); - m_actionAutoReply = new KAction ( i18n( "&Set Auto-Reply..." ), TQString::null, 0, this, + m_actionAutoReply = new KAction ( i18n( "&Set Auto-Reply..." ), TQString(), 0, this, TQT_SLOT( slotSetAutoReply() ), this, "actionSetAutoReply"); - m_actionJoinChatRoom = new KAction ( i18n( "&Join Channel..." ), TQString::null, 0, this, + m_actionJoinChatRoom = new KAction ( i18n( "&Join Channel..." ), TQString(), 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "actionJoinChatRoom"); - m_actionManagePrivacy = new KAction ( i18n( "&Manage Privacy..." ), TQString::null, 0, this, + m_actionManagePrivacy = new KAction ( i18n( "&Manage Privacy..." ), TQString(), 0, this, TQT_SLOT( slotPrivacy() ), this, "actionPrivacy"); m_connector = 0; @@ -112,7 +112,7 @@ KActionMenu* GroupWiseAccount::actionMenu() m_actionMenu->insert( m_actionJoinChatRoom ); /* Used for debugging */ /* - theActionMenu->insert( new KAction ( "Test rtfize()", TQString::null, 0, this, + theActionMenu->insert( new KAction ( "Test rtfize()", TQString(), 0, this, TQT_SLOT( slotTestRTFize() ), this, "actionTestRTFize") ); */ @@ -224,7 +224,7 @@ void GroupWiseAccount::setAway( bool away, const TQString & reason ) if ( away ) { if ( Kopete::Away::getInstance()->idleTime() > 10 ) // don't go AwayIdle unless the user has actually been idle this long - setOnlineStatus( protocol()->groupwiseAwayIdle, TQString::null ); + setOnlineStatus( protocol()->groupwiseAwayIdle, TQString() ); else setOnlineStatus( protocol()->groupwiseAway, reason ); } @@ -308,13 +308,13 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password ) // contact details listed TQObject::connect( m_client, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ), TQT_SLOT( receiveContactUserDetails( const GroupWise::ContactDetails & ) ) ); // contact status changed - TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, Q_UINT16, const TQString & ) ), TQT_SLOT( receiveStatus( const TQString &, Q_UINT16 , const TQString & ) ) ); + TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receivetqStatus( const TQString &, TQ_UINT16 , const TQString & ) ) ); // incoming message TQObject::connect( m_client, TQT_SIGNAL( messageReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); // auto reply to one of our messages because the recipient is away TQObject::connect( m_client, TQT_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::Status, const TQString &, const TQString & ) ), TQT_SLOT( changeOurStatus( GroupWise::Status, const TQString &, const TQString & ) ) ); + TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::tqStatus, const TQString &, const TQString & ) ), TQT_SLOT( changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & ) ) ); // conference events TQObject::connect( m_client, TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), @@ -364,7 +364,7 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password ) void GroupWiseAccount::slotMessageSendingFailed() { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to <[email protected]> for analysis." ).arg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").arg( accountId() ) ); + i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to <[email protected]> for analysis." ).tqarg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").tqarg( accountId() ) ); } void GroupWiseAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQString &reason ) @@ -390,9 +390,9 @@ void GroupWiseAccount::setOnlineStatus( const Kopete::OnlineStatus& status, cons // Appear Offline is achieved by explicitly setting the status to offline, // rather than disconnecting as when really going offline. if ( status == protocol()->groupwiseAppearOffline ) - m_client->setStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) ); + m_client->settqStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) ); else - m_client->setStatus( ( GroupWise::Status )status.internalStatus(), reason, configGroup()->readEntry( "AutoReply" ) ); + m_client->settqStatus( ( GroupWise::tqStatus )status.internalStatus(), reason, configGroup()->readEntry( "AutoReply" ) ); } // going online else @@ -474,11 +474,11 @@ void GroupWiseAccount::slotLoggedIn() // set local status display myself()->setOnlineStatus( protocol()->groupwiseAvailable ); // set status on server - if ( initialStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) && - ( ( GroupWise::Status )initialStatus().internalStatus() != GroupWise::Unknown ) ) + if ( initialtqStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) && + ( ( GroupWise::tqStatus )initialtqStatus().internalStatus() != GroupWise::Unknown ) ) { - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Initial status is not online, setting status to " << initialStatus().internalStatus() << endl; - m_client->setStatus( ( GroupWise::Status )initialStatus().internalStatus(), m_initialReason, configGroup()->readEntry( "AutoReply" ) ); + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Initial status is not online, setting status to " << initialtqStatus().internalStatus() << endl; + m_client->settqStatus( ( GroupWise::tqStatus )initialtqStatus().internalStatus(), m_initialReason, configGroup()->readEntry( "AutoReply" ) ); } } @@ -533,7 +533,7 @@ void GroupWiseAccount::reconcileOfflineChanges() else continue; - GWFolder * folder = ::qt_cast<GWFolder*>( ( *instIt )->parent() ); + GWFolder * folder = ::tqqt_cast<GWFolder*>( ( *instIt )->tqparent() ); if ( folder->id == ( unsigned int )groupId.toInt() ) { found = true; @@ -566,7 +566,7 @@ void GroupWiseAccount::reconcileOfflineChanges() break; } else - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple children and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple tqchildren and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl; conflicts = true; } } // @@ -647,7 +647,7 @@ void GroupWiseAccount::slotConnError() { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl; KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).arg( accountId() ) , i18n ("Unable to Connect '%1'").arg( accountId() ) ); + i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).tqarg( accountId() ) , i18n ("Unable to Connect '%1'").tqarg( accountId() ) ); disconnect(); } @@ -664,7 +664,7 @@ void GroupWiseAccount::slotCSDisconnected() TQValueList<GroupWiseChatSession *>::ConstIterator it; for ( it = m_chatSessions.begin() ; it != m_chatSessions.end(); ++it ) (*it)->setClosed(); - setAllContactsStatus( protocol()->groupwiseOffline ); + setAllContactstqStatus( protocol()->groupwiseOffline ); client()->close(); } @@ -807,8 +807,8 @@ void GroupWiseAccount::handleIncomingMessage( const ConferenceEvent & message ) // if we receive a message from an Offline contact, they are probably blocking us // but we have to set their status to Unknown so that we can reply to them. - kdDebug( GROUPWISE_DEBUG_GLOBAL) << "sender is: " << sender->onlineStatus().description() << endl; - if ( sender->onlineStatus() == protocol()->groupwiseOffline ) { + kdDebug( GROUPWISE_DEBUG_GLOBAL) << "sender is: " << sender->onlinetqStatus().description() << endl; + if ( sender->onlinetqStatus() == protocol()->groupwiseOffline ) { sender->setMessageReceivedOffline( true ); } @@ -823,19 +823,19 @@ void GroupWiseAccount::handleIncomingMessage( const ConferenceEvent & message ) { TQString prefix = i18n("Prefix used for automatically generated auto-reply" " messages when the contact is Away, contains contact's name", - "Auto reply from %1: " ).arg( sender->metaContact()->displayName() ); + "Auto reply from %1: " ).tqarg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } if ( message.type == GroupWise::ReceivedBroadcast ) { TQString prefix = i18n("Prefix used for broadcast messages", - "Broadcast message from %1: " ).arg( sender->metaContact()->displayName() ); + "Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } if ( message.type == GroupWise::ReceivedSystemBroadcast ) { TQString prefix = i18n("Prefix used for system broadcast messages", - "System Broadcast message from %1: " ).arg( sender->metaContact()->displayName() ); + "System Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } @@ -855,11 +855,11 @@ void GroupWiseAccount::receiveFolder( const FolderItem & folder ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " objectId: " << folder.id << " sequence: " << folder.sequence - << " parentId: " << folder.parentId + << " tqparentId: " << folder.tqparentId << " displayName: " << folder.name << endl; - if ( folder.parentId != 0 ) + if ( folder.tqparentId != 0 ) { - kdWarning( GROUPWISE_DEBUG_GLOBAL ) << " - received a nested folder. These were not supported in GroupWise or Kopete as of Sept 2004, aborting! (parentId = " << folder.parentId << ")" << endl; + kdWarning( GROUPWISE_DEBUG_GLOBAL ) << " - received a nested folder. These were not supported in GroupWise or Kopete as of Sept 2004, aborting! (tqparentId = " << folder.tqparentId << ")" << endl; return; } @@ -910,13 +910,13 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " objectId: " << contact.id << ", sequence: " << contact.sequence - << ", parentId: " << contact.parentId + << ", tqparentId: " << contact.tqparentId << ", dn: " << contact.dn << ", displayName: " << contact.displayName << endl; //kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "\n dotted notation is '" << protocol()->dnToDotted( contact.dn ) << "'\n" <<endl; // add to new style contact list - GWContactInstance * gwInst = m_serverListModel->addContactInstance( contact.id, contact.parentId, contact.sequence, contact.displayName, contact.dn ); + GWContactInstance * gwInst = m_serverListModel->addContactInstance( contact.id, contact.tqparentId, contact.sequence, contact.displayName, contact.dn ); Q_ASSERT( gwInst ); GroupWiseContact * c = contactForDN( contact.dn ); @@ -925,21 +925,21 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact ) { Kopete::MetaContact *metaContact = new Kopete::MetaContact(); metaContact->setDisplayName( contact.displayName ); - c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.parentId, contact.sequence ); + c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.tqparentId, contact.sequence ); Kopete::ContactList::self()->addMetaContact( metaContact ); } // add the metacontact to the ContactItem's group, if not there aleady - if ( contact.parentId == 0 ) + if ( contact.tqparentId == 0 ) c->metaContact()->addToGroup( Kopete::Group::topLevel() ); else { // check the metacontact is in the group this listing-of-the-contact is in... - GWFolder * folder = m_serverListModel->findFolderById( contact.parentId ); + GWFolder * folder = m_serverListModel->findFolderById( contact.tqparentId ); if ( !folder ) // inconsistent { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - ERROR - contact's folder doesn't exist on server" << endl; DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); - dit->item( contact.parentId, contact.id ); + dit->item( contact.tqparentId, contact.id ); // TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); return; @@ -1040,14 +1040,14 @@ GroupWiseContact * GroupWiseAccount::createTemporaryContact( const TQString & dn Kopete::ContactList::self()->addMetaContact( metaContact ); // the contact details probably don't contain status - but we can ask for it if ( details.status == GroupWise::Invalid && isConnected() ) - m_client->requestStatus( details.dn ); + m_client->requesttqStatus( details.dn ); } else kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Notified of existing temporary contact DN: " << details.dn << endl; return c; } -void GroupWiseAccount::receiveStatus( const TQString & contactId, Q_UINT16 status, const TQString &awayMessage ) +void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 status, const TQString &awayMessage ) { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "got status for: " << contactId << ", status: " << status << ", away message: " << awayMessage << endl; GroupWiseContact * c = contactForDN( contactId ); @@ -1059,10 +1059,10 @@ void GroupWiseAccount::receiveStatus( const TQString & contactId, Q_UINT16 statu c->setProperty( protocol()->propAwayMessage, awayMessage ); } else - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't find " << contactId << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't tqfind " << contactId << endl; } -void GroupWiseAccount::changeOurStatus( GroupWise::Status status, const TQString & awayMessage, const TQString & autoReply ) +void GroupWiseAccount::changeOurtqStatus( GroupWise::tqStatus status, const TQString & awayMessage, const TQString & autoReply ) { if ( status == GroupWise::Offline ) myself()->setOnlineStatus( protocol()->groupwiseAppearOffline ); @@ -1092,7 +1092,7 @@ void GroupWiseAccount::sendMessage( const GroupWise::ConferenceGuid &guid, const } } -bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact ) +bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "contactId: " << contactId << endl; @@ -1101,7 +1101,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon // Set object id to 0 if not found - they do not exist on the server bool topLevel = false; TQValueList< FolderItem > folders; - Kopete::GroupList groupList = parentContact->groups(); + Kopete::GroupList groupList = tqparentContact->groups(); for ( Kopete::Group *group = groupList.first(); group; group = groupList.next() ) { if ( group->type() == Kopete::Group::TopLevel ) // no need to create it on the server @@ -1117,7 +1117,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << fld->displayName << endl; //FIXME - get rid of FolderItem & co - fi.parentId = ::qt_cast<GWFolder*>( fld->parent() )->id; + fi.tqparentId = ::tqqt_cast<GWFolder*>( fld->tqparent() )->id; fi.id = fld->id; fi.name = fld->displayName; } @@ -1125,7 +1125,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "folder: " << group->displayName() << "not found in server list model." << endl; - fi.parentId = 0; + fi.tqparentId = 0; fi.id = 0; fi.name = group->displayName(); } @@ -1144,7 +1144,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon // // Since ToMetaContact expects synchronous contact creation // we have to create the contact optimistically. - GroupWiseContact * gc = new GroupWiseContact( this, contactId, parentContact, 0, 0, 0 ); + GroupWiseContact * gc = new GroupWiseContact( this, contactId, tqparentContact, 0, 0, 0 ); ContactDetails dt = client()->userDetailsManager()->details( contactId ); TQString displayAs; if ( dt.fullName.isEmpty() ) @@ -1164,7 +1164,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon // get the contact's full name to use as the display name of the created contact CreateContactTask * cct = new CreateContactTask( client()->rootTask() ); - cct->contactFromUserId( contactId, parentContact->displayName(), highestFreeSequence, folders, topLevel ); + cct->contactFromUserId( contactId, tqparentContact->displayName(), highestFreeSequence, folders, topLevel ); TQObject::connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( receiveContactCreated() ) ); cct->go( true ); return true; @@ -1189,7 +1189,7 @@ void GroupWiseAccount::receiveContactCreated() else { client()->requestDetails( TQStringList( cct->dn() ) ); - client()->requestStatus( cct->dn() ); + client()->requesttqStatus( cct->dn() ); } } else @@ -1210,7 +1210,7 @@ void GroupWiseAccount::receiveContactCreated() KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget (), KMessageBox::Error, i18n ("The contact %1 could not be added to the contact list, with error message: %2"). - arg(cct->userId() ).arg( cct->statusString() ), + tqarg(cct->userId() ).tqarg( cct->statusString() ), i18n ("Error Adding Contact") ); } } @@ -1227,7 +1227,7 @@ void GroupWiseAccount::deleteContact( GroupWiseContact * contact ) for ( ; it != instances.end(); ++it ) { DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); - dit->item( ::qt_cast<GWFolder*>( (*it)->parent() )->id, (*it)->id ); + dit->item( ::tqqt_cast<GWFolder*>( (*it)->tqparent() )->id, (*it)->id ); TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); } @@ -1255,8 +1255,8 @@ void GroupWiseAccount::receiveContactDeleted( const ContactItem & instance ) void GroupWiseAccount::slotConnectedElsewhere() { - KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").arg( accountId() ), - i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).arg( accountId() ) , Kopete::UI::Global::mainWidget() ); + KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").tqarg( accountId() ), + i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).tqarg( accountId() ) , Kopete::UI::Global::mainWidget() ); disconnect(); } @@ -1364,7 +1364,7 @@ void GroupWiseAccount::receiveInviteNotify( const ConferenceEvent & event ) c = createTemporaryContact( event.user ); sess->addInvitee( c ); - Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").arg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText ); + Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").tqarg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText ); sess->appendMessage( declined ); } else @@ -1377,7 +1377,7 @@ void GroupWiseAccount::slotLeavingConference( GroupWiseChatSession * sess ) if( isConnected () ) m_client->leaveConference( sess->guid() ); m_chatSessions.remove( sess ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "m_chatSessions now contains:" << m_chatSessions.count() << " managers" << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "m_chatSessions now tqcontains:" << m_chatSessions.count() << " managers" << endl; Kopete::ContactPtrList members = sess->members(); for ( Kopete::Contact * contact = members.first(); contact; contact = members.next() ) { @@ -1400,14 +1400,14 @@ void GroupWiseAccount::slotSetAutoReply() void GroupWiseAccount::slotTestRTFize() { /* bool ok; - const TQString query = TQString::fromLatin1("Enter a string to rtfize:"); - TQString testText = KLineEditDlg::getText( query, TQString::null, &ok, Kopete::UI::Global::mainWidget() ); + const TQString query = TQString::tqfromLatin1("Enter a string to rtfize:"); + TQString testText = KLineEditDlg::getText( query, TQString(), &ok, Kopete::UI::Global::mainWidget() ); if ( ok ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Converted text is: '" << protocol()->rtfizeText( testText ) << "'" << endl;*/ // bool ok; // const TQString query = i18n("Enter a contactId:"); -// TQString testText = KInputDialog::getText( query, i18n("This is a test dialog and will not be in the final product!" ), TQString::null, &ok, Kopete::UI::Global::mainWidget() ); +// TQString testText = KInputDialog::getText( query, i18n("This is a test dialog and will not be in the final product!" ), TQString(), &ok, Kopete::UI::Global::mainWidget() ); // if ( !ok ) // return; // kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Trying to add contact: '" << protocol()->rtfizeText( testText ) << "'" << endl; @@ -1470,7 +1470,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = CONTACT '" << contact->nickName() << "' IS IN " << contact->metaContact()->groups().count() << " MC GROUPS, AND HAS " << m_serverListModel->instancesWithDn( contact->dn() ).count() << " CONTACT LIST INSTANCES." << endl; kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = LOOKING FOR NOOP GROUP MEMBERSHIPS" << endl; - // 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, parentid + // 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, tqparentid // 2) Each remaining unmatched pair is a move, initiate and remove - need to take care to always use greatest unused sequence number - if we have to set the sequence number to the following sequence number within the folder, we may have a problem where after the first move, we have to wait for the state of the CLIs to be updated pending the completion of the first move - this would be difficult to cope with, because our current lists would be out of date, or we'd have to restart the sync - assuming the first move created a new matched CLI-MCG pair, we could do that with little cost. // 3) Any remaining entries in MCG list are adds, carry out // 4) Any remaining entries in CLI list are removes, carry out @@ -1499,7 +1499,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) { GWContactInstanceList::Iterator candidateInst = instIt; ++instIt; - GWFolder * folder = ::qt_cast<GWFolder *>( ( *candidateInst )->parent() ); + GWFolder * folder = ::tqqt_cast<GWFolder *>( ( *candidateInst )->tqparent() ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - Looking for a match, MC grp '" << ( *candidateGrp )->displayName() << "', GWFolder '" << folder->displayName << "', objectId is " << folder->id << endl; @@ -1525,13 +1525,13 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) candidateGrp = grpIt; ++grpIt; GWContactInstanceList::Iterator instIt = instances.begin(); - GWFolder * sourceFolder =::qt_cast<GWFolder*>( ( *instIt)->parent() ); + GWFolder * sourceFolder =::tqqt_cast<GWFolder*>( ( *instIt)->tqparent() ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - moving contact instance from group '" << sourceFolder->displayName << "' to group '" << ( *candidateGrp )->displayName() << "'" << endl; // create contactItem parameter ContactItem instance; instance.id = ( *instIt )->id; - instance.parentId = sourceFolder->id; + instance.tqparentId = sourceFolder->id; instance.sequence = ( *instIt )->sequence; instance.dn = ( *instIt )->dn; instance.displayName = contact->nickName(); @@ -1579,8 +1579,8 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) // does this group exist on the server? Create the contact appropriately if ( destinationFolder ) { - int parentId = destinationFolder->id; - ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), parentId ); + int tqparentId = destinationFolder->id; + ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), tqparentId ); } else { @@ -1604,7 +1604,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) { GWContactInstanceList::Iterator candidateInst = instIt; ++instIt; - GWFolder * folder =::qt_cast<GWFolder*>( ( *candidateInst )->parent() ); + GWFolder * folder =::tqqt_cast<GWFolder*>( ( *candidateInst )->tqparent() ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - remove contact instance '"<< ( *candidateInst )->id << "' in group '" << folder->displayName << "'" << endl; DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); @@ -1628,7 +1628,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) TQValueList< ContactItem > instancesToChange; ContactItem instance; instance.id = (*it)->id; - instance.parentId = ::qt_cast<GWFolder *>( (*it)->parent() )->id; + instance.tqparentId = ::tqqt_cast<GWFolder *>( (*it)->tqparent() )->id; instance.sequence = (*it)->sequence; instance.dn = contact->dn(); instance.displayName = contact->nickName(); diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h index fd137154..314769f0 100644 --- a/kopete/protocols/groupwise/gwaccount.h +++ b/kopete/protocols/groupwise/gwaccount.h @@ -57,8 +57,9 @@ using namespace GroupWise; class GroupWiseAccount : public Kopete::ManagedConnectionAccount { Q_OBJECT + TQ_OBJECT public: - GroupWiseAccount( GroupWiseProtocol *parent, const TQString& accountID, const char *name = 0 ); + GroupWiseAccount( GroupWiseProtocol *tqparent, const TQString& accountID, const char *name = 0 ); ~GroupWiseAccount(); /** @@ -73,7 +74,7 @@ public: * Creates a protocol specific Kopete::Contact subclass and adds it to the supplied * Kopete::MetaContact */ - virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact); + virtual bool createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact); /** * Delete a contact on the server */ @@ -153,7 +154,7 @@ public slots: virtual void disconnect( Kopete::Account::DisconnectReason reason ); /** Set the online status for the account. 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()); signals: void conferenceCreated( const int mmId, const GroupWise::ConferenceGuid & guid ); void conferenceCreationFailed( const int mmId, const int statusCode ); @@ -224,11 +225,11 @@ protected slots: /** * A contact changed status */ - void receiveStatus( const TQString &, Q_UINT16, const TQString & ); + void receivetqStatus( const TQString &, TQ_UINT16, const TQString & ); /** * Our status changed on the server */ - void changeOurStatus( GroupWise::Status, const TQString &, const TQString & ); + void changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & ); /** * Called when we've been disconnected for logging in as this user somewhere else */ @@ -306,7 +307,7 @@ protected: /** * Sends a status message to the server - called by the status specific slotGoAway etc */ - //void setStatus( GroupWise::Status status, const TQString & reason = TQString::null ); + //void settqStatus( GroupWise::tqStatus status, const TQString & reason = TQString() ); int handleTLSWarning (int warning, TQString server, TQString accountId); @@ -346,8 +347,9 @@ private: /*class OnlineStatusMessageAction : public KAction { Q_OBJECT + TQ_OBJECT public: - OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const TQString &text, const TQString &message, const TQIconSet &pix, TQObject *parent=0, const char *name=0); + OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const TQString &text, const TQString &message, const TQIconSet &pix, TQObject *tqparent=0, const char *name=0); signals: void activated( const Kopete::OnlineStatus& status, const TQString & ); private slots: diff --git a/kopete/protocols/groupwise/gwaddui.ui b/kopete/protocols/groupwise/gwaddui.ui index 97bdd3b4..4de7649d 100644 --- a/kopete/protocols/groupwise/gwaddui.ui +++ b/kopete/protocols/groupwise/gwaddui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>GroupWiseAddUI</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>GroupWiseAddUI</cstring> </property> @@ -22,15 +22,15 @@ <property name="spacing"> <number>0</number> </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>textLabel1</cstring> </property> @@ -47,7 +47,7 @@ <string>The account name of the account you would like to add.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_uniqueName</cstring> </property> @@ -60,7 +60,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -71,7 +71,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_rbEcho</cstring> </property> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>100</height> @@ -109,5 +109,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/gwbytestream.cpp b/kopete/protocols/groupwise/gwbytestream.cpp index e3c71483..5bd048cd 100644 --- a/kopete/protocols/groupwise/gwbytestream.cpp +++ b/kopete/protocols/groupwise/gwbytestream.cpp @@ -25,8 +25,8 @@ #include "gwbytestream.h" #include "gwerror.h" -KNetworkByteStream::KNetworkByteStream ( TQObject *parent, const char */*name*/ ) - : ByteStream ( parent ) +KNetworkByteStream::KNetworkByteStream ( TQObject *tqparent, const char */*name*/ ) + : ByteStream ( tqparent ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "Instantiating new KNetwork byte stream." << endl; @@ -113,7 +113,7 @@ void KNetworkByteStream::slotConnectionClosed () if ( mClosing ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << "..by ourselves!" << endl; - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "socket error is \"" << socket()->errorString( socket()->error() ) << "\"" << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "socket error is \"" << socket()->KSocketBase::errorString( socket()->error() ) << "\"" << endl; emit connectionClosed (); } else diff --git a/kopete/protocols/groupwise/gwbytestream.h b/kopete/protocols/groupwise/gwbytestream.h index 0cd95f77..457d9593 100644 --- a/kopete/protocols/groupwise/gwbytestream.h +++ b/kopete/protocols/groupwise/gwbytestream.h @@ -35,9 +35,10 @@ class KNetworkByteStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: - KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 ); + KNetworkByteStream ( TQObject *tqparent = 0, const char *name = 0 ); ~KNetworkByteStream (); diff --git a/kopete/protocols/groupwise/gwconnector.cpp b/kopete/protocols/groupwise/gwconnector.cpp index 946116b6..b353a6a2 100644 --- a/kopete/protocols/groupwise/gwconnector.cpp +++ b/kopete/protocols/groupwise/gwconnector.cpp @@ -25,8 +25,8 @@ #include "gwerror.h" #include "gwbytestream.h" -KNetworkConnector::KNetworkConnector ( TQObject *parent, const char */*name*/ ) - : Connector ( parent ) +KNetworkConnector::KNetworkConnector ( TQObject *tqparent, const char */*name*/ ) + : Connector ( tqparent ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "New KNetwork connector." << endl; @@ -109,7 +109,7 @@ void KNetworkConnector::done () mByteStream->close (); } -void KNetworkConnector::setOptHostPort ( const TQString &host, Q_UINT16 port ) +void KNetworkConnector::setOptHostPort ( const TQString &host, TQ_UINT16 port ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "Manually specifying host " << host << " and port " << port << endl; diff --git a/kopete/protocols/groupwise/gwconnector.h b/kopete/protocols/groupwise/gwconnector.h index bfd6c260..c582fc01 100644 --- a/kopete/protocols/groupwise/gwconnector.h +++ b/kopete/protocols/groupwise/gwconnector.h @@ -35,9 +35,10 @@ class KNetworkConnector : public Connector { Q_OBJECT + TQ_OBJECT public: - KNetworkConnector ( TQObject *parent = 0, const char *name = 0 ); + KNetworkConnector ( TQObject *tqparent = 0, const char *name = 0 ); virtual ~KNetworkConnector (); @@ -45,7 +46,7 @@ public: virtual ByteStream *stream () const; virtual void done (); - void setOptHostPort ( const TQString &host, Q_UINT16 port ); + void setOptHostPort ( const TQString &host, TQ_UINT16 port ); void setOptSSL ( bool ); int errorCode (); @@ -56,7 +57,7 @@ private slots: private: TQString mHost; - Q_UINT16 mPort; + TQ_UINT16 mPort; int mErrorCode; KNetworkByteStream *mByteStream; diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index d15c76b9..dd74fc67 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -47,18 +47,18 @@ using namespace GroupWise; GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn, - Kopete::MetaContact *parent, - const int objectId, const int parentId, const int sequence ) -: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), parent ), m_objectId( objectId ), m_parentId( parentId ), + Kopete::MetaContact *tqparent, + const int objectId, const int tqparentId, const int sequence ) +: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( tqparentId ), m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false ) { - if ( dn.find( '=' ) != -1 ) + if ( dn.tqfind( '=' ) != -1 ) { m_dn = dn; } connect( static_cast< GroupWiseAccount *>( account ), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ), TQT_SLOT( receivePrivacyChanged( const TQString &, bool ) ) ); - setOnlineStatus( ( parent && parent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline ); + setOnlineStatus( ( tqparent && tqparent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline ); } GroupWiseContact::~GroupWiseContact() @@ -96,17 +96,17 @@ void GroupWiseContact::updateDetails( const ContactDetails & details ) TQMap<TQString, TQString>::Iterator it; // work phone number - if ( ( it = m_serverProperties.find( "telephoneNumber" ) ) + if ( ( it = m_serverProperties.tqfind( "telephoneNumber" ) ) != m_serverProperties.end() ) setProperty( protocol()->propPhoneWork, it.data() ); // mobile phone number - if ( ( it = m_serverProperties.find( "mobile" ) ) + if ( ( it = m_serverProperties.tqfind( "mobile" ) ) != m_serverProperties.end() ) setProperty( protocol()->propPhoneMobile, it.data() ); // email - if ( ( it = m_serverProperties.find( "Internet EMail Address" ) ) + if ( ( it = m_serverProperties.tqfind( "Internet EMail Address" ) ) != m_serverProperties.end() ) setProperty( protocol()->propEmail, it.data() ); @@ -134,9 +134,9 @@ bool GroupWiseContact::isReachable() // in GWChatSession // (This is a GroupWise rule, not a problem in Kopete) - if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlineStatus() != protocol()->groupwiseAppearOffline */) + if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlinetqStatus() != protocol()->groupwiseAppearOffline */) return true; - if ( !account()->isConnected()/* || account()->myself()->onlineStatus() == protocol()->groupwiseAppearOffline*/ ) + if ( !account()->isConnected()/* || account()->myself()->onlinetqStatus() == protocol()->groupwiseAppearOffline*/ ) return false; // fallback, something went wrong @@ -155,7 +155,7 @@ Kopete::ChatSession * GroupWiseContact::manager( Kopete::Contact::CanCreateFlags Kopete::ContactPtrList chatMembers; chatMembers.append( this ); - return account()->chatSession( chatMembers, TQString::null, canCreate ); + return account()->chatSession( chatMembers, TQString(), canCreate ); } TQPtrList<KAction> *GroupWiseContact::customContextMenuActions() @@ -222,22 +222,22 @@ void GroupWiseContact::receivePrivacyChanged( const TQString & dn, bool allow ) { Q_UNUSED( allow ); if ( dn == m_dn ) // set the online status back to itself. this will set the blocking state - setOnlineStatus( this->onlineStatus() ); + setOnlineStatus( this->onlinetqStatus() ); } void GroupWiseContact::setOnlineStatus( const Kopete::OnlineStatus& status ) { setMessageReceivedOffline( false ); - if ( status == protocol()->groupwiseAwayIdle && status != onlineStatus() ) + if ( status == protocol()->groupwiseAwayIdle && status != onlinetqStatus() ) setIdleTime( 1 ); - else if ( onlineStatus() == protocol()->groupwiseAwayIdle && status != onlineStatus() ) + else if ( onlinetqStatus() == protocol()->groupwiseAwayIdle && status != onlinetqStatus() ) setIdleTime( 0 ); if ( account()->isContactBlocked( m_dn ) && status.internalStatus() < 15 ) { Kopete::Contact::setOnlineStatus(Kopete::OnlineStatus(status.status() , (status.weight()==0) ? 0 : (status.weight() -1) , - protocol() , status.internalStatus()+15 , TQString::fromLatin1("msn_blocked"), - i18n("%1|Blocked").arg( status.description() ) ) ); + protocol() , status.internalStatus()+15 , TQString::tqfromLatin1("msn_blocked"), + i18n("%1|Blocked").tqarg( status.description() ) ) ); } else { diff --git a/kopete/protocols/groupwise/gwcontact.h b/kopete/protocols/groupwise/gwcontact.h index 64486e75..183df1a4 100644 --- a/kopete/protocols/groupwise/gwcontact.h +++ b/kopete/protocols/groupwise/gwcontact.h @@ -53,19 +53,20 @@ using namespace GroupWise; class GroupWiseContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: /** * Constructor * @param account The GroupWiseAccount this belongs to. * @param uniqueName The userId for this contact. May be a DN, in which case it will be converted to dotted format for the contactId and stored. - * @param parent The Kopete::MetaContact this contact is part of. + * @param tqparent The Kopete::MetaContact this contact is part of. * @param objectId The contact's numeric object ID. - * @param parentId The ID of this contact's parent (folder). - * @param sequence This contact's sequence number (The position it appears in within its parent). + * @param tqparentId The ID of this contact's tqparent (folder). + * @param sequence This contact's sequence number (The position it appears in within its tqparent). */ GroupWiseContact( Kopete::Account* account, const TQString &uniqueName, - Kopete::MetaContact *parent, - const int objectId, const int parentId, const int sequence ); + Kopete::MetaContact *tqparent, + const int objectId, const int tqparentId, const int sequence ); ~GroupWiseContact(); @@ -131,11 +132,11 @@ public: */ void setDeleting( bool deleting ); /** - * Marks this contact as having sent a message whilst apparently offline + * Marks this contact as having sent a message whilst aptqparently offline */ void setMessageReceivedOffline( bool on ); /** - * Has this contact sent a message whilst apparently offline? + * Has this contact sent a message whilst aptqparently offline? */ bool messageReceivedOffline() const; diff --git a/kopete/protocols/groupwise/gwcontactlist.cpp b/kopete/protocols/groupwise/gwcontactlist.cpp index 3f8b5c4d..03e66f45 100644 --- a/kopete/protocols/groupwise/gwcontactlist.cpp +++ b/kopete/protocols/groupwise/gwcontactlist.cpp @@ -22,8 +22,8 @@ #include "gwcontactlist.h" #include "gwerror.h" //debug area -GWContactList::GWContactList( TQObject * parent ) - : TQObject( parent ), rootFolder( new GWFolder( this, 0, 0, TQString::null ) ) +GWContactList::GWContactList( TQObject * tqparent ) + : TQObject( tqparent ), rootFolder( new GWFolder( this, 0, 0, TQString() ) ) { } GWFolder * GWContactList::addFolder( unsigned int id, unsigned int sequence, const TQString & displayName ) @@ -34,7 +34,7 @@ GWFolder * GWContactList::addFolder( unsigned int id, unsigned int sequence, con return 0; } -GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned int parent, unsigned int sequence, const TQString & displayName, const TQString & dn ) +GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned int tqparent, unsigned int sequence, const TQString & displayName, const TQString & dn ) { TQObjectList * l = queryList( "GWFolder", 0, false, true ); TQObjectListIt it( *l ); // iterate over the buttons @@ -42,8 +42,8 @@ GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned GWContactInstance * contact = 0; while ( (obj = it.current()) != 0 ) { - GWFolder * folder = ::qt_cast< GWFolder * >( obj ); - if ( folder && folder->id == parent ) + GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); + if ( folder && folder->id == tqparent ) { contact = new GWContactInstance( folder, id, sequence, displayName, dn ); break; @@ -62,7 +62,7 @@ GWFolder * GWContactList::findFolderById( unsigned int id ) GWFolder * candidate, * folder = 0; while ( (obj = it.current()) != 0 ) { - candidate = ::qt_cast< GWFolder * >( obj ); + candidate = ::tqqt_cast< GWFolder * >( obj ); if ( candidate->id == id ) { folder = candidate; @@ -82,7 +82,7 @@ GWFolder * GWContactList::findFolderByName( const TQString & displayName ) GWFolder * folder = 0; while ( (obj = it.current()) != 0 ) { - GWFolder * candidate = ::qt_cast< GWFolder * >( obj ); + GWFolder * candidate = ::tqqt_cast< GWFolder * >( obj ); if ( candidate->displayName == displayName ) { folder = candidate; @@ -102,8 +102,8 @@ int GWContactList::maxSequenceNumber() unsigned int sequence = 0; while ( (obj = it.current()) != 0 ) { - GWFolder * current = ::qt_cast< GWFolder * >( obj ); - sequence = QMAX( sequence, current->sequence ); + GWFolder * current = ::tqqt_cast< GWFolder * >( obj ); + sequence = TQMAX( sequence, current->sequence ); ++it; } delete l; @@ -119,7 +119,7 @@ GWContactInstanceList GWContactList::instancesWithDn( const TQString & dn ) while ( (obj = it.current()) != 0 ) { ++it; - GWContactInstance * current = ::qt_cast<GWContactInstance *>( obj ); + GWContactInstance * current = ::tqqt_cast<GWContactInstance *>( obj ); if ( current->dn == dn ) matches.append( current ); } @@ -141,7 +141,7 @@ void GWContactList::removeInstanceById( unsigned int id ) while ( (obj = it.current()) != 0 ) { ++it; - GWContactInstance * current = ::qt_cast<GWContactInstance *>( obj ); + GWContactInstance * current = ::tqqt_cast<GWContactInstance *>( obj ); if ( current->id == id ) { delete current; @@ -154,14 +154,14 @@ void GWContactList::removeInstanceById( unsigned int id ) void GWContactList::dump() { kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; - const TQObjectList * l = children(); - if ( l && !l->isEmpty() ) + const TQObjectList l = childrenListObject(); + if ( !l.isEmpty() ) { - TQObjectListIt it( *l ); // iterate over the buttons + TQObjectListIt it( l ); // iterate over the buttons TQObject *obj; while ( (obj = it.current()) != 0 ) { - GWFolder * folder = ::qt_cast< GWFolder * >( obj ); + GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); if ( folder ) folder->dump( 1 ); ++it; @@ -174,10 +174,10 @@ void GWContactList::dump() void GWContactList::clear() { kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; - const TQObjectList * l = children(); - if ( l && !l->isEmpty() ) + const TQObjectList l = childrenListObject(); + if ( !l.isEmpty() ) { - TQObjectListIt it( *l ); + TQObjectListIt it( l ); TQObject *obj; while ( (obj = it.current()) != 0 ) { @@ -187,33 +187,33 @@ void GWContactList::clear() } } -GWContactListItem::GWContactListItem( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : - TQObject( parent), id( theId ), sequence( theSequence ), displayName( theDisplayName ) +GWContactListItem::GWContactListItem( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : + TQObject( tqparent), id( theId ), sequence( theSequence ), displayName( theDisplayName ) { } -GWFolder::GWFolder( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : - GWContactListItem( parent, theId, theSequence, theDisplayName ) +GWFolder::GWFolder( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : + GWContactListItem( tqparent, theId, theSequence, theDisplayName ) { } void GWFolder::dump( unsigned int depth ) { TQString s; s.fill( ' ', ++depth * 2 ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s <<"Folder " << displayName << " id: " << id << " contains: " << endl; - const TQObjectList * l = children(); - if ( l ) + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s <<"Folder " << displayName << " id: " << id << " tqcontains: " << endl; + const TQObjectList l = childrenListObject(); + if ( !l.isEmpty() ) { - TQObjectListIt it( *l ); // iterate over the buttons + TQObjectListIt it( l ); // iterate over the buttons TQObject *obj; while ( (obj = it.current()) != 0 ) { ++it; - GWContactInstance * instance = ::qt_cast< GWContactInstance * >( obj ); + GWContactInstance * instance = ::tqqt_cast< GWContactInstance * >( obj ); if (instance) instance->dump( depth ); else { - GWFolder * folder = ::qt_cast< GWFolder * >( obj ); + GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); if ( folder ) folder->dump( depth ); } @@ -223,8 +223,8 @@ void GWFolder::dump( unsigned int depth ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s << " no contacts." << endl; } -GWContactInstance::GWContactInstance( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ) : - GWContactListItem( parent, theId, theSequence, theDisplayName ), dn( theDn ) +GWContactInstance::GWContactInstance( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ) : + GWContactListItem( tqparent, theId, theSequence, theDisplayName ), dn( theDn ) { } void GWContactInstance::dump( unsigned int depth ) diff --git a/kopete/protocols/groupwise/gwcontactlist.h b/kopete/protocols/groupwise/gwcontactlist.h index 613e1b3f..e6f2dcac 100644 --- a/kopete/protocols/groupwise/gwcontactlist.h +++ b/kopete/protocols/groupwise/gwcontactlist.h @@ -39,13 +39,14 @@ typedef TQValueList<GWContactInstance *> GWContactInstanceList; * different clients. * The list is volatile - it is not stored in stable storage, but is purged on disconnect and recreated at login. */ -class GWContactList : public QObject +class GWContactList : public TQObject { Q_OBJECT + TQ_OBJECT public: - GWContactList( TQObject * parent ); + GWContactList( TQObject * tqparent ); GWFolder * addFolder( unsigned int id, unsigned int sequence, const TQString & displayName ); - GWContactInstance * addContactInstance( unsigned int id, unsigned int parent, unsigned int sequence, const TQString & displayName, const TQString & dn ); + GWContactInstance * addContactInstance( unsigned int id, unsigned int tqparent, unsigned int sequence, const TQString & displayName, const TQString & dn ); GWFolder * findFolderById( unsigned int id ); GWFolder * findFolderByName( const TQString & name ); GWContactInstanceList instancesWithDn( const TQString & dn ); @@ -57,11 +58,12 @@ public: GWFolder * rootFolder; }; -class GWContactListItem : public QObject +class GWContactListItem : public TQObject { Q_OBJECT + TQ_OBJECT public: - GWContactListItem( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); + GWContactListItem( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); unsigned int id; // OBJECT_ID unsigned int sequence; // SEQUENCE_NUMBER @@ -71,16 +73,18 @@ public: class GWFolder : public GWContactListItem { Q_OBJECT + TQ_OBJECT public: - GWFolder( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); + GWFolder( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); virtual void dump( unsigned int depth ); }; class GWContactInstance : public GWContactListItem { Q_OBJECT + TQ_OBJECT public: - GWContactInstance( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ); + GWContactInstance( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ); TQString dn; // DN virtual void dump( unsigned int depth ); }; diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index 7a792486..c45371b9 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -65,10 +65,10 @@ GroupWiseChatSession::GroupWiseChatSession(const Kopete::Contact* user, Kopete:: m_actionInvite = new KActionMenu( i18n( "&Invite" ), actionCollection() , "gwInvite" ); connect( m_actionInvite->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT(slotActionInviteAboutToShow() ) ) ; - m_secure = new KAction( i18n( "Security Status" ), "encrypted", KShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); + m_secure = new KAction( i18n( "Security tqStatus" ), "encrypted", KShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); m_secure->setToolTip( i18n( "Conversation is secure" ) ); - m_logging = new KAction( i18n( "Archiving Status" ), "logchat", KShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); + m_logging = new KAction( i18n( "Archiving tqStatus" ), "logchat", KShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); updateArchiving(); setXMLFile("gwchatui.rc"); @@ -116,7 +116,7 @@ bool GroupWiseChatSession::secure() void GroupWiseChatSession::setClosed() { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " Conference " << m_guid << " is now Closed " << endl; - m_guid = TQString::null; + m_guid = TQString(); m_flags = m_flags | GroupWise::Closed; } @@ -196,7 +196,7 @@ void GroupWiseChatSession::slotCreationFailed( const int failedId, const int sta { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " couldn't start a chat, no GUID.\n" << endl; //emit creationFailed(); - Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").arg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText); + Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").tqarg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText); appendMessage( failureNotify ); setClosed(); } @@ -206,7 +206,7 @@ void GroupWiseChatSession::slotSendTypingNotification( bool typing ) { // only send a notification if we've got a conference going and we are not Appear Offline if ( !m_guid.isEmpty() && m_memberCount && - ( account()->myself()->onlineStatus() != GroupWiseProtocol::protocol()->groupwiseAppearOffline ) ) + ( account()->myself()->onlinetqStatus() != GroupWiseProtocol::protocol()->groupwiseAppearOffline ) ) account()->client()->sendTyping( guid(), typing ); } @@ -221,7 +221,7 @@ void GroupWiseChatSession::slotMessageSent( Kopete::Message & message, Kopete::C appendMessage( failureNotify ); messageSucceeded(); } - else*/ if ( account()->myself()->onlineStatus() == ( static_cast<GroupWiseProtocol *>( protocol() ) )->groupwiseAppearOffline ) + else*/ if ( account()->myself()->onlinetqStatus() == ( static_cast<GroupWiseProtocol *>( protocol() ) )->groupwiseAppearOffline ) { Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("Your message could not be sent. You cannot send messages while your status is Appear Offline. "), Kopete::Message::Internal, Kopete::Message::PlainText); appendMessage( failureNotify ); @@ -307,7 +307,7 @@ void GroupWiseChatSession::slotActionInviteAboutToShow() TQDictIterator<Kopete::Contact> it( account()->contacts() ); for( ; it.current(); ++it ) { - if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) + if( !members().tqcontains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { KAction *a=new KopeteContactAction( it.current(), this, TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); @@ -330,7 +330,7 @@ void GroupWiseChatSession::slotInviteContact( Kopete::Contact * contact ) } else { - TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; + TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L; bool ok; TQRegExp rx( ".*" ); @@ -358,7 +358,7 @@ void GroupWiseChatSession::slotInviteOtherContact() if ( !m_searchDlg ) { // show search dialog - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : Kopete::UI::Global::mainWidget() ); m_searchDlg = new KDialogBase( w, "invitesearchdialog", false, i18n( "Search for Contact to Invite" ), KDialogBase::Ok|KDialogBase::Cancel ); m_search = new GroupWiseContactSearch( account(), TQListView::Single, true, m_searchDlg, "invitesearchwidget" ); @@ -375,7 +375,7 @@ void GroupWiseChatSession::slotSearchedForUsers() TQValueList< ContactDetails > selected = m_search->selectedResults(); if ( selected.count() ) { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : Kopete::UI::Global::mainWidget() ); ContactDetails cd = selected.first(); bool ok; @@ -399,7 +399,7 @@ void GroupWiseChatSession::addInvitee( const Kopete::Contact * c ) Kopete::MetaContact * inviteeMC = new Kopete::MetaContact(); inviteeMC->setDisplayName( c->metaContact()->displayName() + pending ); GroupWiseContact * invitee = new GroupWiseContact( account(), c->contactId() + " " + pending, inviteeMC, 0, 0, 0 ); - invitee->setOnlineStatus( c->onlineStatus() ); + invitee->setOnlineStatus( c->onlinetqStatus() ); // TODO: we could set all the placeholder's properties etc here too addContact( invitee, true ); m_invitees.append( invitee ); @@ -417,7 +417,7 @@ void GroupWiseChatSession::joined( GroupWiseContact * c ) { if ( pending->contactId().startsWith( c->contactId() ) ) { - removeContact( pending, TQString::null, Kopete::Message::PlainText, true ); + removeContact( pending, TQString(), Kopete::Message::PlainText, true ); break; } } @@ -459,7 +459,7 @@ void GroupWiseChatSession::inviteDeclined( GroupWiseContact * c ) { if ( pending->contactId().startsWith( c->contactId() ) ) { - removeContact( pending, TQString::null, Kopete::Message::PlainText, true ); + removeContact( pending, TQString(), Kopete::Message::PlainText, true ); break; } } @@ -468,7 +468,7 @@ void GroupWiseChatSession::inviteDeclined( GroupWiseContact * c ) TQString from = c->metaContact()->displayName(); Kopete::Message declined = Kopete::Message( myself(), members(), - i18n("%1 has rejected an invitation to join this conversation.").arg( from ), + i18n("%1 has rejected an invitation to join this conversation.").tqarg( from ), Kopete::Message::Internal, Kopete::Message::PlainText ); appendMessage( declined ); } @@ -501,16 +501,16 @@ void GroupWiseChatSession::updateArchiving() void GroupWiseChatSession::slotShowSecurity() { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : Kopete::UI::Global::mainWidget() ); - KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security Status" ) ); + KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security tqStatus" ) ); } void GroupWiseChatSession::slotShowArchiving() { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : Kopete::UI::Global::mainWidget() ); - KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving Status" ) ); + KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving tqStatus" ) ); } #include "gwmessagemanager.moc" diff --git a/kopete/protocols/groupwise/gwmessagemanager.h b/kopete/protocols/groupwise/gwmessagemanager.h index d3bd863b..7c0d3d2c 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.h +++ b/kopete/protocols/groupwise/gwmessagemanager.h @@ -35,6 +35,7 @@ using namespace GroupWise; class GroupWiseChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT friend class GroupWiseAccount; diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 6eb489a2..176a4b92 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -41,12 +41,12 @@ K_EXPORT_COMPONENT_FACTORY( kopete_groupwise, GroupWiseProtocolFactory( "kopete_ GroupWiseProtocol *GroupWiseProtocol::s_protocol = 0L; -GroupWiseProtocol::GroupWiseProtocol( TQObject* parent, const char *name, const TQStringList &/*args*/ ) - : Kopete::Protocol( GroupWiseProtocolFactory::instance(), parent, name ), +GroupWiseProtocol::GroupWiseProtocol( TQObject* tqparent, const char *name, const TQStringList &/*args*/ ) + : Kopete::Protocol( GroupWiseProtocolFactory::instance(), tqparent, name ), /* initialise Kopete::OnlineStatus that should be user selectable in the user interface */ - groupwiseOffline ( Kopete::OnlineStatus::Offline, 0, this, GroupWise::Offline, TQString::null, + groupwiseOffline ( Kopete::OnlineStatus::Offline, 0, this, GroupWise::Offline, TQString(), i18n( "Offline" ), i18n( "O&ffline" ), Kopete::OnlineStatusManager::Offline ), - groupwiseAvailable ( Kopete::OnlineStatus::Online, 25, this, GroupWise::Available, TQString::null, + groupwiseAvailable ( Kopete::OnlineStatus::Online, 25, this, GroupWise::Available, TQString(), i18n( "Online" ), i18n( "&Online" ), Kopete::OnlineStatusManager::Online ), groupwiseBusy ( Kopete::OnlineStatus::Away, 18, this, GroupWise::Busy, "contact_busy_overlay", i18n( "Busy" ), i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), @@ -61,15 +61,15 @@ GroupWiseProtocol::GroupWiseProtocol( TQObject* parent, const char *name, const groupwiseUnknown ( Kopete::OnlineStatus::Unknown, 25, this, GroupWise::Unknown, "status_unknown", i18n( "Unknown" ) ), groupwiseInvalid ( Kopete::OnlineStatus::Unknown, 25, this, GroupWise::Invalid, "status_unknown", - i18n( "Invalid Status" ) ), + i18n( "Invalid tqStatus" ) ), groupwiseConnecting ( Kopete::OnlineStatus::Connecting, 25, this, 99, "groupwise_connecting", i18n( "Connecting" ) ), propGivenName( Kopete::Global::Properties::self()->firstName() ), propLastName( Kopete::Global::Properties::self()->lastName() ), propFullName( Kopete::Global::Properties::self()->fullName() ), propAwayMessage( Kopete::Global::Properties::self()->awayMessage() ), - propAutoReply( "groupwiseAutoReply", i18n( "Auto Reply Message" ), TQString::null, false, false ), - propCN( "groupwiseCommonName", i18n( "Common Name" ), TQString::null, true, false ), + propAutoReply( "groupwiseAutoReply", i18n( "Auto Reply Message" ), TQString(), false, false ), + propCN( "groupwiseCommonName", i18n( "Common Name" ), TQString(), true, false ), propPhoneWork( Kopete::Global::Properties::self()->workPhone() ), propPhoneMobile( Kopete::Global::Properties::self()->privateMobilePhone() ), propEmail( Kopete::Global::Properties::self()->emailAddress() ) @@ -94,7 +94,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( TQString accountId = serializedData[ "accountId" ]; TQString displayName = serializedData[ "displayName" ]; int objectId = serializedData[ "objectId" ].toInt(); - int parentId = serializedData[ "parentId" ].toInt(); + int tqparentId = serializedData[ "tqparentId" ].toInt(); int sequence = serializedData[ "sequenceNumber" ].toInt(); TQDict<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts( this ); @@ -107,19 +107,19 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( } // FIXME: creating a contact with a userId here - return new GroupWiseContact(account, dn, metaContact, objectId, parentId, sequence ); + return new GroupWiseContact(account, dn, metaContact, objectId, tqparentId, sequence ); } -AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *parent, Kopete::Account * account ) +AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * account ) { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Creating Add Contact Page" << endl; - return new GroupWiseAddContactPage( account, parent, "addcontactpage"); + return new GroupWiseAddContactPage( account, tqparent, "addcontactpage"); } -KopeteEditAccountWidget * GroupWiseProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent ) +KopeteEditAccountWidget * GroupWiseProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ) { kdDebug(GROUPWISE_DEBUG_GLOBAL) << "Creating Edit Account Page" << endl; - return new GroupWiseEditAccountWidget( parent, account ); + return new GroupWiseEditAccountWidget( tqparent, account ); } Kopete::Account *GroupWiseProtocol::createNewAccount( const TQString &accountId ) @@ -173,7 +173,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) // of multi-byte UTF-8 characters 2 to 6 bytes long (with first byte > 0x7f), these are recoded as 32 bit values, escaped as \u<val>? strings // vanilla RTF "envelope" that doesn't say much but causes other clients to accept the message - TQString rtfTemplate = TQString::fromLatin1("{\\rtf1\\ansi\n" + TQString rtfTemplate = TQString::tqfromLatin1("{\\rtf1\\ansi\n" "{\\fonttbl{\\f0\\fnil Unknown;}}\n" "{\\colortbl ;\\red0\\green0\\blue0;}\n" "\\uc1\\cf1\\f0\\fs18 %1\\par\n}"); @@ -182,7 +182,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) uint index = 0; // current char to transcode while ( index < plainUtf8.length() ) { - Q_UINT8 current = plainUtf8.data()[ index ]; + TQ_UINT8 current = plainUtf8.data()[ index ]; if ( current <= 0x7F ) { switch ( current ) @@ -190,7 +190,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) case '{': case '}': case '\\': - outputText.append( TQString( "\\%1" ).arg( TQChar( current ) ) ); + outputText.append( TQString( "\\%1" ).tqarg( TQChar( current ) ) ); break; case '\n': outputText.append( "\\par " ); @@ -203,7 +203,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) } else { - Q_UINT32 ucs4Char; + TQ_UINT32 ucs4Char; int bytesEncoded; TQString escapedUnicodeChar; if ( current <= 0xDF ) @@ -253,18 +253,18 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) bytesEncoded = 1; } index += bytesEncoded; - escapedUnicodeChar = TQString("\\u%1?").arg( ucs4Char ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "unicode escaped char: " << escapedUnicodeChar << endl; + escapedUnicodeChar = TQString("\\u%1?").tqarg( ucs4Char ); + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "tqunicode escaped char: " << escapedUnicodeChar << endl; outputText.append( escapedUnicodeChar ); } } - return rtfTemplate.arg( outputText ); + return rtfTemplate.tqarg( outputText ); } TQString GroupWiseProtocol::dnToDotted( const TQString & dn ) { TQRegExp rx("[a-zA-Z]*=(.*)$", false ); - if( !dn.find( '=' ) ) // if it's not a DN, return it unprocessed + if( !dn.tqfind( '=' ) ) // if it's not a DN, return it unprocessed return dn; // split the dn into elements diff --git a/kopete/protocols/groupwise/gwprotocol.h b/kopete/protocols/groupwise/gwprotocol.h index f0c439f1..001d6f96 100644 --- a/kopete/protocols/groupwise/gwprotocol.h +++ b/kopete/protocols/groupwise/gwprotocol.h @@ -34,8 +34,9 @@ class GroupWiseProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - GroupWiseProtocol(TQObject *parent, const char *name, const TQStringList &args); + GroupWiseProtocol(TQObject *tqparent, const char *name, const TQStringList &args); ~GroupWiseProtocol(); /** * Convert the serialised data back into a GroupWiseContact and add this @@ -49,11 +50,11 @@ public: /** * Generate the widget needed to add GroupWiseContacts */ - virtual AddContactPage * createAddContactWidget( TQWidget *parent, Kopete::Account *account ); + virtual AddContactPage * createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); /** * Generate the widget needed to add/edit accounts for this protocol */ - virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); + virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); /** * Generate a GroupWiseAccount */ diff --git a/kopete/protocols/groupwise/libgroupwise/Makefile.am b/kopete/protocols/groupwise/libgroupwise/Makefile.am index 2df23a01..bf57f0e3 100644 --- a/kopete/protocols/groupwise/libgroupwise/Makefile.am +++ b/kopete/protocols/groupwise/libgroupwise/Makefile.am @@ -26,7 +26,7 @@ libgroupwise_la_SOURCES = bytestream.cpp chatroommanager.cpp client.cpp \ safedelete.cpp securestream.cpp stream.cpp task.cpp tlshandler.cpp transfer.cpp \ transferbase.cpp userdetailsmanager.cpp usertransfer.cpp libgroupwise_la_LDFLAGS = -no-undefined $(all_libraries) -libgroupwise_la_LIBADD = tasks/libgroupwise_tasks.la -lqt-mt qca/src/libqca.la +libgroupwise_la_LIBADD = tasks/libgroupwise_tasks.la qca/src/libqca.la tests_COMPILE_FIRST = libgroupwise.la libgwtest.la @@ -37,4 +37,4 @@ libgwtest_la_SOURCES = coreprotocol.cpp eventtransfer.cpp \ bytestream.cpp libgwtest_la_LDFLAGS = $(all_libraries) -no-undefined libgwtest_la_LIBADD = qca/src/libqca.la \ - $(top_builddir)/kopete/protocols/groupwise/libgroupwise/tasks/libgroupwise_tasks.la -lqt-mt + $(top_builddir)/kopete/protocols/groupwise/libgroupwise/tasks/libgroupwise_tasks.la diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp index 0b20c050..35ef278e 100644 --- a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/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/groupwise/libgroupwise/bytestream.h b/kopete/protocols/groupwise/libgroupwise/bytestream.h index f10b46a1..5706fff6 100644 --- a/kopete/protocols/groupwise/libgroupwise/bytestream.h +++ b/kopete/protocols/groupwise/libgroupwise/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/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp index 3ee9b947..87333c41 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp @@ -28,8 +28,8 @@ #include "chatroommanager.h" -ChatroomManager::ChatroomManager( Client * parent, const char *name) - : TQObject(parent, name), m_client( parent ), m_replace( false ) +ChatroomManager::ChatroomManager( Client * tqparent, const char *name) + : TQObject(tqparent, name), m_client( tqparent ), m_tqreplace( false ) { } @@ -49,7 +49,7 @@ GroupWise::ChatroomMap ChatroomManager::rooms() void ChatroomManager::getChatrooms( bool refresh ) { - m_replace = !refresh; + m_tqreplace = !refresh; SearchChatTask * sct = new SearchChatTask( m_client->rootTask() ); sct->search( ( refresh ? SearchChatTask::SinceLastSearch : SearchChatTask::FetchAll ) ); connect( sct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatroomList() ) ); @@ -62,7 +62,7 @@ void ChatroomManager::slotGotChatroomList() SearchChatTask * sct = (SearchChatTask *)sender(); if ( sct ) { - if ( m_replace ) + if ( m_tqreplace ) m_rooms.clear(); TQValueList<ChatroomSearchResult> roomsFound = sct->results(); @@ -94,7 +94,7 @@ void ChatroomManager::slotGotChatCounts() const TQMap< TQString, int >::iterator end = newCounts.end(); for ( ; it != end; ++it ) - if ( m_rooms.contains( it.key() ) ) + if ( m_rooms.tqcontains( it.key() ) ) m_rooms[ it.key() ].participantsCount = it.data(); } emit updated(); @@ -102,7 +102,7 @@ void ChatroomManager::slotGotChatCounts() void ChatroomManager::requestProperties( const TQString & displayName ) { - if ( 0 /*m_rooms.contains( displayName ) */) + if ( 0 /*m_rooms.tqcontains( displayName ) */) emit gotProperties( m_rooms[ displayName ] ); else { diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h index 5fff7b73..60f55b01 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h @@ -29,9 +29,10 @@ class Client; * Keeps a record of the server side chatrooms * @author SUSE Linux Products GmbH */ -class ChatroomManager : public QObject +class ChatroomManager : public TQObject { Q_OBJECT + TQ_OBJECT public: ChatroomManager( Client * client, const char *name = 0); ~ChatroomManager(); @@ -60,7 +61,7 @@ class ChatroomManager : public QObject private: Client * m_client; GroupWise::ChatroomMap m_rooms; - bool m_replace; + bool m_tqreplace; }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index 1a88fbc3..c91f652d 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.cpp +++ b/kopete/protocols/groupwise/libgroupwise/client.cpp @@ -63,7 +63,7 @@ public: UserDetailsManager * userDetailsMgr; PrivacyManager * privacyMgr; uint protocolVersion; - TQValueList<GroupWise::CustomStatus> customStatuses; + TQValueList<GroupWise::CustomtqStatus> customStatuses; TQTimer * keepAliveTimer; }; @@ -103,7 +103,7 @@ void Client::connectToServer( ClientStream *s, const NovellDN &server, 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())); @@ -151,8 +151,8 @@ void Client::start( const TQString &host, const uint port, const TQString &userI connect( login, TQT_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ), privacyManager(), TQT_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) ); - connect( login, TQT_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ), - TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) ); + connect( login, TQT_SIGNAL( gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ), + TQT_SLOT( lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ) ); connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) ); @@ -185,7 +185,7 @@ int Client::port() return d->port; } -TQValueList<GroupWise::CustomStatus> Client::customStatuses() +TQValueList<GroupWise::CustomtqStatus> Client::customStatuses() { return d->customStatuses; } @@ -194,7 +194,7 @@ void Client::initialiseEventTasks() { // The StatusTask handles incoming status changes StatusTask * st = new StatusTask( d->root ); // FIXME - add an additional EventRoot? - connect( st, TQT_SIGNAL( gotStatus( const TQString &, Q_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, Q_UINT16, const TQString & ) ) ); + connect( st, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); // The ConferenceTask handles incoming conference events, messages, joins, leaves, etc ConferenceTask * ct = new ConferenceTask( d->root ); connect( ct, TQT_SIGNAL( message( const ConferenceEvent & ) ), TQT_SLOT( ct_messageReceived( const ConferenceEvent & ) ) ); @@ -216,9 +216,9 @@ void Client::initialiseEventTasks() connect( cont, TQT_SIGNAL( connectedElsewhere() ), TQT_SIGNAL( connectedElsewhere() ) ); } -void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ) +void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply ) { - debug( TQString("Setting status to %1").arg( status ) );; + debug( TQString("Setting status to %1").tqarg( status ) );; SetStatusTask * sst = new SetStatusTask( d->root ); sst->status( status, reason, autoReply ); connect( sst, TQT_SIGNAL( finished() ), this, TQT_SLOT( sst_statusChanged() ) ); @@ -226,11 +226,11 @@ void Client::setStatus( GroupWise::Status status, const TQString & reason, const // TODO: set status change in progress flag } -void Client::requestStatus( const TQString & userDN ) +void Client::requesttqStatus( const TQString & userDN ) { GetStatusTask * gst = new GetStatusTask( d->root ); gst->userDN( userDN ); - connect( gst, TQT_SIGNAL( gotStatus( const TQString &, Q_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, Q_UINT16, const TQString & ) ) ); + connect( gst, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); gst->go( true ); } @@ -306,7 +306,7 @@ void Client::sendInvitation( const GroupWise::ConferenceGuid & guid, const TQStr // SLOTS // void Client::streamError( int error ) { - debug( TQString( "CLIENT ERROR (Error %1)" ).arg( error ) ); + debug( TQString( "CLIENT ERROR (Error %1)" ).tqarg( error ) ); } void Client::streamReadyRead() @@ -326,7 +326,7 @@ void Client::lt_loginFinished() debug( "Client::lt_loginFinished() LOGIN SUCCEEDED" ); // set our initial status SetStatusTask * sst = new SetStatusTask( d->root ); - sst->status( GroupWise::Available, TQString::null, TQString::null ); + sst->status( GroupWise::Available, TQString(), TQString() ); sst->go( true ); emit loggedIn(); // fetch details for any privacy list items that aren't in our contact list. @@ -348,7 +348,7 @@ void Client::sst_statusChanged() const SetStatusTask * sst = (SetStatusTask *)sender(); if ( sst->success() ) { - emit ourStatusChanged( sst->requestedStatus(), sst->awayMessage(), sst->autoReply() ); + emit ourStatusChanged( sst->requestedtqStatus(), sst->awayMessage(), sst->autoReply() ); } } @@ -365,10 +365,10 @@ void Client::ct_messageReceived( const ConferenceEvent & messageEvent ) // we can drop these once the server reenables the sending of unformatted text // redundant linebreak at the end of the message TQRegExp rx(" </span> </span> </span><br>$"); - transformedEvent.message.replace( rx, "</span></span></span>" ); + transformedEvent.message.tqreplace( rx, "</span></span></span>" ); // missing linebreak after first line of an encrypted message TQRegExp ry("-----BEGIN PGP MESSAGE----- </span> </span> </span>"); - transformedEvent.message.replace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" ); + transformedEvent.message.tqreplace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" ); emit messageReceived( transformedEvent ); } @@ -390,19 +390,19 @@ void Client::jct_joinConfCompleted() { const JoinConferenceTask * jct = ( JoinConferenceTask * )sender(); #ifdef LIBGW_DEBUG - debug( TQString( "Joined conference %1, participants are: " ).arg( jct->guid() ) ); + debug( TQString( "Joined conference %1, participants are: " ).tqarg( jct->guid() ) ); TQStringList parts = jct->participants(); for ( TQStringList::Iterator it = parts.begin(); it != parts.end(); ++it ) - debug( TQString( " - %1" ).arg(*it) ); + debug( TQString( " - %1" ).tqarg(*it) ); debug( "invitees are: " ); TQStringList invitees = jct->invitees(); for ( TQStringList::Iterator it = invitees.begin(); it != invitees.end(); ++it ) - debug( TQString( " - %1" ).arg(*it) ); + debug( TQString( " - %1" ).tqarg(*it) ); #endif emit conferenceJoined( jct->guid(), jct->participants(), jct->invitees() ); } -void Client::lt_gotCustomStatus( const GroupWise::CustomStatus & custom ) +void Client::lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & custom ) { d->customStatuses.append( custom ); } @@ -431,7 +431,7 @@ TQString Client::password() TQString Client::userAgent() { - return TQString::fromLatin1( "%1/%2 (%3)" ).arg( d->clientName, d->clientVersion, d->osname ); + return TQString::tqfromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname ); } TQCString Client::ipAddress() @@ -457,7 +457,7 @@ void Client::send( Request * request ) return; } // TQString out = request.toString(); -// debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); +// debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); // xmlOutgoing(out); d->stream->write( request ); diff --git a/kopete/protocols/groupwise/libgroupwise/client.h b/kopete/protocols/groupwise/libgroupwise/client.h index 9cdb7c68..9d559bf3 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.h +++ b/kopete/protocols/groupwise/libgroupwise/client.h @@ -36,9 +36,10 @@ class Task; using namespace GroupWise; -class Client : public QObject +class Client : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -46,7 +47,7 @@ Q_OBJECT EXTERNAL API *************/ - Client( TQObject *parent = 0, uint protocolVersion = 2 ); + Client( TQObject *tqparent = 0, uint protocolVersion = 2 ); ~Client(); void setOSName( const TQString &name ); void setClientName( const TQString &s ); @@ -91,7 +92,7 @@ fd * @param password * @param reason custom status name for away statuses * @param autoReply auto reply message for use in this status */ - void setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ); + void settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply ); /** * Send a message @@ -117,7 +118,7 @@ fd * @param password /** * Request the status of a single user, for example, if they have messaged us and are not on our contact list */ - void requestStatus( const TQString & userDN ); + void requesttqStatus( const TQString & userDN ); /** * Add a contact to the contact list @@ -210,7 +211,7 @@ fd * @param password /** * Obtain the list of custom statuses stored on the server */ - TQValueList<GroupWise::CustomStatus> customStatuses(); + TQValueList<GroupWise::CustomtqStatus> customStatuses(); /** * Get a reference to the RequestFactory for this Client. @@ -276,11 +277,11 @@ fd * @param password /** * A remote contact changed status */ - void statusReceived( const TQString & contactId, Q_UINT16 status, const TQString & statusText ); + void statusReceived( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); /** * Our status changed on the server */ - void ourStatusChanged( GroupWise::Status status, const TQString & statusText, const TQString & autoReply ); + void ourStatusChanged( GroupWise::tqStatus status, const TQString & statusText, const TQString & autoReply ); /** CONFERENCE (MANAGEMENT) EVENTS */ /** @@ -370,7 +371,7 @@ fd * @param password /** * Receive a custom status during login and record it */ - void lt_gotCustomStatus( const GroupWise::CustomStatus & ); + void lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ); /** * Notify us of the keepalive period contained in the login response */ diff --git a/kopete/protocols/groupwise/libgroupwise/connector.cpp b/kopete/protocols/groupwise/libgroupwise/connector.cpp index 57e4d222..3b702d7a 100644 --- a/kopete/protocols/groupwise/libgroupwise/connector.cpp +++ b/kopete/protocols/groupwise/libgroupwise/connector.cpp @@ -20,8 +20,8 @@ #include "connector.h" -Connector::Connector(TQObject *parent) -:TQObject(parent) +Connector::Connector(TQObject *tqparent) +:TQObject(tqparent) { setUseSSL(false); setPeerAddressNone(); @@ -46,7 +46,7 @@ TQHostAddress Connector::peerAddress() const return addr; } -Q_UINT16 Connector::peerPort() const +TQ_UINT16 Connector::peerPort() const { return port; } @@ -63,7 +63,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; diff --git a/kopete/protocols/groupwise/libgroupwise/connector.h b/kopete/protocols/groupwise/libgroupwise/connector.h index b1c31743..d09d0a7f 100644 --- a/kopete/protocols/groupwise/libgroupwise/connector.h +++ b/kopete/protocols/groupwise/libgroupwise/connector.h @@ -26,11 +26,12 @@ class ByteStream; -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; @@ -40,7 +41,7 @@ public: bool useSSL() const; bool havePeerAddress() const; TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; signals: void connected(); @@ -49,13 +50,13 @@ signals: 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; }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp index 4c811eba..e48bf368 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp @@ -50,7 +50,7 @@ //#define GW_COREPROTOCOL_DEBUG -QCString +TQCString url_escape_string( const char *src) { uint escape = 0; @@ -142,7 +142,7 @@ void CoreProtocol::addIncomingData( const TQByteArray & incomingBytes ) while ( m_in.size() && ( parsedBytes = wireToTransfer( m_in ) ) ) { transferCount++; - debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).arg( transferCount ) ); + debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).tqarg( transferCount ) ); int size = m_in.size(); if ( parsedBytes < size ) { @@ -185,7 +185,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef LIBGW_DEBUG - CoreProtocol::debug( TQString( "contains: %1 bytes" ).arg( bytes.count() ) ); + CoreProtocol::debug( TQString( "tqcontains: %1 bytes" ).tqarg( bytes.count() ) ); for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -213,7 +213,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) 0, NMFIELD_TYPE_UTF8, request->transactionId() ); fields.append( fld ); - // convert to QByteArray + // convert to TQByteArray TQByteArray bytesOut; TQTextStream dout( bytesOut, IO_WriteOnly ); dout.setEncoding( TQTextStream::Latin1 ); @@ -226,7 +226,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) command = "login"; host = request->command().section( ':', 1, 1 ).ascii(); port = request->command().section( ':', 2, 2 ).ascii(); - debug( TQString( "Host: %1 Port: %2" ).arg( host.data() ).arg( port.data() ) ); + debug( TQString( "Host: %1 Port: %2" ).tqarg( host.data() ).tqarg( port.data() ) ); } else command = request->command().ascii(); @@ -246,7 +246,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) else dout << "\r\n"; - debug( TQString( "data out: %1" ).arg( bytesOut.data() ) ); + debug( TQString( "data out: %1" ).tqarg( bytesOut.data() ) ); emit outgoingData( bytesOut ); // now convert @@ -278,7 +278,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) continue; // GAIM writes these tags to the secure socket separately - if we can't connect, check here - // NM Protocol 1 writes them in an apparently arbitrary order + // NM Protocol 1 writes them in an aptqparently arbitrary order // tag //dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) ); //dout << field->tag(); @@ -286,7 +286,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) // method //dout.writeRawBytes( GW_URLVAR_METHOD, sizeof( GW_URLVAR_METHOD ) ); // char methodChar = encode_method( field->method() ); - //dout << (Q_UINT8)methodChar; + //dout << (TQ_UINT8)methodChar; // value //dout.writeRawBytes( GW_URLVAR_VAL, sizeof( GW_URLVAR_VAL ) ); @@ -300,7 +300,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) //debug( " - it's a single string" ); const Field::SingleField *sField = static_cast<const Field::SingleField*>( field ); // TQString encoded = KURL::encode_string( sField->value().toString(), 106 /* UTF-8 */); -// encoded.replace( "%20", "+" ); +// encoded.tqreplace( "%20", "+" ); // dout << encoded.ascii(); snprintf( valString, NMFIELD_MAX_STR_LENGTH, "%s", url_escape_string( sField->value().toString().utf8() ).data() ); @@ -337,7 +337,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) + GW_URLVAR_VAL + (const char *)valString + GW_URLVAR_TYPE + typeString; - debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).arg( outgoing.data() ) ); + debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).tqarg( outgoing.data() ) ); dout.writeRawBytes( outgoing.data(), outgoing.length() ); // write what we have so far, we may be calling this function recursively //kdDebug( 14999 ) << k_funcinfo << "writing \'" << bout << "\'" << endl; @@ -375,14 +375,14 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) m_din->setByteOrder( TQDataStream::LittleEndian ); // look at first four bytes and decide what to do with the chunk - Q_UINT32 val; + TQ_UINT32 val; if ( okToProceed() ) { *m_din >> val; // if is 'HTTP', it's a Response. PTTH it is after endian conversion - if ( !qstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) || - !qstrncmp( (const char *)&val, "PTTH", strlen( "PTTH" ) ) + if ( !tqstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) || + !tqstrncmp( (const char *)&val, "PTTH", strlen( "PTTH" ) ) ) { Transfer * t = m_responseProtocol->parse( wire, bytesParsed ); if ( t ) @@ -398,12 +398,12 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) } else // otherwise -> Event code { - debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).arg( val ).arg( wire.size() ) ); + debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).tqarg( val ).tqarg( wire.size() ) ); Transfer * t = m_eventProtocol->parse( wire, bytesParsed ); if ( t ) { m_inTransfer = t; - debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).arg( val ).arg( bytesParsed ) ); + debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).tqarg( val ).tqarg( bytesParsed ) ); m_state = Available; emit incomingData(); } @@ -423,7 +423,7 @@ void CoreProtocol::reset() m_in.resize( 0 ); } -TQChar CoreProtocol::encode_method( Q_UINT8 method ) +TQChar CoreProtocol::encode_method( TQ_UINT8 method ) { TQChar str; @@ -486,7 +486,7 @@ TQChar CoreProtocol::encode_method( Q_UINT8 method ) void CoreProtocol::slotOutgoingData( const TQCString &out ) { - debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).arg( out ) ); + debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).tqarg( out.data() ) ); } bool CoreProtocol::okToProceed() diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h index e9a14122..50ac0f65 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h @@ -108,13 +108,14 @@ class Transfer; * any of three ways - * ascii text, * latin1 as hexadecimal, - * escaped unicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the unicode value and the ? ) - * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is apparently ignored by the server + * escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? ) + * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is aptqparently ignored by the server * */ -class CoreProtocol : public QObject +class CoreProtocol : public TQObject { Q_OBJECT + TQ_OBJECT public: enum State { NeedMore, Available, NoData }; @@ -187,7 +188,7 @@ protected: /** * encodes a method number (usually supplied as a #defined symbol) to a char */ - TQChar encode_method( Q_UINT8 method ); + TQChar encode_method( TQ_UINT8 method ); private: TQByteArray m_in; // buffer containing unprocessed bytes we received TQDataStream* m_din; // contains the packet currently being parsed diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp index da8025b7..d779564a 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp @@ -25,8 +25,8 @@ using namespace GroupWise; -EventProtocol::EventProtocol(TQObject *parent, const char *name) - : InputProtocolBase(parent, name) +EventProtocol::EventProtocol(TQObject *tqparent, const char *name) + : InputProtocolBase(tqparent, name) { } @@ -42,7 +42,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) inBuf.open( IO_ReadOnly); m_din.setDevice( &inBuf ); m_din.setByteOrder( TQDataStream::LittleEndian ); - Q_UINT32 type; + TQ_UINT32 type; if ( !okToProceed() ) { @@ -51,12 +51,12 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) } // read the event type m_din >> type; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); - debug( TQString( "EventProtocol::parse() Reading event of type %1" ).arg( type ) ); + debug( TQString( "EventProtocol::parse() Reading event of type %1" ).tqarg( type ) ); if ( type > Stop ) { - debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).arg( type ) ); + debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).tqarg( type ) ); m_state = OutOfSync; return 0; } @@ -71,14 +71,14 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) // now create an event object //HACK: lowercased DN - EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::currentDateTime() ); + EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::tqcurrentDateTime() ); // add any additional data depending on the type of event // Note: if there are any errors in the way the data is read below, we will soon be OutOfSync TQString statusText; TQString guid; - Q_UINT16 status; - Q_UINT32 flags; + TQ_UINT16 status; + TQ_UINT32 flags; TQString message; switch ( type ) @@ -90,15 +90,15 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) return 0; } m_din >> status; - m_bytes += sizeof( Q_UINT16 ); + m_bytes += sizeof( TQ_UINT16 ); if ( !readString( statusText ) ) { m_din.unsetDevice(); return 0; } - debug( TQString( "got status: %1").arg( status ) ); - tentative->setStatus( status ); - debug( TQString( "tentative status: %1").arg( tentative->status() ) ); + debug( TQString( "got status: %1").tqarg( status ) ); + tentative->settqStatus( status ); + debug( TQString( "tentative status: %1").tqarg( tentative->status() ) ); tentative->setStatusText( statusText ); break; case ConferenceJoined: // 106 - GUID + FLAGS @@ -116,7 +116,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) } tentative->setFlags( flags ); break; - case UndeliverableStatus: //102 - GUID + case UndeliverabletqStatus: //102 - GUID case ConferenceClosed: //105 case ConferenceInviteNotify://118 case ConferenceReject: //119 @@ -191,7 +191,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) tentative->setMessage( message ); break; default: - debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).arg( type ) ); + debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).tqarg( type ) ); break; } // if we got this far, the parse succeeded, return the Transfer @@ -202,12 +202,12 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) return tentative; } -bool EventProtocol::readFlags( Q_UINT32 &flags) +bool EventProtocol::readFlags( TQ_UINT32 &flags) { if ( okToProceed() ) { m_din >> flags; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); return true; } return false; diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h index cb9fe204..65c0672b 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h @@ -33,7 +33,7 @@ class EventTransfer; CoreProtocol receives data in addIncomingData, and passes to wireToTransfer. wireToTransfer detects an event. Passes whole chunk to EventProtocol ( as TQByteArray ) - In to EventProtocol - QByteArray + In to EventProtocol - TQByteArray Returned from EventProtocol - EventTransfer *, bytes read, set state? EventProtocol tries to parse data into eventTransfer If not complete, sets state to NeedMore and returns 0 @@ -50,7 +50,7 @@ class EventTransfer; All Events contain an event code, and a source ( a DN ) NOTHANDLED indicates that there is no further data and we don't handle events of that type, because they are not sent by the server NONE indicates there is no further data - STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded unicode. The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length. + STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded tqunicode. The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length. FLAGS contains a UINT32 containing the server's flags for this conference. See gwerror.h for the possible values and meanings of these flags. Only Logging has been observed in practice. All events are timestamped with the local time on receipt. @@ -58,10 +58,10 @@ class EventTransfer; From gwerror.h: enum Event { InvalidRecipient = 101, NOTHANDLED - UndeliverableStatus = 102, + UndeliverabletqStatus = 102, NOTHANDLED * StatusChange = 103, - Q_UINT16 STATUS + TQ_UINT16 STATUS STATUSTEXT ContactAdd = 104, NOTHANDLED @@ -109,8 +109,9 @@ class EventTransfer; class EventProtocol : public InputProtocolBase { Q_OBJECT + TQ_OBJECT public: - EventProtocol(TQObject *parent = 0, const char *name = 0); + EventProtocol(TQObject *tqparent = 0, const char *name = 0); ~EventProtocol(); /** * Attempt to parse the supplied data into an @ref EventTransfer object. @@ -124,7 +125,7 @@ protected: /** * Reads a conference's flags */ - bool readFlags( Q_UINT32 &flags); + bool readFlags( TQ_UINT32 &flags); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp index fb3f3101..be645abb 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp @@ -17,7 +17,7 @@ #include "eventtransfer.h" -EventTransfer::EventTransfer( const Q_UINT32 eventType, const TQString & source, TQDateTime timeStamp ) +EventTransfer::EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp ) : Transfer(), m_eventType( eventType ), m_source( source ), m_timeStamp( timeStamp ) { m_contentFlags |= ( EventType | Source | TimeStamp ); @@ -60,9 +60,9 @@ bool EventTransfer::hasMessage() return ( m_contentFlags & Message ); } -bool EventTransfer::hasStatus() +bool EventTransfer::hastqStatus() { - return ( m_contentFlags & Status ); + return ( m_contentFlags & tqStatus ); } bool EventTransfer::hasStatusText() @@ -92,7 +92,7 @@ GroupWise::ConferenceGuid EventTransfer::guid() return m_guid; } -Q_UINT32 EventTransfer::flags() +TQ_UINT32 EventTransfer::flags() { return m_flags; } @@ -102,7 +102,7 @@ TQString EventTransfer::message() return m_message; } -Q_UINT16 EventTransfer::status() +TQ_UINT16 EventTransfer::status() { return m_status; } @@ -119,7 +119,7 @@ void EventTransfer::setGuid( const GroupWise::ConferenceGuid & guid ) m_guid = guid; } -void EventTransfer::setFlags( const Q_UINT32 flags ) +void EventTransfer::setFlags( const TQ_UINT32 flags ) { m_contentFlags |= Flags; m_flags = flags; @@ -131,10 +131,10 @@ void EventTransfer::setMessage( const TQString & message ) m_message = message; } -void EventTransfer::setStatus( const Q_UINT16 inStatus ) +void EventTransfer::settqStatus( const TQ_UINT16 intqStatus ) { - m_contentFlags |= Status; - m_status = inStatus; + m_contentFlags |= tqStatus; + m_status = intqStatus; } void EventTransfer::setStatusText( const TQString & statusText ) diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h index d044fb55..f08e350e 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h +++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h @@ -47,7 +47,7 @@ public: Guid = 0x00000008, Flags = 0x00000010, Message = 0x00000020, - Status = 0x00000040, + tqStatus = 0x00000040, StatusText = 0x00000080 }; /** * Constructor @@ -55,14 +55,14 @@ public: * @param source the user generating the event. * @param timeStamp the time at which the event was received. */ - EventTransfer( const Q_UINT32 eventType, const TQString & source, TQDateTime timeStamp ); + EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp ); ~EventTransfer(); /** - * Access the bitmask that describes the transfer's contents. Use @ref Contents to determine what it contains + * Access the bittqmask that describes the transfer's contents. Use @ref Contents to determine what it tqcontains */ - Q_UINT32 contents(); + TQ_UINT32 contents(); /** - * Convenience accessors to see what the transfer contains + * Convenience accessors to see what the transfer tqcontains */ bool hasEventType(); bool hasSource(); @@ -70,7 +70,7 @@ public: bool hasGuid(); bool hasFlags(); bool hasMessage(); - bool hasStatus(); + bool hastqStatus(); bool hasStatusText(); /** @@ -81,29 +81,29 @@ public: TQString source(); TQDateTime timeStamp(); GroupWise::ConferenceGuid guid(); - Q_UINT32 flags(); + TQ_UINT32 flags(); TQString message(); - Q_UINT16 status(); + TQ_UINT16 status(); TQString statusText(); /** * Mutators to set the transfer's contents */ void setGuid( const GroupWise::ConferenceGuid & guid ); - void setFlags( const Q_UINT32 flags ); + void setFlags( const TQ_UINT32 flags ); void setMessage( const TQString & message ); - void setStatus( const Q_UINT16 status ); + void settqStatus( const TQ_UINT16 status ); void setStatusText( const TQString & statusText); private: - Q_UINT32 m_contentFlags; + TQ_UINT32 m_contentFlags; int m_eventType; TQString m_source; TQDateTime m_timeStamp; GroupWise::ConferenceGuid m_guid; - Q_UINT32 m_flags; + TQ_UINT32 m_flags; TQString m_message; - Q_UINT16 m_status; + TQ_UINT16 m_status; TQString m_statusText; }; diff --git a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h index 4e73955a..5349fd30 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h +++ b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h @@ -44,7 +44,7 @@ struct ChatroomSearchResult class Chatroom { public: - enum UserStatus { Participating, NotParticipating }; + enum UsertqStatus { Participating, NotParticipating }; enum Rights { Read = 1, Write = 2, Modify = 4, Moderator = 8, Owner = 16 }; TQString creatorDN; TQString description; @@ -57,7 +57,7 @@ class Chatroom bool archive; uint maxUsers; uint chatRights; - UserStatus userStatus; + UsertqStatus usertqStatus; TQDateTime createdOn; uint participantsCount; // haveParticipants, Acl, Invites indicate if we have obtained these lists from the server, so we can tell 'not fetched list' and 'fetched empty list' apart. diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp index 5d964ad0..e2e5269a 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp @@ -106,7 +106,7 @@ public: bool allowPlain, mutualAuth; bool haveLocalAddr; TQHostAddress localAddr; - Q_UINT16 localPort; + TQ_UINT16 localPort; // int minimumSSF, maximumSSF; // TQString sasl_mech; bool doBinding; @@ -143,8 +143,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; @@ -295,7 +295,7 @@ void ClientStream::setNoopTime(int mills) d->noopTimer.start(d->noop_time); } -void ClientStream::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port) +void ClientStream::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->haveLocalAddr = true; d->localAddr = addr; @@ -378,7 +378,7 @@ void cs_dump( const TQByteArray &bytes ) { //#define GW_CLIENTSTREAM_DEBUG 1 #ifdef GW_CLIENTSTREAM_DEBUG - CoreProtocol::debug( TQString( "contains: %1 bytes " ).arg( bytes.count() ) ); + CoreProtocol::debug( TQString( "tqcontains: %1 bytes " ).tqarg( bytes.count() ) ); uint count = 0; while ( count < bytes.count() ) { @@ -440,7 +440,7 @@ void ClientStream::cp_incomingData() emit doReadyRead(); } else - CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).arg( d->client.state() ) ); + CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).tqarg( d->client.state() ) ); } void ClientStream::cr_connected() @@ -520,7 +520,7 @@ void ClientStream::ss_readyRead() #ifdef LIBGW_DEBUG TQCString cs(a.data(), a.size()+1); - CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).arg( a.size() ) ); + CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).tqarg( a.size() ) ); cs_dump( a ); #endif @@ -532,7 +532,7 @@ void ClientStream::ss_readyRead() void ClientStream::ss_bytesWritten(int bytes) { #ifdef LIBGW_DEBUG - CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).arg( bytes ) ); + CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).tqarg( bytes ) ); #else Q_UNUSED( bytes ); #endif @@ -556,7 +556,7 @@ void ClientStream::ss_tlsClosed() void ClientStream::ss_error(int x) { - CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").arg( x ) ); + CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").tqarg( x ) ); if(x == SecureStream::ErrTLS) { reset(); d->errCond = TLSFail; diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h index 2d0cef92..749eeaa7 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h @@ -40,6 +40,7 @@ typedef struct NovellDN class ClientStream : public Stream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up @@ -86,7 +87,7 @@ public: BindConflict // resource in-use }; - ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *parent=0); + ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *tqparent=0); ~ClientStream(); void connectToServer(const NovellDN &id, bool auth=true); @@ -103,7 +104,7 @@ public: // security options (old protocol only uses the first !) void setAllowPlain(bool); void setRequireMutualAuth(bool); - void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port); + void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port); void close(); @@ -179,7 +180,7 @@ private: /** * convert internal method representation to wire */ - static char* encode_method(Q_UINT8 method); + static char* encode_method(TQ_UINT8 method); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp index ba2a2a58..65574eb3 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp @@ -146,7 +146,7 @@ TQString GroupWise::errorCodeToString( int errorCode ) errorString = i18n( "Chat has been removed from server" ); break; default: - errorString = i18n("Unrecognized error code: %s").arg( errorCode ); + errorString = i18n("Unrecognized error code: %s").tqarg( errorCode ); #else case NMERR_ACCESS_DENIED: errorString = "Access denied"; @@ -269,7 +269,7 @@ TQString GroupWise::errorCodeToString( int errorCode ) errorString = "Chat has been removed from server"; break; default: - errorString = TQString("Unrecognized error code: %s").arg( errorCode ); + errorString = TQString("Unrecognized error code: %s").tqarg( errorCode ); #endif } return errorString; diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h index 52a5ef36..a6afa5c8 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwerror.h +++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h @@ -23,7 +23,7 @@ #include <tqmap.h> #include <tqstring.h> -typedef Q_UINT16 NMERR_T; +typedef TQ_UINT16 NMERR_T; #define GROUPWISE_DEBUG_GLOBAL 14190 #define GROUPWISE_DEBUG_LIBGW 14191 #define GROUPWISE_DEBUG_RAW 14192 @@ -36,7 +36,7 @@ typedef Q_UINT16 NMERR_T; namespace GroupWise { - enum Status { Unknown = 0, + enum tqStatus { Unknown = 0, Offline = 1, Available = 2, Busy = 3, @@ -58,7 +58,7 @@ namespace GroupWise }; enum Event { InvalidRecipient = 101, - UndeliverableStatus = 102, + UndeliverabletqStatus = 102, StatusChange = 103, ContactAdd = 104, ConferenceClosed = 105, @@ -115,7 +115,7 @@ namespace GroupWise ConferenceGuid guid; TQString user; TQDateTime timeStamp; - Q_UINT32 flags; + TQ_UINT32 flags; TQString message; }; @@ -123,14 +123,14 @@ namespace GroupWise { uint id; uint sequence; - uint parentId; + uint tqparentId; TQString name; }; struct ContactItem { uint id; - uint parentId; + uint tqparentId; uint sequence; TQString dn; TQString displayName; @@ -164,9 +164,9 @@ namespace GroupWise int operation; }; - struct CustomStatus + struct CustomtqStatus { - GroupWise::Status status; + GroupWise::tqStatus status; TQString name; TQString autoReply; }; diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp index 6d025e47..94f82937 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp @@ -36,16 +36,16 @@ FieldList::~FieldList() { } -FieldListIterator FieldList::find( TQCString tag ) +FieldListIterator FieldList::tqfind( TQCString tag ) { FieldListIterator it = begin(); - return find( it, tag ); + return tqfind( it, tag ); } -FieldListIterator FieldList::find( FieldListIterator &it, TQCString tag ) +FieldListIterator FieldList::tqfind( FieldListIterator &it, TQCString tag ) { FieldListIterator theEnd = end(); - //cout << "FieldList::find() looking for " << tag.data() << endl; + //cout << "FieldList::tqfind() looking for " << tag.data() << endl; for ( ; it != theEnd; ++it ) { //cout << " - on " << (*it)->tag().data() << endl; @@ -113,7 +113,7 @@ SingleField * FieldList::findSingleField( TQCString tag ) SingleField * FieldList::findSingleField( FieldListIterator &it, TQCString tag ) { - FieldListIterator found = find( it, tag ); + FieldListIterator found = tqfind( it, tag ); if ( found == end() ) return 0; else @@ -128,7 +128,7 @@ MultiField * FieldList::findMultiField( TQCString tag ) MultiField * FieldList::findMultiField( FieldListIterator &it, TQCString tag ) { - FieldListIterator found = find( it, tag ); + FieldListIterator found = tqfind( it, tag ); if ( found == end() ) return 0; else @@ -138,7 +138,7 @@ MultiField * FieldList::findMultiField( FieldListIterator &it, TQCString tag ) /* === FieldBase ========================================================= */ -FieldBase::FieldBase( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type ) +FieldBase::FieldBase( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type ) : m_tag( tag ), m_method( method ), m_flags( flags ), m_type( type ) { @@ -149,34 +149,34 @@ TQCString FieldBase::tag() const return m_tag; } -Q_UINT8 FieldBase::method() const +TQ_UINT8 FieldBase::method() const { return m_method; } -Q_UINT8 FieldBase::flags() const +TQ_UINT8 FieldBase::flags() const { return m_flags; } -Q_UINT8 FieldBase::type() const +TQ_UINT8 FieldBase::type() const { return m_type; } -void FieldBase::setFlags( const Q_UINT8 flags ) +void FieldBase::setFlags( const TQ_UINT8 flags ) { m_flags = flags; } /* === SingleField ========================================================= */ -SingleField::SingleField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, TQVariant value ) +SingleField::SingleField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value ) : FieldBase( tag, method, flags, type ), m_value( value ) { } -SingleField::SingleField( TQCString tag, Q_UINT8 flags, Q_UINT8 type, TQVariant value ) +SingleField::SingleField( TQCString tag, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value ) : FieldBase( tag, NMFIELD_METHOD_VALID, flags, type ), m_value( value ) { } @@ -197,12 +197,12 @@ TQVariant SingleField::value() const /* === MultiField ========================================================= */ -MultiField::MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, FieldList fields ) +MultiField::MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, FieldList fields ) : FieldBase( tag, method, flags, type ), m_fields( fields ) { } -MultiField::MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type ) +MultiField::MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type ) : FieldBase( tag, method, flags, type ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.h b/kopete/protocols/groupwise/libgroupwise/gwfield.h index 0117b3e5..1f8deea2 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwfield.h +++ b/kopete/protocols/groupwise/libgroupwise/gwfield.h @@ -22,7 +22,7 @@ #define GWFIELD_H /* Field types */ -/* Comments: ^1 not used ^2 ignored ^3 apparently only used in _field_to_string for debug */ +/* Comments: ^1 not used ^2 ignored ^3 aptqparently only used in _field_to_string for debug */ /* Otherwise: widely used */ #define NMFIELD_TYPE_INVALID 0 /* ^1 */ @@ -122,14 +122,14 @@ // GW7 #define NM_A_FA_CUSTOM_STATUSES "NM_A_FA_CUSTOM_STATUSES" #define NM_A_FA_STATUS "NM_A_FA_STATUS" -#define NM_A_UD_QUERY_COUNT "NM_A_UD_QUERY_COUNT" +#define NM_A_UD_TQUERY_COUNT "NM_A_UD_TQUERY_COUNT" #define NM_A_FA_CHAT "NM_A_FA_CHAT" #define NM_A_DISPLAY_NAME "nnmDisplayName" #define NM_A_CHAT_OWNER_DN "nnmChatOwnerDN" #define NM_A_UD_PARTICIPANTS "NM_A_UD_PARTICIPANTS" #define NM_A_DESCRIPTION "nnmDescription" #define NM_A_DISCLAIMER "nnmDisclaimer" -#define NM_A_QUERY "nnmQuery" +#define NM_A_TQUERY "nnmQuery" #define NM_A_ARCHIVE "nnmArchive" #define NM_A_MAX_USERS "nnmMaxUsers" #define NM_A_SZ_TOPIC "NM_A_SZ_TOPIC" @@ -167,18 +167,18 @@ namespace Field { public: FieldBase() {} - FieldBase( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type ); + FieldBase( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type ); virtual ~FieldBase() {} TQCString tag() const; - Q_UINT8 method() const; - Q_UINT8 flags() const; - Q_UINT8 type() const; - void setFlags( const Q_UINT8 flags ); + TQ_UINT8 method() const; + TQ_UINT8 flags() const; + TQ_UINT8 type() const; + void setFlags( const TQ_UINT8 flags ); protected: TQCString m_tag; - Q_UINT8 m_method; - Q_UINT8 m_flags; - Q_UINT8 m_type; // doch needed + TQ_UINT8 m_method; + TQ_UINT8 m_flags; + TQ_UINT8 m_type; // doch needed }; typedef TQValueListIterator<FieldBase *> FieldListIterator; @@ -194,18 +194,18 @@ namespace Field */ virtual ~FieldList(); /** - * Locate the first occurrence of a given field in the list. Same semantics as TQValueList::find(). + * Locate the first occurrence of a given field in the list. Same semantics as TQValueList::tqfind(). * @param tag The tag name of the field to search for. * @return An iterator pointing to the first occurrence found, or end() if none was found. */ - FieldListIterator find( TQCString tag ); + FieldListIterator tqfind( TQCString tag ); /** * Locate the first occurrence of a given field in the list, starting at the supplied iterator * @param tag The tag name of the field to search for. * @param it An iterator within the list, to start searching from. * @return An iterator pointing to the first occurrence found, or end() if none was found. */ - FieldListIterator find( FieldListIterator &it, TQCString tag ); + FieldListIterator tqfind( FieldListIterator &it, TQCString tag ); /** * Get the index of the first occurrence of tag, or -1 if not found */ @@ -242,11 +242,11 @@ namespace Field /** * Single field constructor */ - SingleField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, TQVariant value ); + SingleField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value ); /** * Convenience constructor for NMFIELD_METHOD_VALID fields */ - SingleField( TQCString tag, Q_UINT8 flags, Q_UINT8 type, TQVariant value ); + SingleField( TQCString tag, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value ); ~SingleField(); void setValue( const TQVariant v ); TQVariant value() const; @@ -261,8 +261,8 @@ namespace Field class MultiField : public FieldBase { public: - MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type ); - MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, FieldList fields ); + MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type ); + MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, FieldList fields ); ~MultiField(); FieldList fields() const; void setFields( FieldList ); diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp index 6dfb1d0f..0a7d7d8d 100644 --- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp +++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp @@ -23,8 +23,8 @@ #include "gwfield.h" #include "inputprotocolbase.h" -InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name) - : TQObject(parent, name) +InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { } @@ -76,11 +76,11 @@ bool InputProtocolBase::okToProceed() bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) { // read the length of the bytes - Q_UINT32 val; + TQ_UINT32 val; if ( !okToProceed() ) return false; m_din >> val; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); if ( val > NMFIELD_MAX_STR_LENGTH ) return false; //qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); @@ -95,10 +95,10 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) // the rest of the string will be filled with FF, // so look for that in the last position instead of \0 // this caused a crash - guessing that temp.length() is set to the number of bytes actually read... - // if ( (Q_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF ) + // if ( (TQ_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF ) if ( temp.length() < ( val - 1 ) ) { - debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).arg( temp.length() ).arg( val ) ); + debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).tqarg( temp.length() ).tqarg( val ) ); m_state = NeedMore; return false; } diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h index 529fea21..2f2f9f1e 100644 --- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h +++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h @@ -27,12 +27,13 @@ Defines a basic interface for protocols dealing with input from the GroupWise se @author Kopete Developers */ -class InputProtocolBase : public QObject +class InputProtocolBase : public TQObject { Q_OBJECT + TQ_OBJECT public: enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError }; - InputProtocolBase(TQObject *parent = 0, const char *name = 0); + InputProtocolBase(TQObject *tqparent = 0, const char *name = 0); ~InputProtocolBase(); /** @@ -63,7 +64,7 @@ protected: */ bool okToProceed(); /** - * read a Q_UINT32 giving the number of following bytes, then a string of that length + * read a TQ_UINT32 giving the number of following bytes, then a string of that length * updates the bytes parsed counter * @return false if the string was broken or there was no data available at all */ diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp index 4960310a..a887c8cc 100644 --- a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp @@ -59,21 +59,21 @@ bool PrivacyManager::isPrivacyLocked() bool PrivacyManager::isBlocked( const TQString & dn ) { if ( m_defaultDeny ) - return !m_allowList.contains( dn ); + return !m_allowList.tqcontains( dn ); else - return m_denyList.contains( dn ); + return m_denyList.tqcontains( dn ); } void PrivacyManager::setAllow( const TQString & dn ) { if ( m_defaultDeny ) { - if ( !m_allowList.contains( dn ) ) + if ( !m_allowList.tqcontains( dn ) ) addAllow( dn ); } else { - if ( m_denyList.contains( dn ) ) + if ( m_denyList.tqcontains( dn ) ) removeDeny( dn ); } } @@ -82,12 +82,12 @@ void PrivacyManager::setDeny( const TQString & dn ) { if ( m_defaultDeny ) { - if ( m_allowList.contains( dn ) ) + if ( m_allowList.tqcontains( dn ) ) removeAllow( dn ); } else { - if ( !m_denyList.contains( dn ) ) + if ( !m_denyList.tqcontains( dn ) ) addDeny( dn ); } } @@ -243,7 +243,7 @@ TQStringList PrivacyManager::difference( const TQStringList & lhs, const TQStrin const TQStringList::ConstIterator rhsEnd = rhs.end(); for ( TQStringList::ConstIterator lhsIt = lhs.begin(); lhsIt != lhsEnd; ++lhsIt ) { - if ( rhs.find( *lhsIt ) == rhsEnd ) + if ( rhs.tqfind( *lhsIt ) == rhsEnd ) diff.append( *lhsIt ); } return diff; diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.h b/kopete/protocols/groupwise/libgroupwise/privacymanager.h index 0f01eb89..3d1e29f3 100644 --- a/kopete/protocols/groupwise/libgroupwise/privacymanager.h +++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.h @@ -29,9 +29,10 @@ Keeps a record of the server side privacy allow and deny lists, default policy a @author SUSE AG */ -class PrivacyManager : public QObject +class PrivacyManager : public TQObject { Q_OBJECT + TQ_OBJECT public: PrivacyManager( Client * client, const char *name = 0); ~PrivacyManager(); diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am index b7ae1bb4..e9a361d9 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am +++ b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am @@ -5,4 +5,4 @@ INCLUDES = $(all_includes) libqca_la_SOURCES = \ qca.cpp -libqca_la_LIBADD = -lqt-mt +# libqca_la_LIBADD = -lqt-mt diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp index 10cae6b8..f00eee70 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp +++ b/kopete/protocols/groupwise/libgroupwise/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) @@ -798,7 +798,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) @@ -864,8 +864,8 @@ public: TQPtrList<QCA_CertContext> store; }; -TLS::TLS(TQObject *parent) -:TQObject(parent) +TLS::TLS(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; } @@ -1132,8 +1132,8 @@ public: TQByteArray inbuf, outbuf; }; -SASL::SASL(TQObject *parent) -:TQObject(parent) +SASL::SASL(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; reset(); @@ -1232,13 +1232,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/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h index 9df6f7cd..dab99d5a 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h +++ b/kopete/protocols/groupwise/libgroupwise/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/groupwise/libgroupwise/qca/src/qcaprovider.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h index 6eda17f9..9f4fa1fb 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h +++ b/kopete/protocols/groupwise/libgroupwise/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/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp index 0cf55684..1213b6dc 100644 --- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp +++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp @@ -30,11 +30,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/groupwise/libgroupwise/qcatlshandler.h b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h index e7ac398e..3a2ee71e 100644 --- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h +++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h @@ -28,8 +28,9 @@ class QCA::TLS; class QCATLSHandler : public TLSHandler { Q_OBJECT + TQ_OBJECT public: - QCATLSHandler(QCA::TLS *parent); + QCATLSHandler(QCA::TLS *tqparent); ~QCATLSHandler(); QCA::TLS *tls() const; diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp index 48ee8b88..1145583a 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp @@ -22,7 +22,7 @@ #include "responseprotocol.h" -ResponseProtocol::ResponseProtocol(TQObject* parent, const char* name): InputProtocolBase(parent, name) +ResponseProtocol::ResponseProtocol(TQObject* tqparent, const char* name): InputProtocolBase(tqparent, name) { } @@ -42,19 +42,19 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) m_din.setByteOrder( TQDataStream::LittleEndian ); // check that this begins with a HTTP (is a response) - Q_UINT32 val; + TQ_UINT32 val; m_din >> val; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); - Q_ASSERT( qstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) == 0 ); + Q_ASSERT( tqstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) == 0 ); // read rest of HTTP header and look for a 301 redirect. TQCString headerFirst; if ( !readGroupWiseLine( headerFirst ) ) return 0; // pull out the HTTP return code - int firstSpace = headerFirst.find( ' ' ); - TQString rtnField = headerFirst.mid( firstSpace, headerFirst.find( ' ', firstSpace + 1 ) ); + int firstSpace = headerFirst.tqfind( ' ' ); + TQString rtnField = headerFirst.mid( firstSpace, headerFirst.tqfind( ' ', firstSpace + 1 ) ); bool ok = true; int rtnCode; int packetState = -1; @@ -71,7 +71,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) return 0; } headerRest.append( line ); - debug( TQString( "- read header line - (%1) : %2" ).arg( line.length() ).arg( line.data() ) ); + debug( TQString( "- read header line - (%1) : %2" ).tqarg( line.length() ).tqarg( line.data() ) ); } debug( "ResponseProtocol::readResponse() header finished" ); // if it's a redirect, set flag @@ -85,14 +85,14 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) // other header processing ( 500! ) if ( ok && rtnCode == 500 ) { - debug( TQString( "- server error %1" ).arg( rtnCode ) ); + debug( TQString( "- server error %1" ).tqarg( rtnCode ) ); packetState = ServerError; m_din.unsetDevice(); return 0; } if ( ok && rtnCode == 404 ) { - debug( TQString( "- server error %1" ).arg( rtnCode ) ); + debug( TQString( "- server error %1" ).tqarg( rtnCode ) ); packetState = ServerError; m_din.unsetDevice(); return 0; @@ -116,26 +116,26 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) int resultCode = 0; Field::FieldListIterator it; Field::FieldListIterator end = m_collatingFields.end(); - it = m_collatingFields.find( NM_A_SZ_TRANSACTION_ID ); + it = m_collatingFields.tqfind( NM_A_SZ_TRANSACTION_ID ); if ( it != end ) { Field::SingleField * sf = dynamic_cast<Field::SingleField*>( *it ); if ( sf ) { tId = sf->value().toInt(); - debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).arg( tId ) ); + debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).tqarg( tId ) ); m_collatingFields.remove( it ); delete sf; } } - it = m_collatingFields.find( NM_A_SZ_RESULT_CODE ); + it = m_collatingFields.tqfind( NM_A_SZ_RESULT_CODE ); if ( it != end ) { Field::SingleField * sf = dynamic_cast<Field::SingleField*>( *it ); if ( sf ) { resultCode = sf->value().toInt(); - debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).arg( resultCode ) ); + debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).tqarg( resultCode ) ); m_collatingFields.remove( it ); delete sf; } @@ -143,7 +143,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) // append to inQueue if ( tId ) { - debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).arg(m_collatingFields.count() ) ); + debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).tqarg(m_collatingFields.count() ) ); packetState = Available; bytes = m_bytes; m_din.unsetDevice(); @@ -169,14 +169,14 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) // if we find the beginning of a new nested list, push the current list onto m_collatingFields debug( "ResponseProtocol::readFields()" ); if ( fieldCount > 0 ) - debug( TQString( "reading %1 fields" ).arg( fieldCount ) ); + debug( TQString( "reading %1 fields" ).tqarg( fieldCount ) ); Field::FieldList currentList; while ( fieldCount != 0 ) // prevents bad input data from ruining our day { // the field being read // read field - Q_UINT8 type, method; - Q_UINT32 val; + TQ_UINT8 type, method; + TQ_UINT32 val; TQCString tag; // read uint8 type if ( !okToProceed() ) @@ -185,7 +185,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } m_din >> type; - m_bytes += sizeof( Q_UINT8 ); + m_bytes += sizeof( TQ_UINT8 ); // if type is 0 SOMETHING_INVALID, we're at the end of the fields if ( type == 0 ) /*&& m_din->atEnd() )*/ { @@ -201,7 +201,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } m_din >> method; - m_bytes += sizeof( Q_UINT8 ); + m_bytes += sizeof( TQ_UINT8 ); // read tag and length if ( !safeReadBytes( tag, val ) ) { @@ -209,7 +209,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } - debug( TQString( "- type: %1, method: %2, tag: %3," ).arg( type ).arg( method ).arg( tag.data() ) ); + debug( TQString( "- type: %1, method: %2, tag: %3," ).tqarg( type ).tqarg( method ).tqarg( tag.data() ) ); // if multivalue or array if ( type == NMFIELD_TYPE_MV || type == NMFIELD_TYPE_ARRAY ) { @@ -220,10 +220,10 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } m_din >> val; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); // create multifield - debug( TQString( " multi field containing: %1" ).arg( val ) ); + debug( TQString( " multi field containing: %1" ).tqarg( val ) ); Field::MultiField* m = new Field::MultiField( tag, method, 0, type ); currentList.append( m ); if ( !readFields( val, ¤tList) ) @@ -248,9 +248,9 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) m_packetState = ProtocolError; break; } - // convert to unicode - ignore the terminating NUL, because Qt<3.3.2 doesn't sanity check val. + // convert to tqunicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val. TQString fieldValue = TQString::fromUtf8( rawData.data(), val - 1 ); - debug( TQString( "- utf/dn single field: %1" ).arg( fieldValue ) ); + debug( TQString( "- utf/dn single field: %1" ).tqarg( fieldValue ) ); // create singlefield Field::SingleField* s = new Field::SingleField( tag, method, 0, type, fieldValue ); currentList.append( s ); @@ -265,8 +265,8 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } m_din >> val; - m_bytes += sizeof( Q_UINT32 ); - debug( TQString( "- numeric field: %1" ).arg( val ) ); + m_bytes += sizeof( TQ_UINT32 ); + debug( TQString( "- numeric field: %1" ).tqarg( val ) ); Field::SingleField* s = new Field::SingleField( tag, method, 0, type, val ); currentList.append( s ); } @@ -298,13 +298,13 @@ bool ResponseProtocol::readGroupWiseLine( TQCString & line ) line = TQCString(); while ( true ) { - Q_UINT8 c; + TQ_UINT8 c; if (! okToProceed() ) return false; m_din >> c; m_bytes++; - line += TQChar(c); + line += TQChar(c).ascii(); if ( c == '\n' ) break; } diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h index f64aee7d..9010ef3c 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h @@ -32,6 +32,7 @@ Handles the parsing of incoming Response messages class ResponseProtocol : public InputProtocolBase { Q_OBJECT + TQ_OBJECT public: /** * Describes the current state of the protocol @@ -43,7 +44,7 @@ public: */ enum PacketState { FieldsRead, ProtocolError }; - ResponseProtocol(TQObject* parent, const char* name); + ResponseProtocol(TQObject* tqparent, const char* name); ~ResponseProtocol(); /** * Attempt to parse the supplied data into an @ref Response object. diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc index 9a691ec9..35fea9d1 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.cc +++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc @@ -1732,17 +1732,17 @@ void ParStyle::clearFormatting() TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) { TQString str = _str; - str.replace(TQRegExp("&"), "&"); - str.replace(TQRegExp("<"), "<"); - str.replace(TQRegExp(">"), ">"); - str.replace(TQRegExp("\""), """); - str.replace(TQRegExp("\r"), ""); + str.tqreplace(TQRegExp("&"), "&"); + str.tqreplace(TQRegExp("<"), "<"); + str.tqreplace(TQRegExp(">"), ">"); + str.tqreplace(TQRegExp("\""), """); + str.tqreplace(TQRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.replace(TQRegExp("\n"), "<br>\n"); + str.tqreplace(TQRegExp("\n"), "<br>\n"); break; case quoteXML: - str.replace(TQRegExp("\n"), "<br/>\n"); + str.tqreplace(TQRegExp("\n"), "<br/>\n"); break; default: break; @@ -1759,7 +1759,7 @@ TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) TQString s = " "; for (int i = 1; i < len; i++) s += " "; - str.replace(pos, len, s); + str.tqreplace(pos, len, s); } return str; } @@ -1994,7 +1994,7 @@ void RTF2HTML::FlushParagraph() /* s += "<p dir=\""; - // Note: Lower-case 'ltr' and 'rtl' are important for Qt. + // Note: Lower-case 'ltr' and 'rtl' are important for TQt. s += (parStyle.dir == ParStyle::DirRTL ? "rtl" : "ltr"); s += "\">"; s += sParagraph; @@ -2182,7 +2182,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. alignment), + // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); @@ -2273,7 +2273,7 @@ void Level::flush() /* const char *encoding = NULL; if (m_nEncoding){ - for (const ENCODING *c = ICQPlugin::core->encodings; c->language; c++){ + for (const ENCODING *c = ICTQPlugin::core->encodings; c->language; c++){ if (!c->bMain) continue; if ((unsigned)c->rtf_code == m_nEncoding){ @@ -2285,7 +2285,7 @@ void Level::flush() if (encoding == NULL) encoding = p->encoding; - TQTextCodec *codec = ICQClient::_getCodec(encoding); + TQTextCodec *codec = ICTQClient::_getCodec(encoding); */ //p->PrintQuoted(codec->toUnicode(text.c_str(), text.length())); p->PrintQuoted(text.c_str()); @@ -2374,15 +2374,15 @@ TQString RTF2HTML::Parse(const char *rtf, const char *_encoding) } case IMG:{ cur_level.flush(); - const char ICQIMAGE[] = "icqimage"; + const char ICTQIMAGE[] = "icqimage"; const char *smiles[] = { ":-)" , ":-O" , ":-|" , ":-/" , // 0-3 ":-(" , ":-*" , ":-/" , ":'(" , // 4-7 ";-)" , ":-@" , ":-$" , ":-X" , // 8-B ":-P" , "8-)" , "O:)" , ":-D" }; // C-F const char *p = rtftext + 3; - if ((strlen(p) > strlen(ICQIMAGE)) && !memcmp(p, ICQIMAGE, strlen(ICQIMAGE))){ + if ((strlen(p) > strlen(ICTQIMAGE)) && !memcmp(p, ICTQIMAGE, strlen(ICTQIMAGE))){ unsigned n = 0; - for (p += strlen(ICQIMAGE); *p; p++){ + for (p += strlen(ICTQIMAGE); *p; p++){ if ((*p >= '0') && (*p <= '9')){ n = n << 4; n += (*p - '0'); @@ -2516,7 +2516,7 @@ TQString RTF2HTML::Parse(const char *rtf, const char *_encoding) } /* -bool ICQClient::parseRTF(const char *rtf, const char *encoding, TQString &res) +bool ICTQClient::parseRTF(const char *rtf, const char *encoding, TQString &res) { char _RTF[] = "{\\rtf"; if ((strlen(rtf) > strlen(_RTF)) && !memcmp(rtf, _RTF, strlen(_RTF))){ @@ -2524,7 +2524,7 @@ bool ICQClient::parseRTF(const char *rtf, const char *encoding, TQString &res) res = p.Parse(rtf, encoding); return true; } - TQTextCodec *codec = ICQClient::_getCodec(encoding); + TQTextCodec *codec = ICTQClient::_getCodec(encoding); res = codec->toUnicode(rtf, strlen(rtf)); return false; } diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll index 67e9f5f5..70d4daa5 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.ll +++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll @@ -67,17 +67,17 @@ void ParStyle::clearFormatting() QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) { QString str = _str; - str.replace(QRegExp("&"), "&"); - str.replace(QRegExp("<"), "<"); - str.replace(QRegExp(">"), ">"); - str.replace(QRegExp("\""), """); - str.replace(QRegExp("\r"), ""); + str.tqreplace(QRegExp("&"), "&"); + str.tqreplace(QRegExp("<"), "<"); + str.tqreplace(QRegExp(">"), ">"); + str.tqreplace(QRegExp("\""), """); + str.tqreplace(QRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.replace(QRegExp("\n"), "<br>\n"); + str.tqreplace(QRegExp("\n"), "<br>\n"); break; case quoteXML: - str.replace(QRegExp("\n"), "<br/>\n"); + str.tqreplace(QRegExp("\n"), "<br/>\n"); break; default: break; @@ -94,7 +94,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) QString s = " "; for (int i = 1; i < len; i++) s += " "; - str.replace(pos, len, s); + str.tqreplace(pos, len, s); } return str; } @@ -517,7 +517,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. alignment), + // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/groupwise/libgroupwise/safedelete.cpp b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp index 5dde3725..9de147f0 100644 --- a/kopete/protocols/groupwise/libgroupwise/safedelete.cpp +++ b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp @@ -62,13 +62,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/groupwise/libgroupwise/safedelete.h b/kopete/protocols/groupwise/libgroupwise/safedelete.h index 0d4150d9..88cfb3d4 100644 --- a/kopete/protocols/groupwise/libgroupwise/safedelete.h +++ b/kopete/protocols/groupwise/libgroupwise/safedelete.h @@ -57,9 +57,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/groupwise/libgroupwise/securestream.h b/kopete/protocols/groupwise/libgroupwise/securestream.h index 82752cea..f0c6223e 100644 --- a/kopete/protocols/groupwise/libgroupwise/securestream.h +++ b/kopete/protocols/groupwise/libgroupwise/securestream.h @@ -34,6 +34,7 @@ class SecureStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrTLS = ErrCustom, ErrSASL }; SecureStream(ByteStream *s); @@ -100,9 +101,10 @@ USE_TLSHANDLER }; -class SecureLayer : public QObject +class SecureLayer : public TQObject { Q_OBJECT + TQ_OBJECT public: SecureLayer(QCA::TLS *t); SecureLayer(QCA::SASL *s); diff --git a/kopete/protocols/groupwise/libgroupwise/stream.cpp b/kopete/protocols/groupwise/libgroupwise/stream.cpp index d3410578..87da3baa 100644 --- a/kopete/protocols/groupwise/libgroupwise/stream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/stream.cpp @@ -19,8 +19,8 @@ #include "stream.h" -Stream::Stream(TQObject *parent) -:TQObject(parent) +Stream::Stream(TQObject *tqparent) +:TQObject(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/stream.h b/kopete/protocols/groupwise/libgroupwise/stream.h index c06649fd..15544a6c 100644 --- a/kopete/protocols/groupwise/libgroupwise/stream.h +++ b/kopete/protocols/groupwise/libgroupwise/stream.h @@ -28,9 +28,10 @@ #define GW_STREAM_H -class Stream : public QObject +class Stream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 }; enum StreamCond { @@ -45,7 +46,7 @@ public: SystemShutdown }; - Stream(TQObject *parent=0); + Stream(TQObject *tqparent=0); virtual ~Stream(); virtual void close()=0; diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp index 96259254..142db094 100644 --- a/kopete/protocols/groupwise/libgroupwise/task.cpp +++ b/kopete/protocols/groupwise/libgroupwise/task.cpp @@ -41,22 +41,22 @@ public: Transfer * transfer; }; -Task::Task(Task *parent) -:TQObject(parent) +Task::Task(Task *tqparent) +:TQObject(tqparent) { init(); d->transfer = 0; - 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())); } @@ -77,9 +77,9 @@ void Task::init() d->statusCode = 0; } -Task *Task::parent() const +Task *Task::tqparent() const { - return (Task *)TQObject::parent(); + return (Task *)TQObject::tqparent(); } Client *Task::client() const @@ -126,12 +126,12 @@ void Task::go(bool autoDelete) bool Task::take( Transfer * transfer) { - const TQObjectList *p = children(); - if(!p) + const TQObjectList p = childrenListObject(); + if(p.isEmpty()) return false; - // pass along the transfer to our children - TQObjectListIt it(*p); + // pass along the transfer to our tqchildren + TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { TQObject *obj = it.current(); @@ -142,7 +142,7 @@ bool Task::take( Transfer * transfer) if(t->take( transfer )) { - client()->debug( TQString( "Transfer ACCEPTED by: %1" ).arg( t->className() ) ); + client()->debug( TQString( "Transfer ACCEPTED by: %1" ).tqarg( t->className() ) ); return true; } } @@ -256,7 +256,7 @@ void Task::clientDisconnected() void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").arg(className()) + str); + client()->debug(TQString("%1: ").tqarg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const diff --git a/kopete/protocols/groupwise/libgroupwise/task.h b/kopete/protocols/groupwise/libgroupwise/task.h index b0b623d2..8d2bc380 100644 --- a/kopete/protocols/groupwise/libgroupwise/task.h +++ b/kopete/protocols/groupwise/libgroupwise/task.h @@ -29,16 +29,17 @@ class Client; class Request; -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; Transfer *transfer() const; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp index fb028c44..08f04b40 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp @@ -26,7 +26,7 @@ using namespace GroupWise; -ChatCountsTask::ChatCountsTask(Task* parent): RequestTask(parent) +ChatCountsTask::ChatCountsTask(Task* tqparent): RequestTask(tqparent) { Field::FieldList lst; createTransfer( "chatcounts", lst ); @@ -59,9 +59,9 @@ bool ChatCountsTask::take( Transfer * transfer ) } Field::FieldList counts = resultsArray->fields(); const Field::FieldListIterator end = counts.end(); - for ( Field::FieldListIterator it = counts.find( NM_A_FA_CHAT ); + for ( Field::FieldListIterator it = counts.tqfind( NM_A_FA_CHAT ); it != end; - it = counts.find( ++it, NM_A_FA_CHAT ) ) + it = counts.tqfind( ++it, NM_A_FA_CHAT ) ) { Field::MultiField * mf = static_cast<Field::MultiField *>( *it ); Field::FieldList chat = mf->fields(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h index 6197352d..9a052dac 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h @@ -34,8 +34,9 @@ Get the current number of users in each chat on the server class ChatCountsTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - ChatCountsTask(Task* parent); + ChatCountsTask(Task* tqparent); ~ChatCountsTask(); bool take( Transfer * transfer ); /** diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp index 7f60f3c5..fe8cf20c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp @@ -25,7 +25,7 @@ using namespace GroupWise; -ChatPropertiesTask::ChatPropertiesTask(Task* parent): RequestTask(parent) +ChatPropertiesTask::ChatPropertiesTask(Task* tqparent): RequestTask(tqparent) { } @@ -82,7 +82,7 @@ bool ChatPropertiesTask::take( Transfer * transfer ) m_description = sf->value().toString(); else if ( sf->tag() == NM_A_DISCLAIMER ) m_disclaimer = sf->value().toString(); - else if ( sf->tag() == NM_A_QUERY ) + else if ( sf->tag() == NM_A_TQUERY ) m_query = sf->value().toString(); else if ( sf->tag() == NM_A_ARCHIVE ) m_archive = sf->value().toString(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h index d52661f3..dfb73139 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h @@ -35,8 +35,9 @@ Get the current number of users in each chat on the server class ChatPropertiesTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - ChatPropertiesTask(Task* parent); + ChatPropertiesTask(Task* tqparent); ~ChatPropertiesTask(); /** * Specify which chatroom to get properties for diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp index c88e22b4..de78465f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp @@ -23,8 +23,8 @@ #include "conferencetask.h" -ConferenceTask::ConferenceTask( Task* parent ) - : EventTask( parent ) +ConferenceTask::ConferenceTask( Task* tqparent ) + : EventTask( tqparent ) { // register all the events that this task monitors registerEvent( GroupWise::ConferenceClosed ); @@ -53,10 +53,10 @@ ConferenceTask::~ConferenceTask() void ConferenceTask::dumpConferenceEvent( ConferenceEvent & evt ) { - client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).arg - ( evt.guid ).arg( evt.user.ascii() ).arg( evt.timeStamp.time().hour() ).arg - ( evt.timeStamp.time().minute() ).arg( evt.timeStamp.time().second() ) ); - client()->debug( TQString( " flags: %1" ).arg( evt.flags, 8 ) ); + client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).tqarg + ( evt.guid ).tqarg( evt.user.ascii() ).tqarg( evt.timeStamp.time().hour() ).tqarg + ( evt.timeStamp.time().minute() ).tqarg( evt.timeStamp.time().second() ) ); + client()->debug( TQString( " flags: %1" ).tqarg( evt.flags, 8 ) ); } bool ConferenceTask::take( Transfer * transfer ) @@ -103,7 +103,7 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceiveMessage" ); - client()->debug( TQString( "message: %1" ).arg( event.message ) ); + client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); if ( !queueWhileAwaitingData( event ) ) emit message( event ); break; @@ -119,7 +119,7 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ConferenceInvite" ); - client()->debug( TQString( "message: %1" ).arg( event.message ) ); + client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); if ( !queueWhileAwaitingData( event ) ) emit invited( event ); break; @@ -139,14 +139,14 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceiveAutoReply" ); - client()->debug( TQString( "message: %1" ).arg( event.message.ascii() ) ); + client()->debug( TQString( "message: %1" ).tqarg( event.message.ascii() ) ); emit autoReply( event ); break; case GroupWise::ReceivedBroadcast: Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceivedBroadCast" ); - client()->debug( TQString( "message: %1" ).arg( event.message ) ); + client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); if ( !queueWhileAwaitingData( event ) ) emit broadcast( event ); break; @@ -154,11 +154,11 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceivedSystemBroadCast" ); - client()->debug( TQString( "message: %1" ).arg( event.message ) ); + client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); emit systemBroadcast( event ); break; default: - client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).arg( incomingEvent->eventType() ).arg( event.guid.ascii() ) ); + client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).tqarg( incomingEvent->eventType() ).tqarg( event.guid.ascii() ) ); } dumpConferenceEvent( event ); @@ -181,7 +181,7 @@ void ConferenceTask::slotReceiveUserDetails( const GroupWise::ContactDetails & d // if the details relate to event, try again to handle it if ( details.dn == (*current).user ) { - client()->debug( TQString( " - got details for event involving %1" ).arg( (*current).user ) ); + client()->debug( TQString( " - got details for event involving %1" ).tqarg( (*current).user ) ); switch ( (*current).type ) { case GroupWise::ConferenceJoined: @@ -220,7 +220,7 @@ bool ConferenceTask::queueWhileAwaitingData( const ConferenceEvent & event ) } else { - client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).arg( event.user ) ); + client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).tqarg( event.user ) ); client()->userDetailsManager()->requestDetails( event.user ); m_pendingEvents.append( event ); return true; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h index 7f35d08b..4a1f6d19 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h @@ -36,8 +36,9 @@ using namespace GroupWise; class ConferenceTask : public EventTask { Q_OBJECT + TQ_OBJECT public: - ConferenceTask( Task* parent ); + ConferenceTask( Task* tqparent ); ~ConferenceTask(); bool take( Transfer * transfer ); signals: @@ -57,7 +58,7 @@ signals: protected slots: void slotReceiveUserDetails( const GroupWise::ContactDetails & ); protected: - Q_UINT32 readFlags( TQDataStream & din ); + TQ_UINT32 readFlags( TQDataStream & din ); TQString readMessage( TQDataStream & din ); /** * Checks to see if we need more data from the client before we can propagate this event diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp index 3d041208..3778e80a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp @@ -21,7 +21,7 @@ #include "connectiontask.h" -ConnectionTask::ConnectionTask(Task* parent): EventTask(parent) +ConnectionTask::ConnectionTask(Task* tqparent): EventTask(tqparent) { registerEvent( GroupWise::UserDisconnect ); registerEvent( GroupWise::ServerDisconnect ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h index 95df34f9..da7507b1 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h @@ -31,8 +31,9 @@ This task monitors connection related events, currently 'connected elsewhere' di class ConnectionTask : public EventTask { Q_OBJECT + TQ_OBJECT public: - ConnectionTask(Task* parent); + ConnectionTask(Task* tqparent); ~ConnectionTask(); bool take( Transfer * transfer ); signals: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp index 01d2fa05..e87ee0f4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp @@ -24,7 +24,7 @@ #include "createconferencetask.h" -CreateConferenceTask::CreateConferenceTask(Task* parent): RequestTask(parent), m_confId( 0 ), m_guid( BLANK_GUID ) +CreateConferenceTask::CreateConferenceTask(Task* tqparent): RequestTask(tqparent), m_confId( 0 ), m_guid( BLANK_GUID ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h index de66f734..c43e5725 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h @@ -31,8 +31,9 @@ This task is responsible for creating a conference at the server, and confirming class CreateConferenceTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - CreateConferenceTask(Task* parent); + CreateConferenceTask(Task* tqparent); ~CreateConferenceTask(); /** * Set up a create conference request diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp index d41db4a9..ae1a6984 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp @@ -21,7 +21,7 @@ #include "createcontactinstancetask.h" -CreateContactInstanceTask::CreateContactInstanceTask(Task* parent) : NeedFolderTask(parent) +CreateContactInstanceTask::CreateContactInstanceTask(Task* tqparent) : NeedFolderTask(tqparent) { // make the client tell the client app (Kopete) when we receive a contact connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); @@ -31,9 +31,9 @@ CreateContactInstanceTask::~CreateContactInstanceTask() { } -void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder ) +void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder ) { - contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, parentFolder ); + contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, tqparentFolder ); } void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ) @@ -46,9 +46,9 @@ void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & use m_folderDisplayName = folderDisplayName; } -void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ) +void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ) { - contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, parentFolder ); + contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, tqparentFolder ); } void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ) @@ -61,10 +61,10 @@ void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, con m_folderDisplayName = folderDisplayName; } -void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int parentFolder ) +void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder ) { Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) ); // this is either a user Id or a DN lst.append( id ); if ( displayName.isEmpty() ) // fallback so that the contact is created diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h index 6c960a4c..84347964 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h @@ -24,26 +24,27 @@ #include "needfoldertask.h" /** -Creates a contact on the server. The response to this action is handled by its parent +Creates a contact on the server. The response to this action is handled by its tqparent @author SUSE AG */ class CreateContactInstanceTask : public NeedFolderTask { Q_OBJECT + TQ_OBJECT public: - CreateContactInstanceTask(Task* parent); + CreateContactInstanceTask(Task* tqparent); ~CreateContactInstanceTask(); /** * Sets up the request message. */ - void contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder ); - void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ); + void contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder ); + void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ); void contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ); void contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ); void onGo(); protected: - void contact( Field::SingleField * id, const TQString & displayName, const int parentFolder ); + void contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder ); void onFolderCreated(); private: TQString m_userId; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp index 0d167236..4e9d3e8a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp @@ -24,7 +24,7 @@ #include "createcontacttask.h" -CreateContactTask::CreateContactTask(Task* parent): Task(parent) +CreateContactTask::CreateContactTask(Task* tqparent): Task(tqparent) { } @@ -71,7 +71,7 @@ void CreateContactTask::onGo() // create contacts on the server for ( ; it != end; ++it ) { - client()->debug( TQString( " - contact is in folder %1 with id %2" ).arg( (*it).name ).arg( (*it).id ) ); + client()->debug( TQString( " - contact is in folder %1 with id %2" ).tqarg( (*it).name ).tqarg( (*it).id ) ); CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() ); // the add contact action may cause other contacts' sequence numbers to change // CreateContactInstanceTask signals these changes, so we propagate the signal via the Client, to the GroupWiseAccount @@ -112,8 +112,8 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact ) client()->debug( " - addedContact is not the one we were trying to add, ignoring it ( Account will update it )" ); return; } - client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).arg - ( addedContact.displayName ).arg( addedContact.id ).arg( addedContact.parentId ) ); + client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg + ( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.tqparentId ) ); if ( m_dn.isEmpty() ) m_dn = addedContact.dn; @@ -123,7 +123,7 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact ) m_folders.pop_back(); // clear the topLevel flag once the corresponding server side entry has been successfully created - if ( addedContact.parentId == 0 ) + if ( addedContact.tqparentId == 0 ) m_topLevel = false; if ( m_folders.isEmpty() && !m_topLevel ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h index 2a46a51c..8b973361 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h @@ -42,8 +42,9 @@ using namespace GroupWise; class CreateContactTask : public Task { Q_OBJECT + TQ_OBJECT public: - CreateContactTask(Task* parent); + CreateContactTask(Task* tqparent); ~CreateContactTask(); /** * Get the userId of the contact just created @@ -64,7 +65,7 @@ public: * @param topLevel is the folder also in the top level folder? */ void contactFromUserId( const TQString & userId, const TQString & displayName, const int firstSeqNo, const TQValueList< FolderItem > folders, bool topLevel ); - //void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ); + //void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ); /** * This task doesn't do any I/O itself, so this take prints an error and returns false; */ diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp index c6e6a78a..363882d8 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp @@ -20,7 +20,7 @@ #include "createfoldertask.h" -CreateFolderTask::CreateFolderTask(Task* parent): ModifyContactListTask(parent) +CreateFolderTask::CreateFolderTask(Task* tqparent): ModifyContactListTask(tqparent) { } @@ -29,10 +29,10 @@ CreateFolderTask::~CreateFolderTask() { } -void CreateFolderTask::folder( const int parentId, const int sequence, const TQString & displayName ) +void CreateFolderTask::folder( const int tqparentId, const int sequence, const TQString & displayName ) { Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentId ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentId ) ) ); lst.append( new Field::SingleField( NM_A_SZ_DISPLAY_NAME, 0, NMFIELD_TYPE_UTF8, displayName ) ); lst.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, TQString::number( sequence ) ) ); createTransfer( "createfolder", lst ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h index cac19900..4befdf40 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h @@ -31,10 +31,11 @@ Creates a folder on the server class CreateFolderTask : public ModifyContactListTask { Q_OBJECT + TQ_OBJECT public: - CreateFolderTask(Task* parent); + CreateFolderTask(Task* tqparent); ~CreateFolderTask(); - void folder( const int parentId, const int sequence, const TQString & displayName ); + void folder( const int tqparentId, const int sequence, const TQString & displayName ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp index 04ce1fb4..4559c1f7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp @@ -20,7 +20,7 @@ #include "deleteitemtask.h" -DeleteItemTask::DeleteItemTask(Task* parent): ModifyContactListTask(parent) +DeleteItemTask::DeleteItemTask(Task* tqparent): ModifyContactListTask(tqparent) { } @@ -29,7 +29,7 @@ DeleteItemTask::~DeleteItemTask() { } -void DeleteItemTask::item( const int parentFolder, const int objectId ) +void DeleteItemTask::item( const int tqparentFolder, const int objectId ) { if ( objectId == 0 ) { @@ -37,7 +37,7 @@ void DeleteItemTask::item( const int parentFolder, const int objectId ) return; } Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) ); // this is either a user Id or a DN lst.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( objectId ) ) ); createTransfer( "deletecontact", lst ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h index f249c2f5..15ea9702 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h @@ -29,10 +29,11 @@ class DeleteItemTask : public ModifyContactListTask { Q_OBJECT + TQ_OBJECT public: - DeleteItemTask(Task* parent); + DeleteItemTask(Task* tqparent); ~DeleteItemTask(); - void item( const int parentFolder, const int objectId ); + void item( const int tqparentFolder, const int objectId ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp index c6bd2d85..8af45d93 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp @@ -21,8 +21,8 @@ #include "gwfield.h" #include "eventtask.h" -EventTask::EventTask( Task * parent ) -: Task( parent ) +EventTask::EventTask( Task * tqparent ) +: Task( tqparent ) { } @@ -40,7 +40,7 @@ bool EventTask::forMe( Transfer * transfer, EventTransfer*& event ) const { // see if we are supposed to handle this kind of event // consider speeding this up by having 1 handler per event - return ( m_eventCodes.find( event->eventType() ) != m_eventCodes.end() ); + return ( m_eventCodes.tqfind( event->eventType() ) != m_eventCodes.end() ); } return false; } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h index 609728a4..5de20281 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h @@ -31,8 +31,9 @@ class Transfer; class EventTask : public Task { Q_OBJECT + TQ_OBJECT public: - EventTask( Task *parent ); + EventTask( Task *tqparent ); protected: bool forMe( Transfer * transfer, EventTransfer *& event ) const; void registerEvent( GroupWise::Event e ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp index 8104ec24..81898ca2 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp @@ -29,7 +29,7 @@ using namespace GroupWise; -GetChatSearchResultsTask::GetChatSearchResultsTask(Task* parent): RequestTask(parent) +GetChatSearchResultsTask::GetChatSearchResultsTask(Task* tqparent): RequestTask(tqparent) { } @@ -42,7 +42,7 @@ void GetChatSearchResultsTask::poll( int queryHandle ) { Field::FieldList lst; lst.append( new Field::SingleField( NM_A_UD_OBJECT_ID, 0, NMFIELD_TYPE_UDWORD, queryHandle ) ); - lst.append( new Field::SingleField( NM_A_UD_QUERY_COUNT, 0, NMFIELD_TYPE_UDWORD, 10 ) ); + lst.append( new Field::SingleField( NM_A_UD_TQUERY_COUNT, 0, NMFIELD_TYPE_UDWORD, 10 ) ); createTransfer( "getchatsearchresults", lst ); } @@ -62,7 +62,7 @@ bool GetChatSearchResultsTask::take( Transfer * transfer ) // look for the status code Field::FieldList responseFields = response->fields(); Field::SingleField * sf = responseFields.findSingleField( NM_A_UW_STATUS ); - m_queryStatus = (SearchResultCode)sf->value().toInt(); + m_querytqStatus = (SearchResultCode)sf->value().toInt(); Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS ); if ( !resultsArray ) @@ -72,9 +72,9 @@ bool GetChatSearchResultsTask::take( Transfer * transfer ) } Field::FieldList matches = resultsArray->fields(); const Field::FieldListIterator end = matches.end(); - for ( Field::FieldListIterator it = matches.find( NM_A_FA_CHAT ); + for ( Field::FieldListIterator it = matches.tqfind( NM_A_FA_CHAT ); it != end; - it = matches.find( ++it, NM_A_FA_CHAT ) ) + it = matches.tqfind( ++it, NM_A_FA_CHAT ) ) { Field::MultiField * mf = static_cast<Field::MultiField *>( *it ); Field::FieldList chat = mf->fields(); @@ -82,12 +82,12 @@ bool GetChatSearchResultsTask::take( Transfer * transfer ) m_results.append( cd ); } - if ( m_queryStatus != DataRetrieved ) - setError( m_queryStatus ); + if ( m_querytqStatus != DataRetrieved ) + setError( m_querytqStatus ); else { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << " we won!" << endl; - setSuccess( m_queryStatus ); + setSuccess( m_querytqStatus ); } return true; } @@ -97,9 +97,9 @@ TQValueList< GroupWise::ChatroomSearchResult > GetChatSearchResultsTask::results return m_results; } -int GetChatSearchResultsTask::queryStatus() +int GetChatSearchResultsTask::querytqStatus() { - return m_queryStatus; + return m_querytqStatus; } GroupWise::ChatroomSearchResult GetChatSearchResultsTask::extractChatDetails( Field::FieldList & fields ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h index e85c1e74..dcafb3e7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h @@ -35,17 +35,18 @@ Search results are polled on the server, using the search handle returned by the class GetChatSearchResultsTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: enum SearchResultCode { Completed=2, Cancelled=4, Error=5, GettingData=8, DataRetrieved=9 }; - GetChatSearchResultsTask(Task* parent); + GetChatSearchResultsTask(Task* tqparent); ~GetChatSearchResultsTask(); void poll( int queryHandle); bool take( Transfer * transfer ); - int queryStatus(); + int querytqStatus(); TQValueList< GroupWise::ChatroomSearchResult > results(); private: GroupWise::ChatroomSearchResult extractChatDetails( Field::FieldList & fields ); - SearchResultCode m_queryStatus; + SearchResultCode m_querytqStatus; TQValueList< GroupWise::ChatroomSearchResult > m_results; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp index 61753d84..27a0c7f0 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp @@ -26,8 +26,8 @@ using namespace GroupWise; -GetDetailsTask::GetDetailsTask( Task * parent ) - : RequestTask( parent ) +GetDetailsTask::GetDetailsTask( Task * tqparent ) + : RequestTask( tqparent ) { } @@ -58,9 +58,9 @@ bool GetDetailsTask::take( Transfer * transfer ) // parse received details and signal like billio Field::MultiField * container = 0; Field::FieldListIterator end = detailsFields.end(); - for ( Field::FieldListIterator it = detailsFields.find( NM_A_FA_RESULTS ); + for ( Field::FieldListIterator it = detailsFields.tqfind( NM_A_FA_RESULTS ); it != end; - it = detailsFields.find( ++it, NM_A_FA_RESULTS ) ) + it = detailsFields.tqfind( ++it, NM_A_FA_RESULTS ) ) { container = static_cast<Field::MultiField *>( *it ); ContactDetails cd = extractUserDetails( container ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h index 747b494f..c45ad0e9 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h @@ -34,8 +34,9 @@ using namespace GroupWise; class GetDetailsTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - GetDetailsTask( Task * parent ); + GetDetailsTask( Task * tqparent ); ~GetDetailsTask(); bool take( Transfer * transfer ); void userDNs( const TQStringList & userDNs ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp index 153746ea..68063261 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp @@ -22,7 +22,7 @@ #include "getstatustask.h" -GetStatusTask::GetStatusTask(Task* parent): RequestTask(parent) +GetStatusTask::GetStatusTask(Task* tqparent): RequestTask(tqparent) { } @@ -52,7 +52,7 @@ bool GetStatusTask::take( Transfer * transfer ) responseFields.dump( true ); // parse received details and signal like billio Field::SingleField * sf = 0; - Q_UINT16 status; + TQ_UINT16 status; sf = responseFields.findSingleField( NM_A_SZ_STATUS ); if ( sf ) { @@ -60,8 +60,8 @@ bool GetStatusTask::take( Transfer * transfer ) // This must be because the sender is not on our contact list but has sent us a message. // TODO: Check that the change to sending DNs above has fixed this problem. status = sf->value().toInt(); - // unfortunately getstatus doesn't give us an away message so we pass TQString::null here - emit gotStatus( m_userDN, status, TQString::null ); + // unfortunately getstatus doesn't give us an away message so we pass TQString() here + emit gottqStatus( m_userDN, status, TQString() ); setSuccess(); } else diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h index 6294f053..9188fdd4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h @@ -30,13 +30,14 @@ class GetStatusTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - GetStatusTask(Task* parent); + GetStatusTask(Task* tqparent); ~GetStatusTask(); void userDN( const TQString & dn ); bool take( Transfer * transfer ); signals: - void gotStatus( const TQString & contactId, Q_UINT16 status, const TQString & statusText ); + void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); private: TQString m_userDN; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp index a14d6eec..35fab516 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp @@ -25,7 +25,7 @@ #include "joinchattask.h" -JoinChatTask::JoinChatTask(Task* parent): RequestTask(parent) +JoinChatTask::JoinChatTask(Task* tqparent): RequestTask(tqparent) { } @@ -59,9 +59,9 @@ bool JoinChatTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = participants->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); it != end; - it = contactList.find( ++it, NM_A_SZ_DN ) ) + it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) @@ -83,9 +83,9 @@ bool JoinChatTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = invitees->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); it != end; - it = contactList.find( ++it, NM_A_SZ_DN ) ) + it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h index 9d6babe5..654d1a64 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h @@ -34,8 +34,9 @@ Sends Join Conference messages when the user accepts an invitation class JoinChatTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - JoinChatTask(Task* parent); + JoinChatTask(Task* tqparent); ~JoinChatTask(); void join( const TQString & displayName ); bool take( Transfer * transfer ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp index b7b1f1cc..63a57fda 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp @@ -25,7 +25,7 @@ #include "joinconferencetask.h" -JoinConferenceTask::JoinConferenceTask(Task* parent): RequestTask(parent) +JoinConferenceTask::JoinConferenceTask(Task* tqparent): RequestTask(tqparent) { } @@ -59,9 +59,9 @@ bool JoinConferenceTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = participants->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); it != end; - it = contactList.find( ++it, NM_A_SZ_DN ) ) + it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) @@ -85,9 +85,9 @@ bool JoinConferenceTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = invitees->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); it != end; - it = contactList.find( ++it, NM_A_SZ_DN ) ) + it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) @@ -128,14 +128,14 @@ bool JoinConferenceTask::take( Transfer * transfer ) void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details ) { - client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).arg( details.dn ) ); + client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).tqarg( details.dn ) ); TQStringList::Iterator it = m_unknowns.begin(); TQStringList::Iterator end = m_unknowns.end(); while( it != end ) { TQString current = *it; ++it; - client()->debug( TQString( " - can we remove %1?" ).arg(current ) ); + client()->debug( TQString( " - can we remove %1?" ).tqarg(current ) ); if ( current == details.dn ) { client()->debug( " - it's gone!" ); @@ -143,7 +143,7 @@ void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details break; } } - client()->debug( TQString( " - now %1 unknowns").arg( m_unknowns.count() ) ); + client()->debug( TQString( " - now %1 unknowns").tqarg( m_unknowns.count() ) ); if ( m_unknowns.empty() ) { client()->debug( " - finished()" ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h index d95e5084..29f34679 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h @@ -34,8 +34,9 @@ Sends Join Conference messages when the user accepts an invitation class JoinConferenceTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - JoinConferenceTask(Task* parent); + JoinConferenceTask(Task* tqparent); ~JoinConferenceTask(); void join( const ConferenceGuid & guid ); bool take( Transfer * transfer ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp index ac84ac2b..d3c75055 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp @@ -24,7 +24,7 @@ #include "requestfactory.h" #include "keepalivetask.h" -KeepAliveTask::KeepAliveTask(Task* parent): RequestTask(parent) +KeepAliveTask::KeepAliveTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h index 04f9a352..dffe1059 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h @@ -29,8 +29,9 @@ class KeepAliveTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - KeepAliveTask(Task* parent); + KeepAliveTask(Task* tqparent); ~KeepAliveTask(); void setup(); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp index d2d58b83..516c74c3 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp @@ -20,7 +20,7 @@ #include "leaveconferencetask.h" -LeaveConferenceTask::LeaveConferenceTask(Task* parent): RequestTask(parent) +LeaveConferenceTask::LeaveConferenceTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h index 65ebe540..72262b9e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h @@ -31,8 +31,9 @@ Tells the server that you are leaving a conference (closed the chatwindow) class LeaveConferenceTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - LeaveConferenceTask(Task* parent); + LeaveConferenceTask(Task* tqparent); ~LeaveConferenceTask(); void leave( const GroupWise::ConferenceGuid & guid ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index 6a28124f..a09af45a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -25,8 +25,8 @@ #include "logintask.h" -LoginTask::LoginTask( Task * parent ) - : RequestTask( parent ) +LoginTask::LoginTask( Task * tqparent ) + : RequestTask( tqparent ) { } @@ -36,7 +36,7 @@ LoginTask::~LoginTask() void LoginTask::initialise() { - TQString command = TQString::fromLatin1("login:%1:%2").arg( client()->host() ).arg( client()->port() ); + TQString command = TQString::tqfromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( client()->port() ); Field::FieldList lst; lst.append( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, client()->userId() ) ); @@ -67,7 +67,7 @@ bool LoginTask::take( Transfer * transfer ) ContactDetails cd = extractUserDetails( loginResponseFields ); emit gotMyself( cd ); - // read the privacy settings first, because this affects all contacts' apparent status + // read the privacy settings first, because this affects all contacts' aptqparent status extractPrivacy( loginResponseFields ); extractCustomStatuses( loginResponseFields ); @@ -80,18 +80,18 @@ bool LoginTask::take( Transfer * transfer ) Field::FieldList contactListFields = contactList->fields(); Field::MultiField * container; // read folders - for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_FOLDER ); + for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_FOLDER ); it != contactListFields.end(); - it = contactListFields.find( ++it, NM_A_FA_FOLDER ) ) + it = contactListFields.tqfind( ++it, NM_A_FA_FOLDER ) ) { container = static_cast<Field::MultiField *>( *it ); extractFolder( container ); } // read contacts - for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_CONTACT ); + for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_CONTACT ); it != contactListFields.end(); - it = contactListFields.find( ++it, NM_A_FA_CONTACT ) ) + it = contactListFields.tqfind( ++it, NM_A_FA_CONTACT ) ) { container = static_cast<Field::MultiField *>( *it ); extractContact( container ); @@ -119,11 +119,11 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer ) // name current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); folder.name = current->value().toString(); - // parent + // tqparent current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - folder.parentId = current->value().toInt(); + folder.tqparentId = current->value().toInt(); - client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).arg( folder.name ).arg( folder.id ).arg( folder.parentId ).arg( folder.sequence ) ); + client()->debug( TQString( "Got folder: %1, obj: %2, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.tqparentId ).tqarg( folder.sequence ) ); // tell the world about it emit gotFolder( folder ); } @@ -135,11 +135,11 @@ void LoginTask::extractContact( Field::MultiField * contactContainer ) ContactItem contact; Field::SingleField * current; Field::FieldList fl = contactContainer->fields(); - // sequence number, object and parent IDs are a numeric values but are stored as strings... + // sequence number, object and tqparent IDs are a numeric values but are stored as strings... current = fl.findSingleField( NM_A_SZ_OBJECT_ID ); contact.id = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - contact.parentId = current->value().toInt(); + contact.tqparentId = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER ); contact.sequence = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); @@ -206,13 +206,13 @@ ContactDetails LoginTask::extractUserDetails( Field::FieldList & fields ) if ( propList ) { // Hello A Nagappan. GW gave us a multiple field where we previously got a single field - TQString parentName = propList->tag(); + TQString tqparentName = propList->tag(); Field::FieldList propFields = propList->fields(); const Field::FieldListIterator end = propFields.end(); for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it ) { propField = dynamic_cast<Field::SingleField *>( *it ); - if ( propField /*&& propField->tag() == parentName */) + if ( propField /*&& propField->tag() == tqparentName */) { TQString propValue = propField->value().toString(); TQString contents = propMap[ propField->tag() ]; @@ -241,12 +241,12 @@ void LoginTask::extractPrivacy( Field::FieldList & fields ) TQStringList denyList; // read blocking // may be a single field or may be an array - Field::FieldListIterator it = fields.find( NM_A_LOCKED_ATTR_LIST ); + Field::FieldListIterator it = fields.tqfind( NM_A_LOCKED_ATTR_LIST ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) ) { - if ( sf->value().toString().find( NM_A_BLOCKING ) ) + if ( sf->value().toString().tqfind( NM_A_BLOCKING ) ) privacyLocked = true; } else if ( Field::MultiField * mf = dynamic_cast<Field::MultiField *>( *it ) ) @@ -284,7 +284,7 @@ TQStringList LoginTask::readPrivacyItems( const TQCString & tag, Field::FieldLis { TQStringList items; - Field::FieldListIterator it = fields.find( tag ); + Field::FieldListIterator it = fields.tqfind( tag ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) ) @@ -308,7 +308,7 @@ TQStringList LoginTask::readPrivacyItems( const TQCString & tag, Field::FieldLis void LoginTask::extractCustomStatuses( Field::FieldList & fields ) { - Field::FieldListIterator it = fields.find( NM_A_FA_CUSTOM_STATUSES ); + Field::FieldListIterator it = fields.tqfind( NM_A_FA_CUSTOM_STATUSES ); if ( it != fields.end() ) { if ( Field::MultiField * mf = dynamic_cast<Field::MultiField *>( *it ) ) @@ -319,21 +319,21 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields ) Field::MultiField * mf2 = dynamic_cast<Field::MultiField *>( *custStatIt ); if ( mf2 && ( mf2->tag() == NM_A_FA_STATUS ) ) { - GroupWise::CustomStatus custom; + GroupWise::CustomtqStatus custom; Field::FieldList fl2 = mf2->fields(); for ( Field::FieldListIterator custContentIt = fl2.begin(); custContentIt != fl2.end(); ++custContentIt ) { if ( Field::SingleField * sf3 = dynamic_cast<Field::SingleField *>( *custContentIt ) ) { if ( sf3->tag() == NM_A_SZ_TYPE ) - custom.status = (GroupWise::Status)sf3->value().toInt(); + custom.status = (GroupWise::tqStatus)sf3->value().toInt(); else if ( sf3->tag() == NM_A_SZ_DISPLAY_NAME ) custom.name = sf3->value().toString(); else if ( sf3->tag() == NM_A_SZ_MESSAGE_BODY ) custom.autoReply = sf3->value().toString(); } } - emit gotCustomStatus( custom ); + emit gotCustomtqStatus( custom ); } } } @@ -342,7 +342,7 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields ) void LoginTask::extractKeepalivePeriod( Field::FieldList & fields ) { - Field::FieldListIterator it = fields.find( NM_A_UD_KEEPALIVE ); + Field::FieldListIterator it = fields.tqfind( NM_A_UD_KEEPALIVE ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h index 3d745bf9..b099be6a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h @@ -31,8 +31,9 @@ using namespace GroupWise; class LoginTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - LoginTask( Task * parent ); + LoginTask( Task * tqparent ); ~LoginTask(); /** * Get the login fields ready to go @@ -57,7 +58,7 @@ signals: void gotContact( const ContactItem & ); void gotContactUserDetails( const GroupWise::ContactDetails & ); void gotPrivacySettings( bool locked, bool defaultDeny, const TQStringList & allowList, const TQStringList & denyList ); - void gotCustomStatus( const GroupWise::CustomStatus & ); + void gotCustomtqStatus( const GroupWise::CustomtqStatus & ); void gotKeepalivePeriod( int ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp index 10233a18..703c0582 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp @@ -23,7 +23,7 @@ #include "gwerror.h" #include "modifycontactlisttask.h" -ModifyContactListTask::ModifyContactListTask(Task* parent): RequestTask(parent) +ModifyContactListTask::ModifyContactListTask(Task* tqparent): RequestTask(tqparent) { } @@ -92,7 +92,7 @@ void ModifyContactListTask::processContactChange( Field::MultiField * container current = fl.findSingleField( NM_A_SZ_OBJECT_ID ); contact.id = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - contact.parentId = current->value().toInt(); + contact.tqparentId = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER ); contact.sequence = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); @@ -125,9 +125,9 @@ void ModifyContactListTask::processFolderChange( Field::MultiField * container ) // name current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); folder.name = current->value().toString(); - // parent + // tqparent current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - folder.parentId = current->value().toInt(); + folder.tqparentId = current->value().toInt(); if ( container->method() == NMFIELD_METHOD_ADD ) emit gotFolderAdded( folder ); else if ( container->method() == NMFIELD_METHOD_DELETE ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h index 2f5a4939..62d02bfa 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h @@ -24,7 +24,7 @@ #include "requesttask.h" /** -This is the parent of all tasks that manipulate the contact list. The server responds to each one in the same way, and this task contains a take() to process this response. +This is the tqparent of all tasks that manipulate the contact list. The server responds to each one in the same way, and this task contains a take() to process this response. @author SUSE AG */ @@ -34,8 +34,9 @@ using namespace GroupWise; class ModifyContactListTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - ModifyContactListTask(Task* parent); + ModifyContactListTask(Task* tqparent); ~ModifyContactListTask(); bool take( Transfer * transfer ); signals: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp index 4a24f44f..044a4e24 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp @@ -22,7 +22,7 @@ #include "movecontacttask.h" -MoveContactTask::MoveContactTask(Task* parent): NeedFolderTask(parent) +MoveContactTask::MoveContactTask(Task* tqparent): NeedFolderTask(tqparent) { // make the client tell the client app (Kopete) when we receive a contact connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); @@ -39,7 +39,7 @@ void MoveContactTask::moveContact( const ContactItem & contact, const int newPar // TODO: - write a contact_item_to_fields method and factor duplicate code like this out Field::FieldList contactFields; contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, contact.id ) ); - contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.parentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.tqparentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, contact.sequence ) ); if ( !contact.dn.isNull() ) contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, contact.dn ) ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h index ad3bce44..adeeb68d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h @@ -31,8 +31,9 @@ Moves a contact between folders on the server class MoveContactTask : public NeedFolderTask { Q_OBJECT + TQ_OBJECT public: - MoveContactTask(Task* parent); + MoveContactTask(Task* tqparent); ~MoveContactTask(); void moveContact( const ContactItem & contact, const int newParent ); void moveContactToNewFolder( const ContactItem & contact, const int newSequenceNumber, const TQString & folderDisplayName ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp index 12c7382a..842ef31c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp @@ -15,7 +15,7 @@ #include "needfoldertask.h" -NeedFolderTask::NeedFolderTask(Task* parent): ModifyContactListTask(parent) +NeedFolderTask::NeedFolderTask(Task* tqparent): ModifyContactListTask(tqparent) { } @@ -38,7 +38,7 @@ void NeedFolderTask::slotFolderAdded( const FolderItem & addedFolder ) // if this is the folder we were trying to create if ( m_folderDisplayName == addedFolder.name ) { - client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).arg( addedFolder.name ).arg( addedFolder.id ) ); + client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).tqarg( addedFolder.name ).tqarg( addedFolder.id ) ); m_folderId = addedFolder.id; } } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h index d1ad1a1e..167197e0 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h @@ -22,8 +22,9 @@ This Task is the ancestor of Tasks that may need to create a folder on the serve class NeedFolderTask : public ModifyContactListTask { Q_OBJECT + TQ_OBJECT public: - NeedFolderTask(Task* parent); + NeedFolderTask(Task* tqparent); ~NeedFolderTask(); void createFolder(); virtual void onFolderCreated() = 0; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp index d65a5a20..ae0f9456 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp @@ -27,7 +27,7 @@ using namespace GroupWise; -PollSearchResultsTask::PollSearchResultsTask(Task* parent): RequestTask(parent) +PollSearchResultsTask::PollSearchResultsTask(Task* tqparent): RequestTask(tqparent) { } @@ -59,7 +59,7 @@ bool PollSearchResultsTask::take( Transfer * transfer ) // look for the status code Field::FieldList responseFields = response->fields(); Field::SingleField * sf = responseFields.findSingleField( NM_A_SZ_STATUS ); - m_queryStatus = sf->value().toInt(); + m_querytqStatus = sf->value().toInt(); Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS ); if ( !resultsArray ) @@ -69,9 +69,9 @@ bool PollSearchResultsTask::take( Transfer * transfer ) } Field::FieldList matches = resultsArray->fields(); const Field::FieldListIterator end = matches.end(); - for ( Field::FieldListIterator it = matches.find( NM_A_FA_CONTACT ); + for ( Field::FieldListIterator it = matches.tqfind( NM_A_FA_CONTACT ); it != end; - it = matches.find( ++it, NM_A_FA_CONTACT ) ) + it = matches.tqfind( ++it, NM_A_FA_CONTACT ) ) { Field::MultiField * mf = static_cast<Field::MultiField *>( *it ); Field::FieldList contact = mf->fields(); @@ -79,7 +79,7 @@ bool PollSearchResultsTask::take( Transfer * transfer ) m_results.append( cd ); } - // first field: NM_A_SZ_STATUS contains + // first field: NM_A_SZ_STATUS tqcontains #define SEARCH_PENDING 0 #define SEARCH_INPROGRESS 1 #define SEARCH_COMPLETED 2 @@ -90,10 +90,10 @@ bool PollSearchResultsTask::take( Transfer * transfer ) // followed by NM_A_FA_RESULTS, looks like a getdetails // add an accessor to get at the results list of ContactItems, probably - if ( m_queryStatus != 2 ) - setError( m_queryStatus ); + if ( m_querytqStatus != 2 ) + setError( m_querytqStatus ); else - setSuccess( m_queryStatus ); + setSuccess( m_querytqStatus ); return true; } @@ -102,9 +102,9 @@ TQValueList< GroupWise::ContactDetails > PollSearchResultsTask::results() return m_results; } -int PollSearchResultsTask::queryStatus() +int PollSearchResultsTask::querytqStatus() { - return m_queryStatus; + return m_querytqStatus; } GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::FieldList & fields ) @@ -155,7 +155,7 @@ GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::Fiel Field::MultiField * propList = dynamic_cast<Field::MultiField*>( *it ); if ( propList ) { - TQString parentName = propList->tag(); + TQString tqparentName = propList->tag(); Field::FieldList propFields = propList->fields(); const Field::FieldListIterator end = propFields.end(); for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h index c03f75bb..a882a9b3 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h @@ -35,17 +35,18 @@ Search results are polled on the server, using the search handle supplied by the class PollSearchResultsTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: enum SearchResultCode { Pending=0, InProgess=1, Completed=2, TimeOut=3, Cancelled=4, Error=5 }; - PollSearchResultsTask(Task* parent); + PollSearchResultsTask(Task* tqparent); ~PollSearchResultsTask(); void poll( const TQString & queryHandle); bool take( Transfer * transfer ); - int queryStatus(); + int querytqStatus(); TQValueList< GroupWise::ContactDetails > results(); GroupWise::ContactDetails extractUserDetails( Field::FieldList & fields ); private: - int m_queryStatus; + int m_querytqStatus; TQValueList< GroupWise::ContactDetails > m_results; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp index 508b3306..2c9ac7ef 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp @@ -20,7 +20,7 @@ #include "privacyitemtask.h" -PrivacyItemTask::PrivacyItemTask( Task* parent) : RequestTask( parent ) +PrivacyItemTask::PrivacyItemTask( Task* tqparent) : RequestTask( tqparent ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h index 401dc765..de894186 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h @@ -31,8 +31,9 @@ Adds a contact to the server side allow or deny lists class PrivacyItemTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - PrivacyItemTask( Task* parent); + PrivacyItemTask( Task* tqparent); ~PrivacyItemTask(); void allow( const TQString & dn ); void deny( const TQString & dn ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp index 2b252ff5..9a3f8780 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp @@ -20,7 +20,7 @@ #include "rejectinvitetask.h" -RejectInviteTask::RejectInviteTask(Task* parent): RequestTask(parent) +RejectInviteTask::RejectInviteTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h index b82f4e77..b7ee62f0 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h @@ -31,8 +31,9 @@ Used to reject an invitation to join a conference class RejectInviteTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - RejectInviteTask(Task* parent); + RejectInviteTask(Task* tqparent); ~RejectInviteTask(); void reject( const GroupWise::ConferenceGuid & guid ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp index 44f54124..12645297 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp @@ -26,8 +26,8 @@ #include "requesttask.h" -RequestTask::RequestTask( Task * parent ) -: Task( parent ) +RequestTask::RequestTask( Task * tqparent ) +: Task( tqparent ) { } @@ -50,7 +50,7 @@ void RequestTask::onGo() { if ( transfer() ) { - client()->debug( TQString( "%1::onGo() - sending %2 fields" ).arg( className() ).arg( static_cast<Request *>( transfer() )->command() ) ); + client()->debug( TQString( "%1::onGo() - sending %2 fields" ).tqarg( className() ).tqarg( static_cast<Request *>( transfer() )->command() ) ); send( static_cast<Request *>( transfer() ) ); } else diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h index 71101fab..e12bd741 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h @@ -28,8 +28,9 @@ class Transfer; class RequestTask : public Task { Q_OBJECT + TQ_OBJECT public: - RequestTask( Task *parent ); + RequestTask( Task *tqparent ); bool take( Transfer * transfer ); virtual void onGo(); protected: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp index 87694eb4..e0e56634 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp @@ -40,7 +40,7 @@ using namespace GroupWise; -SearchChatTask::SearchChatTask(Task* parent): RequestTask(parent), m_polls( 0 ) +SearchChatTask::SearchChatTask(Task* tqparent): RequestTask(tqparent), m_polls( 0 ) { } @@ -91,9 +91,9 @@ void SearchChatTask::slotPollForResults() void SearchChatTask::slotGotPollResults() { GetChatSearchResultsTask * gcsrt = (GetChatSearchResultsTask *)sender(); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->queryStatus() << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->querytqStatus() << endl; m_polls++; - switch ( gcsrt->queryStatus() ) + switch ( gcsrt->querytqStatus() ) { case GetChatSearchResultsTask::GettingData: if ( m_polls < GW_POLL_MAXIMUM ) // restart timer diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h index ea887657..4d010ffe 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h @@ -35,10 +35,11 @@ This Task searches for chatrooms on the server class SearchChatTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: enum SearchType { FetchAll=0, SinceLastSearch }; - SearchChatTask(Task* parent); + SearchChatTask(Task* tqparent); ~SearchChatTask(); /** diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp index 1b64c47d..2d0522c3 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp @@ -39,7 +39,7 @@ using namespace GroupWise; -SearchUserTask::SearchUserTask(Task* parent): RequestTask(parent), m_polls( 0 ) +SearchUserTask::SearchUserTask(Task* tqparent): RequestTask(tqparent), m_polls( 0 ) { } @@ -50,7 +50,7 @@ SearchUserTask::~SearchUserTask() void SearchUserTask::search( const TQValueList<UserSearchQueryTerm> & query ) { - m_queryHandle = TQString::number( TQDateTime::currentDateTime().toTime_t () ); + m_queryHandle = TQString::number( TQDateTime::tqcurrentDateTime().toTime_t () ); Field::FieldList lst; if ( query.isEmpty() ) { @@ -102,9 +102,9 @@ void SearchUserTask::slotPollForResults() void SearchUserTask::slotGotPollResults() { PollSearchResultsTask * psrt = (PollSearchResultsTask *)sender(); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->queryStatus() << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->querytqStatus() << endl; m_polls++; - switch ( psrt->queryStatus() ) + switch ( psrt->querytqStatus() ) { case PollSearchResultsTask::Pending: case PollSearchResultsTask::InProgess: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h index d5347c73..5e79ac2f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h @@ -33,8 +33,9 @@ This Task performs user searching on the server class SearchUserTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - SearchUserTask(Task* parent); + SearchUserTask(Task* tqparent); ~SearchUserTask(); /** diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp index 9fa7d65e..60d9f986 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp @@ -20,7 +20,7 @@ #include "sendinvitetask.h" -SendInviteTask::SendInviteTask(Task* parent): RequestTask(parent) +SendInviteTask::SendInviteTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h index b08c7259..70672e3e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h @@ -33,7 +33,7 @@ This sends an invitation to a conference class SendInviteTask : public RequestTask { public: - SendInviteTask(Task* parent); + SendInviteTask(Task* tqparent); ~SendInviteTask(); void invite( const GroupWise::ConferenceGuid & guid, const TQStringList & invitees, const GroupWise::OutgoingMessage & msg ); private: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp index fdf1173f..13e65435 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp @@ -20,7 +20,7 @@ #include "sendmessagetask.h" -SendMessageTask::SendMessageTask(Task* parent): RequestTask(parent) +SendMessageTask::SendMessageTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h index 44559e15..95175d77 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h @@ -32,7 +32,7 @@ Sends messages to a particular conference on the server class SendMessageTask : public RequestTask { public: - SendMessageTask(Task* parent); + SendMessageTask(Task* tqparent); ~SendMessageTask(); void message( const TQStringList & recipientDNList, const OutgoingMessage & msg ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp index bf463407..696ffffa 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp @@ -22,7 +22,7 @@ using namespace GroupWise; -SetStatusTask::SetStatusTask(Task* parent): RequestTask(parent) +SetStatusTask::SetStatusTask(Task* tqparent): RequestTask(tqparent) { } @@ -30,20 +30,20 @@ SetStatusTask::~SetStatusTask() { } -void SetStatusTask::status( Status newStatus, const TQString &awayMessage, const TQString &autoReply ) +void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply ) { - if ( newStatus > GroupWise::Invalid ) + if ( newtqStatus > GroupWise::Invalid ) { - setError( 1, "Invalid Status" ); + setError( 1, "Invalid tqStatus" ); return; } - m_status = newStatus; + m_status = newtqStatus; m_awayMessage = awayMessage; m_autoReply = autoReply; Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newStatus ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newtqStatus ) ) ); if ( !awayMessage.isNull() ) lst.append( new Field::SingleField( NM_A_SZ_STATUS_TEXT, 0, NMFIELD_TYPE_UTF8, awayMessage ) ); if ( !autoReply.isNull() ) @@ -51,7 +51,7 @@ void SetStatusTask::status( Status newStatus, const TQString &awayMessage, const createTransfer( "setstatus", lst ); } -Status SetStatusTask::requestedStatus() const +tqStatus SetStatusTask::requestedtqStatus() const { return m_status; } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h index 4e41e681..72eaf9a4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h @@ -30,15 +30,16 @@ class SetStatusTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - SetStatusTask(Task* parent); + SetStatusTask(Task* tqparent); ~SetStatusTask(); - void status( GroupWise::Status newStatus, const TQString &awayMessage, const TQString &autoReply ); - GroupWise::Status requestedStatus() const; + void status( GroupWise::tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply ); + GroupWise::tqStatus requestedtqStatus() const; TQString awayMessage() const; TQString autoReply() const; private: - GroupWise::Status m_status; + GroupWise::tqStatus m_status; TQString m_awayMessage; TQString m_autoReply; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp index e7272402..fa360a45 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp @@ -22,7 +22,7 @@ #include "statustask.h" -StatusTask::StatusTask(Task* parent): EventTask(parent) +StatusTask::StatusTask(Task* tqparent): EventTask(tqparent) { registerEvent( GroupWise::StatusChange ); } @@ -37,8 +37,8 @@ bool StatusTask::take( Transfer * transfer ) if ( forMe( transfer, event ) ) { client()->debug( "Got a status change!" ); - client()->debug( TQString( "%1 changed status to %2, message: %3" ).arg( event->source() ).arg( event->status() ).arg( event->statusText() ) ); - emit gotStatus( event->source().lower(), event->status(), event->statusText() ); + client()->debug( TQString( "%1 changed status to %2, message: %3" ).tqarg( event->source() ).tqarg( event->status() ).tqarg( event->statusText() ) ); + emit gottqStatus( event->source().lower(), event->status(), event->statusText() ); return true; } else diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h index 2a57cd04..90d46bc7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h @@ -29,12 +29,13 @@ class StatusTask : public EventTask { Q_OBJECT + TQ_OBJECT public: - StatusTask(Task* parent); + StatusTask(Task* tqparent); ~StatusTask(); bool take( Transfer * transfer ); signals: - void gotStatus( const TQString & contactId, Q_UINT16 status, const TQString & statusText ); + void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp index 2a421752..f9136eca 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp @@ -22,7 +22,7 @@ #include "typingtask.h" -TypingTask::TypingTask(Task* parent): RequestTask(parent) +TypingTask::TypingTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h index 4f4da1cd..84fe6e46 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h @@ -31,9 +31,10 @@ class TypingTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - TypingTask(Task* parent); + TypingTask(Task* tqparent); ~TypingTask(); void typing( const GroupWise::ConferenceGuid & guid, const bool typing ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp index aa75441d..e1a863a7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp @@ -24,7 +24,7 @@ using namespace GroupWise; -UpdateContactTask::UpdateContactTask(Task* parent): UpdateItemTask(parent) +UpdateContactTask::UpdateContactTask(Task* tqparent): UpdateItemTask(tqparent) { } @@ -48,7 +48,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi { Field::FieldList contactFields; contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) ); - contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) ); if ( !(*it).dn.isNull() ) contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) ); @@ -61,7 +61,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi { Field::FieldList contactFields; contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) ); - contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) ); if ( !(*it).dn.isNull() ) contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h index 4126658e..5ced02a5 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h @@ -32,8 +32,9 @@ class UpdateContactTask : public UpdateItemTask { Q_OBJECT + TQ_OBJECT public: - UpdateContactTask(Task* parent); + UpdateContactTask(Task* tqparent); ~UpdateContactTask(); void renameContact( const TQString& newName, const TQValueList<GroupWise::ContactItem> & contactInstances ); TQString displayName(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp index 3f8ff7bf..af0785de 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp @@ -21,7 +21,7 @@ #include "updatefoldertask.h" -UpdateFolderTask::UpdateFolderTask(Task* parent): UpdateItemTask(parent) +UpdateFolderTask::UpdateFolderTask(Task* tqparent): UpdateItemTask(tqparent) { } @@ -39,7 +39,7 @@ void UpdateFolderTask::renameFolder( const TQString & newName, const GroupWise:: renamed.name = newName; // add the new version of the folder, marked add lst.append( new Field::MultiField( NM_A_FA_FOLDER, NMFIELD_METHOD_ADD, 0, NMFIELD_TYPE_ARRAY, folderToFields( renamed ) ) ); - // let our parent class package it up as a contactlist in a transfer + // let our tqparent class package it up as a contactlist in a transfer UpdateItemTask::item( lst ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h index 479a6bdd..90882a3d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h @@ -31,8 +31,9 @@ Renames a folder on the server class UpdateFolderTask : public UpdateItemTask { Q_OBJECT + TQ_OBJECT public: - UpdateFolderTask(Task* parent); + UpdateFolderTask(Task* tqparent); ~UpdateFolderTask(); void renameFolder( const TQString & newName, const GroupWise::FolderItem & existing ); protected: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp index 1af4ef12..95edb593 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp @@ -20,7 +20,7 @@ #include "updateitemtask.h" -UpdateItemTask::UpdateItemTask( Task* parent) : RequestTask( parent ) +UpdateItemTask::UpdateItemTask( Task* tqparent) : RequestTask( tqparent ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h index a087d276..a988e371 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h @@ -31,8 +31,9 @@ Rename a folder or contact on the server. In future may be used for changing th class UpdateItemTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - UpdateItemTask( Task* parent ); + UpdateItemTask( Task* tqparent ); ~UpdateItemTask(); void item( Field::FieldList updateItemFields ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h index fcd540fc..a40f337c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h +++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h @@ -20,18 +20,19 @@ #include "gwclientstream.h" #include "gwconnector.h" #include <qca.h> -#include "qcatlshandler.h" +#include "tqcatlshandler.h" #include "requestfactory.h" #include "request.h" #include "usertransfer.h" #include "coreprotocol.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class ClientStreamTest : public QApplication +class ClientStreamTest : public TQApplication { Q_OBJECT + TQ_OBJECT public: ClientStreamTest(int argc, char ** argv); diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp index 2dace60b..69cd1991 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp @@ -11,12 +11,12 @@ int main() { buildFakeContactList(); // look for a field in the list -/* if ( fl.find( NM_A_FA_MESSAGE ) != fl.end() ) +/* if ( fl.tqfind( NM_A_FA_MESSAGE ) != fl.end() ) printf( "Found a field, where there was supposed to be one :)\n" ); else printf( "Didn't find a field, where there was supposed to be one :(\n" ); Field::FieldListIterator it; - if ( (it = fl.find( NM_A_SZ_OBJECT_ID ) ) != fl.end() ) + if ( (it = fl.tqfind( NM_A_SZ_OBJECT_ID ) ) != fl.end() ) printf( "Found a field, where there was NOT supposed to be one :(\n" ); else printf( "Didn't find a field, where there wasn't supposed to be one :)\n" );*/ @@ -26,19 +26,19 @@ int main() printf( "\nNow testing find routines.\n"); // find the field containing the contact list - Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.find( NM_A_FA_CONTACT_LIST ) ) ); + Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.tqfind( NM_A_FA_CONTACT_LIST ) ) ); if ( clf ) { Field::FieldList cl = clf->fields(); // look for a folder in the list - Field::FieldListIterator it = cl.find( NM_A_FA_FOLDER ); + Field::FieldListIterator it = cl.tqfind( NM_A_FA_FOLDER ); if ( it != cl.end() ) printf( "Found the first folder :)\n"); else printf( "Didn't find the first folder, where did it go? :(\n"); printf( "Looking for a second folder :)\n"); - it = cl.find( ++it, NM_A_FA_FOLDER ); + it = cl.tqfind( ++it, NM_A_FA_FOLDER ); if ( it == cl.end() ) printf( "Didn't find a second folder :)\n" ); else @@ -62,15 +62,15 @@ void buildList() // sf - contactlist (empty field array) // sf - message body - Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) ); + Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) ); fl.append( sf ); - sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "maeuschen" ) ); + sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "maeuschen" ) ); fl.append( sf ); // nested list Field::FieldList nl; sf = new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UDWORD, 123 ); nl.append( sf ); - sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "bla bla" ) ); + sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "bla bla" ) ); nl.append( sf ); Field::MultiField* mf = new Field::MultiField( NM_A_FA_PARTICIPANTS, NMFIELD_METHOD_VALID, 0, NMFIELD_TYPE_ARRAY ); mf->setFields( nl ); diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp index 16527bba..21010e57 100644 --- a/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp @@ -19,8 +19,8 @@ #include "tlshandler.h" -TLSHandler::TLSHandler(TQObject *parent) -:TQObject(parent) +TLSHandler::TLSHandler(TQObject *tqparent) +:TQObject(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.h b/kopete/protocols/groupwise/libgroupwise/tlshandler.h index ede9d4e3..67c47409 100644 --- a/kopete/protocols/groupwise/libgroupwise/tlshandler.h +++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.h @@ -28,11 +28,12 @@ //#include<tqxml.h> //#include<tqdom.h> -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; diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp index ceb29632..315a60d0 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp @@ -20,8 +20,8 @@ #include "userdetailsmanager.h" -UserDetailsManager::UserDetailsManager( Client * parent, const char *name) - : TQObject(parent, name), m_client( parent ) +UserDetailsManager::UserDetailsManager( Client * tqparent, const char *name) + : TQObject(tqparent, name), m_client( tqparent ) { } @@ -41,8 +41,8 @@ bool UserDetailsManager::known( const TQString & dn ) { if ( dn == m_client->userDN() ) return true; - // TODO: replace with m_detailsMap.contains( dn ); - TQStringList::Iterator found = m_detailsMap.keys().find( dn ); + // TODO: replace with m_detailsMap.tqcontains( dn ); + TQStringList::Iterator found = m_detailsMap.keys().tqfind( dn ); // we always know the local user's details, so don't look them up return ( found !=m_detailsMap.keys().end() ); } @@ -85,10 +85,10 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU // don't request details we already have unless the caller specified this if ( onlyUnknown && known( *it ) ) break; - TQStringList::Iterator found = m_pendingDNs.find( *it ); + TQStringList::Iterator found = m_pendingDNs.tqfind( *it ); if ( found == m_pendingDNs.end() ) { - m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).arg( (*it) ) ); + m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).tqarg( (*it) ) ); requestList.append( *it ); m_pendingDNs.append( *it ); } @@ -110,7 +110,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU void UserDetailsManager::requestDetails( const TQString & dn, bool onlyUnknown ) { - m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).arg( dn ) ); + m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).tqarg( dn ) ); TQStringList list; list.append( dn ); requestDetails( list, onlyUnknown ); diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h index f5a5ff6c..e7ba7ac4 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h @@ -31,11 +31,12 @@ Several client event handling processes require that a contact's details are ava @author SUSE AG */ -class UserDetailsManager : public QObject +class UserDetailsManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - UserDetailsManager( Client * parent, const char *name = 0); + UserDetailsManager( Client * tqparent, const char *name = 0); ~UserDetailsManager(); /** * List of DNs that we have already received details for diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui index b5cfabcc..6b3d89f7 100644 --- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui +++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GroupWiseAccountPreferences</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GroupWiseAccountPreferences</cstring> </property> @@ -25,11 +25,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget11</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -40,7 +40,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox55</cstring> </property> @@ -51,15 +51,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -76,7 +76,7 @@ <string>The account name of your account.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_userId</cstring> </property> @@ -94,7 +94,7 @@ <cstring>m_password</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_autoConnect</cstring> </property> @@ -119,15 +119,15 @@ <enum>Horizontal</enum> </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> @@ -155,7 +155,7 @@ <string>The IP address or hostname of the server you would like to connect to (for example im.yourcorp.com).</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_server</cstring> </property> @@ -172,7 +172,7 @@ <string>The IP address or hostname of the server you would like to connect to (for example im.yourcorp.com).</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelPort</cstring> </property> @@ -200,7 +200,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>m_port</cstring> </property> @@ -240,7 +240,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -251,7 +251,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_alwaysAccept</cstring> </property> @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>91</height> @@ -279,14 +279,14 @@ </vbox> </widget> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelStatusMessage</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -316,5 +316,5 @@ <data format="PNG" length="866">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000032949444154388db59531681b6714c77f32373c8186ef0305eea005093258900eca26d30e3174a8a807d1c9ee940e5d4a276f09a414e22974ee609a4c75a0857a70a20c199ce93424e43414aee0c26910dc8105f7410df706413a7c915551db049a3e38b87bf7bedffddfc7ff7d578be398456c6c6cbce13d441cc7b5da02fcf4e8e99bde7a8f899b501515d959f64e10e71cd949c6e8d508e6cb7cb050fae49727444d87ed08a566dc0cea545a621b96725e62c522f312c4929ff9e7725e6203439282ec0bc72f74150c30c927d89690163f539619a044564973a1980ae54c01c136a1db518a0024808942780dead16a27e7e0ca55949a81668023b242fcd2901c394663072cd408ad75e18b6d43a7076143710aa1b9049ccd326e064a5979e8f0191cfc5878544368af1b24807caa4cfe507ef8aea0bf6dd8b92de7f00bc1562c95e64416e297f216aadcfa3ca43f10da1f8243112286871507fb05c3c7059d568bde96c5885b01af2d6e4a2db10dc8ff128e0fdd39f4cbaf8576dbe170702afcf6b86467bbce57df8680f0d3230767e0e62bdc55c5e53c476742fabbc318437f209886c3cd41d4b0f74049c78ef21476ef5846cf7ded2831848d55f0aa62816caade11adb7ed2fa0f71ce9d8619ac2e627824a45a72b00e413c5a95c0cf63e052bbe2014bfa738c3de3d251dfb0f8a80fda04e6480600113cc558a11a0e10b93a9225886cff04a8d10868662eab87f37271e59f2136f85a855bfda15f9594eb7a3b4ae0b933f95e161c5ceed88f254e97f2ad49b75eedf8562e2d8fb264355314da1dbada866abe47fedb106d01f78b71fec170c8f7276ef58da3de8f64a76bf6f634283730e9d2b9b8390ce0dae565c6a8e04b0710b746678f8a8e0e18382d173a1d7151c909fe4e84ccf57be3e76245b115143584ee73f27afc8e80b4c667e4c37b7054c8be1afde0de978a9c63485fea0457cec70aa089015ab9297e0938c240573cdb7651a4a7f20f43feb304a72aac2e73bd723da1fe5746ec0682bc26070f38c345905d7e238f6077c00dd8f85280211fcd91af84b02ef94a50c004502c1394813252f14575ca09839242f9484cb42df31e763edd237ff31d6c0ffa3fe17f0fb86c7715cfb1ba8bd86cc8d2decd30000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp index 5ece3882..5f48d727 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp @@ -45,8 +45,8 @@ #include "gwaddui.h" #include "userdetailsmanager.h" -GroupWiseAddContactPage::GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent, const char* name ) - : AddContactPage(parent, name) +GroupWiseAddContactPage::GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* tqparent, const char* name ) + : AddContactPage(tqparent, name) { m_account = static_cast<GroupWiseAccount *>( owner ); kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; @@ -73,7 +73,7 @@ GroupWiseAddContactPage::~GroupWiseAddContactPage() // i18n( "There was an error while carrying out your search. Please change your search terms or try again later." ) } -bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* parentContact ) +bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* tqparentContact ) { if ( validateData() ) { @@ -91,7 +91,7 @@ bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaConta else return false; - return ( account->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ); + return ( account->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ); } else return false; diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.h b/kopete/protocols/groupwise/ui/gwaddcontactpage.h index 209a601a..10a36e21 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.h +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.h @@ -41,8 +41,9 @@ class GroupWiseContactSearch; class GroupWiseAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent = 0, const char* name = 0 ); + GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* tqparent = 0, const char* name = 0 ); ~GroupWiseAddContactPage(); /** diff --git a/kopete/protocols/groupwise/ui/gwaddui.ui b/kopete/protocols/groupwise/ui/gwaddui.ui index 16859bef..6c360392 100644 --- a/kopete/protocols/groupwise/ui/gwaddui.ui +++ b/kopete/protocols/groupwise/ui/gwaddui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GroupWiseAddUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GroupWiseAddUI</cstring> </property> @@ -28,11 +28,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>m_tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>bg_addMethod</cstring> </property> @@ -54,7 +54,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_userName</cstring> </property> @@ -68,7 +68,7 @@ <string>Type some or all of the contact's name. Matches will be shown below</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>rb_userId</cstring> </property> @@ -79,7 +79,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>rb_userName</cstring> </property> @@ -90,7 +90,7 @@ <string>Userna&me:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_userId</cstring> </property> @@ -108,7 +108,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -133,5 +133,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp index 1cfee7ee..41b26f66 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp @@ -29,16 +29,16 @@ #include "gwchatpropsdialog.h" -GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( TQWidget * parent, const char * name ) - : KDialogBase( parent, name, false, i18n( "Chatroom properties" ), +GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( TQWidget * tqparent, const char * name ) + : KDialogBase( tqparent, name, false, i18n( "Chatroom properties" ), KDialogBase::Ok|KDialogBase::Cancel, Ok, true ), m_dirty( false ) { initialise(); } GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( const GroupWise::Chatroom & room, bool readOnly, - TQWidget * parent, const char * name ) - : KDialogBase( parent, name, false, i18n( "Chatroom properties" ), + TQWidget * tqparent, const char * name ) + : KDialogBase( tqparent, name, false, i18n( "Chatroom properties" ), KDialogBase::Ok|KDialogBase::Cancel, Ok, true ), m_dirty( false ) { initialise(); diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h index 7228bb57..d7ba18c3 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h @@ -41,16 +41,17 @@ class GroupWiseChatPropsWidget; class GroupWiseChatPropsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Construct an empty dialog */ - GroupWiseChatPropsDialog( TQWidget * parent, const char * name ); + GroupWiseChatPropsDialog( TQWidget * tqparent, const char * name ); /** * Construct a populated dialog */ GroupWiseChatPropsDialog( const GroupWise::Chatroom & room, bool readOnly, - TQWidget * parent, const char * name ); + TQWidget * tqparent, const char * name ); ~GroupWiseChatPropsDialog() {} diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui index ecb764b9..651a3b17 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GroupWiseChatPropsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GroupWiseChatPropsWidget</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_displayName</cstring> </property> @@ -27,15 +27,15 @@ <string>DISPLAY NAME</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>m_creator</cstring> </property> @@ -49,7 +49,7 @@ <string>The user who created the chatroom</string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel10_2</cstring> </property> @@ -60,7 +60,7 @@ <cstring>m_firstName_2</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblTopic</cstring> </property> @@ -71,7 +71,7 @@ <cstring>m_displayName</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="3"> + <widget class="TQLineEdit" row="1" column="3"> <property name="name"> <cstring>m_disclaimer</cstring> </property> @@ -85,7 +85,7 @@ <string>A disclaimer for users entering the chatroom</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>m__2_2</cstring> </property> @@ -96,7 +96,7 @@ <cstring>m_displayName_3</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_topic</cstring> </property> @@ -110,7 +110,7 @@ <string>The current topic of the discussion</string> </property> </widget> - <widget class="QLineEdit" row="2" column="3"> + <widget class="TQLineEdit" row="2" column="3"> <property name="name"> <cstring>m_query</cstring> </property> @@ -124,7 +124,7 @@ <string>UNKNOWN</string> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>textLabel11_2_2</cstring> </property> @@ -135,7 +135,7 @@ <cstring>m_lastName_2_2</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>m__2_2_2</cstring> </property> @@ -146,7 +146,7 @@ <cstring>m_displayName_3</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>lbl_displayName_2</cstring> </property> @@ -157,7 +157,7 @@ <cstring>m_displayName_2</cstring> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>m_description</cstring> </property> @@ -171,7 +171,7 @@ <string>General description of the chatroom</string> </property> </widget> - <widget class="QLineEdit" row="3" column="3"> + <widget class="TQLineEdit" row="3" column="3"> <property name="name"> <cstring>m_maxUsers</cstring> </property> @@ -185,7 +185,7 @@ <string>Maximum simultaneous users allowed in the chatroom</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -196,7 +196,7 @@ <cstring>m_firstName</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -207,7 +207,7 @@ <cstring>m_lastName</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>m_createdOn</cstring> </property> @@ -221,7 +221,7 @@ <string>Date and time the chatroom was created</string> </property> </widget> - <widget class="QCheckBox" row="4" column="2"> + <widget class="TQCheckBox" row="4" column="2"> <property name="name"> <cstring>m_archive</cstring> </property> @@ -235,7 +235,7 @@ <string>Indicates if the chatroom is being archived on the server</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>m_owner</cstring> </property> @@ -265,7 +265,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -276,7 +276,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_chkRead</cstring> </property> @@ -290,7 +290,7 @@ <string>General permission to read messages in the chatroom</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_chkWrite</cstring> </property> @@ -304,7 +304,7 @@ <string>General permission to write messages in the chatroom</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_chkModify</cstring> </property> @@ -320,7 +320,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -339,9 +339,9 @@ <string>Access permissions for specific users</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -384,7 +384,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp index b9021b1f..5c55310d 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp @@ -34,8 +34,8 @@ #include "gwchatsearchdialog.h" -GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n( "Search Chatrooms" ), +GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, false, i18n( "Search Chatrooms" ), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ) { m_widget = new GroupWiseChatSearchWidget( this ); diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h index c65cfa43..e22860d3 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h @@ -29,8 +29,9 @@ class GroupWiseChatSearchWidget; class GroupWiseChatSearchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * parent, const char * name ); + GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * tqparent, const char * name ); ~GroupWiseChatSearchDialog(); protected: void populateWidget(); diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui index f6f2014c..c239ce86 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GroupWiseChatSearchWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GroupWiseChatSearchWidget</cstring> </property> @@ -63,9 +63,9 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -89,14 +89,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>340</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_btnRefresh</cstring> </property> @@ -108,7 +108,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 92f4da11..7c7042dd 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -41,13 +41,13 @@ #include "gwcontactproperties.h" -GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *parent, const char *name) - : TQObject(parent, name) +GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *tqparent, const char *name) + : TQObject(tqparent, name) { init(); // set up the contents of the props widget m_propsWidget->m_userId->setText( contact->contactId() ); - m_propsWidget->m_status->setText( contact->onlineStatus().description() ); + m_propsWidget->m_status->setText( contact->onlinetqStatus().description() ); m_propsWidget->m_displayName->setText( contact->metaContact()->displayName() ); m_propsWidget->m_firstName->setText( contact->property( Kopete::Global::Properties::self()->firstName() ).value().toString() ); m_propsWidget->m_lastName->setText( contact->property( Kopete::Global::Properties::self()->lastName() ).value().toString() ); @@ -56,8 +56,8 @@ GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * conta m_dialog->show(); } -GroupWiseContactProperties::GroupWiseContactProperties( GroupWise::ContactDetails cd, TQWidget *parent, const char *name ) - : TQObject(parent, name) +GroupWiseContactProperties::GroupWiseContactProperties( GroupWise::ContactDetails cd, TQWidget *tqparent, const char *name ) + : TQObject(tqparent, name) { init(); // set up the contents of the props widget @@ -78,7 +78,7 @@ GroupWiseContactProperties::~GroupWiseContactProperties() void GroupWiseContactProperties::init() { - m_dialog = new KDialogBase( ::qt_cast<TQWidget*>( parent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); + m_dialog = new KDialogBase( ::tqqt_cast<TQWidget*>( tqparent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); m_propsWidget = new GroupWiseContactPropsWidget( m_dialog ); // set up the context menu and copy action m_copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), 0 ); @@ -137,7 +137,7 @@ void GroupWiseContactProperties::slotCopy() kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl; if ( m_propsWidget->m_propsView->currentItem() ) { - QClipboard *cb = kapp->clipboard(); + TQClipboard *cb = kapp->tqclipboard(); cb->setText( m_propsWidget->m_propsView->currentItem()->text( 1 ) ); } } diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.h b/kopete/protocols/groupwise/ui/gwcontactproperties.h index 226a6229..38cce07d 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.h +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.h @@ -32,18 +32,19 @@ Logic, wrapping UI, for displaying contact properties @author SUSE AG */ -class GroupWiseContactProperties : public QObject +class GroupWiseContactProperties : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Display properties given a GroupWiseContact */ - GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *parent, const char *name ); + GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *tqparent, const char *name ); /** * Display properties given a GroupWise::ContactDetails */ - GroupWiseContactProperties( GroupWise::ContactDetails contactDetails, TQWidget *parent = 0, const char *name = 0 ); + GroupWiseContactProperties( GroupWise::ContactDetails contactDetails, TQWidget *tqparent = 0, const char *name = 0 ); ~GroupWiseContactProperties(); protected: void setupProperties( TQMap< TQString, TQString > serverProps ); diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui index 3aece991..12e0deb2 100644 --- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GroupWiseContactPropsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GroupWiseContactPropsWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_userId</cstring> </property> @@ -46,15 +46,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>m_lastName</cstring> </property> @@ -68,15 +68,15 @@ <string>Change the display name used for this contact</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel14</cstring> </property> <property name="text"> - <string>Status:</string> + <string>tqStatus:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>m_displayName</cstring> </property> @@ -90,7 +90,7 @@ <string>Change the display name used for this contact</string> </property> </widget> - <widget class="QLabel" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>m_status</cstring> </property> @@ -98,7 +98,7 @@ <string>USER_STATUS</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -106,7 +106,7 @@ <string>First name:</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>lbl_displayName</cstring> </property> @@ -117,7 +117,7 @@ <cstring>m_displayName</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>m_firstName</cstring> </property> @@ -131,7 +131,7 @@ <string>Change the display name used for this contact</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -155,7 +155,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel15</cstring> </property> @@ -204,7 +204,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui index 868072ce..8c215959 100644 --- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui +++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GroupWiseContactSearchWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GroupWiseContactSearchWidget</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <grid> <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> @@ -38,7 +38,7 @@ <cstring>m_firstName</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -49,7 +49,7 @@ <cstring>m_userId</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -60,17 +60,17 @@ <cstring>m_title</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="2"> + <widget class="TQLineEdit" row="2" column="2"> <property name="name"> <cstring>m_userId</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="2"> + <widget class="TQLineEdit" row="0" column="2"> <property name="name"> <cstring>m_firstName</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -81,10 +81,10 @@ <cstring>m_dept</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> - <string>contains</string> + <string>tqcontains</string> </property> </item> <item> @@ -101,10 +101,10 @@ <cstring>m_userIdOperation</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> - <string>contains</string> + <string>tqcontains</string> </property> </item> <item> @@ -121,15 +121,15 @@ <cstring>m_firstNameOperation</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="2"> + <widget class="TQLineEdit" row="4" column="2"> <property name="name"> <cstring>m_dept</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> - <string>contains</string> + <string>tqcontains</string> </property> </item> <item> @@ -146,7 +146,7 @@ <cstring>m_lastNameOperation</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -157,7 +157,7 @@ <cstring>m_lastName</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>m_clear</cstring> </property> @@ -165,10 +165,10 @@ <string>Cl&ear</string> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <item> <property name="text"> - <string>contains</string> + <string>tqcontains</string> </property> </item> <item> @@ -185,17 +185,17 @@ <cstring>m_deptOperation</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="2"> + <widget class="TQLineEdit" row="3" column="2"> <property name="name"> <cstring>m_title</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>m_lastName</cstring> </property> </widget> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>m_search</cstring> </property> @@ -206,10 +206,10 @@ <bool>true</bool> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> - <string>contains</string> + <string>tqcontains</string> </property> </item> <item> @@ -242,7 +242,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -253,18 +253,18 @@ <cstring>m_results</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> - <string>Status</string> + <string>tqStatus</string> </property> <property name="clickable"> <bool>true</bool> @@ -316,15 +316,15 @@ <enum>AllColumns</enum> </property> </widget> - <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="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_details</cstring> </property> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>141</height> @@ -356,7 +356,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_matchCount</cstring> </property> @@ -382,5 +382,5 @@ <tabstop>m_details</tabstop> <tabstop>m_firstNameOperation</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui index 43a9af15..366cb717 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GroupWiseCustomStatusEdit</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GroupWiseCustomStatusEdit</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</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>m_name</cstring> </property> @@ -41,23 +41,23 @@ <string></string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> - <cstring>m_cmbStatus</cstring> + <cstring>m_cmbtqStatus</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> - <string>&Status:</string> + <string>&tqStatus:</string> </property> <property name="buddy" stdset="0"> <cstring>comboBox1</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -68,7 +68,7 @@ <cstring>lineEdit2</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -79,7 +79,7 @@ <cstring>lineEdit1</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>m_awayMessage</cstring> </property> @@ -88,5 +88,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui index 8c69aa76..df25aaef 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GroupWiseCustomStatusWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GroupWiseCustomStatusWidget</cstring> </property> @@ -52,15 +52,15 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_btnAdd</cstring> </property> @@ -68,7 +68,7 @@ <string>&Add</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_btnEdit</cstring> </property> @@ -76,7 +76,7 @@ <string>&Edit</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_btnRemove</cstring> </property> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -105,7 +105,7 @@ </widget> </hbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp index 7f049d7c..43ae480d 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp @@ -40,8 +40,8 @@ #include "gweditaccountwidget.h" -GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* theAccount) -: TQWidget( parent ), KopeteEditAccountWidget( theAccount ) +GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* tqparent, Kopete::Account* theAccount) +: TQWidget( tqparent ), KopeteEditAccountWidget( theAccount ) { kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; m_layout = new TQVBoxLayout( this ); diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.h b/kopete/protocols/groupwise/ui/gweditaccountwidget.h index 42a0400a..24171353 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.h +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.h @@ -36,8 +36,9 @@ class GroupWiseAccountPreferences; class GroupWiseEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* account); + GroupWiseEditAccountWidget( TQWidget* tqparent, Kopete::Account* account); ~GroupWiseEditAccountWidget(); diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui index 8b09cab6..13070437 100644 --- a/kopete/protocols/groupwise/ui/gwprivacy.ui +++ b/kopete/protocols/groupwise/ui/gwprivacy.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>GroupWisePrivacyWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GroupWisePrivacyWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,23 +24,23 @@ <string>Who can see my online status and send me messages:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <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="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -51,16 +51,16 @@ <cstring>m_allowList</cstring> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>m_allowList</cstring> </property> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -76,14 +76,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_btnBlock</cstring> </property> @@ -91,7 +91,7 @@ <string>&Block >></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_btnAllow</cstring> </property> @@ -109,14 +109,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>53</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_btnAdd</cstring> </property> @@ -124,7 +124,7 @@ <string>A&dd...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_btnRemove</cstring> </property> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>52</height> @@ -151,15 +151,15 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -170,7 +170,7 @@ <cstring>m_denyList</cstring> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>m_denyList</cstring> </property> @@ -179,7 +179,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_status</cstring> </property> @@ -189,5 +189,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp index f18d6737..462d53ee 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp @@ -36,7 +36,7 @@ #include "userdetailsmanager.h" #include "gwprivacydialog.h" -class PrivacyLBI : public QListBoxPixmap +class PrivacyLBI : public TQListBoxPixmap { public: PrivacyLBI( TQListBox * listBox, const TQPixmap & pixmap, const TQString & text, const TQString & dn ) @@ -48,8 +48,8 @@ private: TQString m_dn; }; -GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).arg( account->accountId() ), +GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ), m_dirty( false ), m_searchDlg(0) { m_privacy = new GroupWisePrivacyWidget( this ); @@ -343,7 +343,7 @@ void GroupWisePrivacyDialog::commitChanges() void GroupWisePrivacyDialog::errorNotConnected() { KMessageBox::queuedMessageBox( this, KMessageBox::Information, - i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").arg( m_account->accountId() ) ); + i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").tqarg( m_account->accountId() ) ); } #include "gwprivacydialog.moc" diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.h b/kopete/protocols/groupwise/ui/gwprivacydialog.h index 27ead5d8..0211e85e 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.h +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.h @@ -34,8 +34,9 @@ Logic for the UI part managing the allow and deny lists, and the default privacy class GroupWisePrivacyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * parent, const char * name ); + GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * tqparent, const char * name ); ~GroupWisePrivacyDialog(); protected: void commitChanges(); diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 6005f61a..d8846bbd 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -33,8 +33,8 @@ #include "gwreceiveinvitationdialog.h" -ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name) - : KDialogBase( i18n("Invitation to Conversation"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, parent, name, false ) +ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *tqparent, const char *name) + : KDialogBase( i18n("Invitation to Conversation"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, tqparent, name, false ) { m_account = account; m_guid = event.guid; @@ -50,7 +50,7 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co m_wid->m_contactName->setText( event.user ); m_wid->m_dateTime->setText( KGlobal::locale()->formatDateTime( event.timeStamp ) ); - m_wid->m_message->setText( TQString("<b>%1</b>").arg( event.message ) ); + m_wid->m_message->setText( TQString("<b>%1</b>").tqarg( event.message ) ); setMainWidget( m_wid ); } diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h index 529ceaa3..20cb28e6 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h @@ -31,8 +31,9 @@ This is the dialog that is shown when you receive an invitation to chat. class ReceiveInvitationDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name ); + ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *tqparent, const char *name ); ~ReceiveInvitationDialog(); signals: void invitationAccepted( bool, const GroupWise::ConferenceGuid & guid ); diff --git a/kopete/protocols/groupwise/ui/gwsearch.cpp b/kopete/protocols/groupwise/ui/gwsearch.cpp index 885b6192..dc0788eb 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.cpp +++ b/kopete/protocols/groupwise/ui/gwsearch.cpp @@ -37,11 +37,11 @@ #include "gwsearch.h" -class GWSearchResultsLVI : public QListViewItem +class GWSearchResultsLVI : public TQListViewItem { public: - GWSearchResultsLVI( TQListView * parent, GroupWise::ContactDetails details, int status, const TQPixmap & statusPM/*, const TQString & userId */) - : TQListViewItem( parent, TQString::null, details.givenName, details.surname, GroupWiseProtocol::protocol()->dnToDotted( details.dn ) ), m_details( details ), m_status( status ) + GWSearchResultsLVI( TQListView * tqparent, GroupWise::ContactDetails details, int status, const TQPixmap & statusPM/*, const TQString & userId */) + : TQListViewItem( tqparent, TQString(), details.givenName, details.surname, GroupWiseProtocol::protocol()->dnToDotted( details.dn ) ), m_details( details ), m_status( status ) { setPixmap( 0, statusPM ); } @@ -56,8 +56,8 @@ public: int m_status; }; -GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, TQWidget *parent, const char *name) - : GroupWiseContactSearchWidget(parent, name), m_account( account ), m_onlineOnly( onlineOnly ) +GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, TQWidget *tqparent, const char *name) + : GroupWiseContactSearchWidget(tqparent, name), m_account( account ), m_onlineOnly( onlineOnly ) { m_results->setSelectionMode( mode ); m_results->setAllColumnsShowFocus( true ); diff --git a/kopete/protocols/groupwise/ui/gwsearch.h b/kopete/protocols/groupwise/ui/gwsearch.h index ec57cfb1..c3aee10a 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.h +++ b/kopete/protocols/groupwise/ui/gwsearch.h @@ -33,9 +33,10 @@ Logic for searching for and displaying users and chat rooms using a GroupWiseCon class GroupWiseContactSearch : public GroupWiseContactSearchWidget { Q_OBJECT + TQ_OBJECT public: GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); ~GroupWiseContactSearch(); TQValueList< GroupWise::ContactDetails > selectedResults(); signals: @@ -46,7 +47,7 @@ protected slots: void slotClear(); void slotDoSearch(); void slotGotSearchResults(); - // shows a GroupWiseContactProperties for the selected contact. Dialog's parent is this instance + // shows a GroupWiseContactProperties for the selected contact. Dialog's tqparent is this instance void slotShowDetails(); void slotValidateSelection(); private: diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui index 28dd1a7d..08253705 100644 --- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui +++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ShowInvitationWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ShowInvitationWidget</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <grid> <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> @@ -35,7 +35,7 @@ <string><p align="right">From:</p></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -43,7 +43,7 @@ <string><p align="right">Sent:</p></string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_dateTime</cstring> </property> @@ -59,7 +59,7 @@ <string>INVITE_DATE_TIME</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_contactName</cstring> </property> @@ -69,7 +69,7 @@ </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_message</cstring> </property> @@ -82,19 +82,19 @@ <property name="text"> <string>INVITE_MESSAGE</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <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>textLabel6</cstring> </property> @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -121,7 +121,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cb_dontShowAgain</cstring> </property> @@ -131,5 +131,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |