diff options
Diffstat (limited to 'kopete/protocols/groupwise')
39 files changed, 125 insertions, 125 deletions
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index cb9c7928..2896ccc8 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -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 &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receivetqStatus( const TQString &, TQ_UINT16 , const TQString & ) ) ); + TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receiveStatus( 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::tqStatus, const TQString &, const TQString & ) ), TQT_SLOT( changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & ) ) ); + TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::Status, const TQString &, const TQString & ) ), TQT_SLOT( changeOurStatus( GroupWise::Status, const TQString &, const TQString & ) ) ); // conference events TQObject::connect( m_client, TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), @@ -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->settqStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) ); + m_client->setStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) ); else - m_client->settqStatus( ( GroupWise::tqStatus )status.internalStatus(), reason, configGroup()->readEntry( "AutoReply" ) ); + m_client->setStatus( ( GroupWise::Status )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 ( initialtqStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) && - ( ( GroupWise::tqStatus )initialtqStatus().internalStatus() != GroupWise::Unknown ) ) + if ( initialStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) && + ( ( GroupWise::Status )initialStatus().internalStatus() != GroupWise::Unknown ) ) { - 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" ) ); + 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" ) ); } } @@ -664,7 +664,7 @@ void GroupWiseAccount::slotCSDisconnected() TQValueList<GroupWiseChatSession *>::ConstIterator it; for ( it = m_chatSessions.begin() ; it != m_chatSessions.end(); ++it ) (*it)->setClosed(); - setAllContactstqStatus( protocol()->groupwiseOffline ); + setAllContactsStatus( 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->onlinetqStatus().description() << endl; - if ( sender->onlinetqStatus() == protocol()->groupwiseOffline ) { + kdDebug( GROUPWISE_DEBUG_GLOBAL) << "sender is: " << sender->onlineStatus().description() << endl; + if ( sender->onlineStatus() == protocol()->groupwiseOffline ) { sender->setMessageReceivedOffline( true ); } @@ -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->requesttqStatus( details.dn ); + m_client->requestStatus( details.dn ); } else kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Notified of existing temporary contact DN: " << details.dn << endl; return c; } -void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 status, const TQString &awayMessage ) +void GroupWiseAccount::receiveStatus( 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 ); @@ -1062,7 +1062,7 @@ void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 st kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't find " << contactId << endl; } -void GroupWiseAccount::changeOurtqStatus( GroupWise::tqStatus status, const TQString & awayMessage, const TQString & autoReply ) +void GroupWiseAccount::changeOurStatus( GroupWise::Status status, const TQString & awayMessage, const TQString & autoReply ) { if ( status == GroupWise::Offline ) myself()->setOnlineStatus( protocol()->groupwiseAppearOffline ); @@ -1189,7 +1189,7 @@ void GroupWiseAccount::receiveContactCreated() else { client()->requestDetails( TQStringList( cct->dn() ) ); - client()->requesttqStatus( cct->dn() ); + client()->requestStatus( cct->dn() ); } } else @@ -1400,7 +1400,7 @@ void GroupWiseAccount::slotSetAutoReply() void GroupWiseAccount::slotTestRTFize() { /* bool ok; - const TQString query = TQString::tqfromLatin1("Enter a string to rtfize:"); + const TQString query = TQString::fromLatin1("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;*/ diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h index f05f00a1..ff6cca19 100644 --- a/kopete/protocols/groupwise/gwaccount.h +++ b/kopete/protocols/groupwise/gwaccount.h @@ -225,11 +225,11 @@ protected slots: /** * A contact changed status */ - void receivetqStatus( const TQString &, TQ_UINT16, const TQString & ); + void receiveStatus( const TQString &, TQ_UINT16, const TQString & ); /** * Our status changed on the server */ - void changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & ); + void changeOurStatus( GroupWise::Status, const TQString &, const TQString & ); /** * Called when we've been disconnected for logging in as this user somewhere else */ @@ -307,7 +307,7 @@ protected: /** * Sends a status message to the server - called by the status specific slotGoAway etc */ - //void settqStatus( GroupWise::tqStatus status, const TQString & reason = TQString() ); + //void setStatus( GroupWise::Status status, const TQString & reason = TQString() ); int handleTLSWarning (int warning, TQString server, TQString accountId); diff --git a/kopete/protocols/groupwise/gwaddui.ui b/kopete/protocols/groupwise/gwaddui.ui index 6302f869..fc7fff68 100644 --- a/kopete/protocols/groupwise/gwaddui.ui +++ b/kopete/protocols/groupwise/gwaddui.ui @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 11f2d23b..98fd1f81 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -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()->onlinetqStatus() != protocol()->groupwiseAppearOffline */) + if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlineStatus() != protocol()->groupwiseAppearOffline */) return true; - if ( !account()->isConnected()/* || account()->myself()->onlinetqStatus() == protocol()->groupwiseAppearOffline*/ ) + if ( !account()->isConnected()/* || account()->myself()->onlineStatus() == protocol()->groupwiseAppearOffline*/ ) return false; // fallback, something went wrong @@ -222,21 +222,21 @@ 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->onlinetqStatus() ); + setOnlineStatus( this->onlineStatus() ); } void GroupWiseContact::setOnlineStatus( const Kopete::OnlineStatus& status ) { setMessageReceivedOffline( false ); - if ( status == protocol()->groupwiseAwayIdle && status != onlinetqStatus() ) + if ( status == protocol()->groupwiseAwayIdle && status != onlineStatus() ) setIdleTime( 1 ); - else if ( onlinetqStatus() == protocol()->groupwiseAwayIdle && status != onlinetqStatus() ) + else if ( onlineStatus() == protocol()->groupwiseAwayIdle && status != onlineStatus() ) 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::tqfromLatin1("msn_blocked"), + protocol() , status.internalStatus()+15 , TQString::fromLatin1("msn_blocked"), i18n("%1|Blocked").tqarg( status.description() ) ) ); } else diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index 424a1545..5389e4ac 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -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()->onlinetqStatus() != GroupWiseProtocol::protocol()->groupwiseAppearOffline ) ) + ( account()->myself()->onlineStatus() != 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()->onlinetqStatus() == ( static_cast<GroupWiseProtocol *>( protocol() ) )->groupwiseAppearOffline ) + else*/ if ( account()->myself()->onlineStatus() == ( 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 ); @@ -330,7 +330,7 @@ void GroupWiseChatSession::slotInviteContact( Kopete::Contact * contact ) } else { - TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L; + TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 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()->tqtopLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 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()->tqtopLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 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->onlinetqStatus() ); + invitee->setOnlineStatus( c->onlineStatus() ); // TODO: we could set all the placeholder's properties etc here too addContact( invitee, true ); m_invitees.append( invitee ); @@ -501,14 +501,14 @@ void GroupWiseChatSession::updateArchiving() void GroupWiseChatSession::slotShowSecurity() { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : Kopete::UI::Global::mainWidget() ); KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security Status" ) ); } void GroupWiseChatSession::slotShowArchiving() { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : Kopete::UI::Global::mainWidget() ); KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving Status" ) ); } diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 0b4d351a..cfb506da 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -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::tqfromLatin1("{\\rtf1\\ansi\n" + TQString rtfTemplate = TQString::fromLatin1("{\\rtf1\\ansi\n" "{\\fonttbl{\\f0\\fnil Unknown;}}\n" "{\\colortbl ;\\red0\\green0\\blue0;}\n" "\\uc1\\cf1\\f0\\fs18 %1\\par\n}"); diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index e7395157..f24946c5 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::CustomtqStatus> customStatuses; + TQValueList<GroupWise::CustomStatus> customStatuses; TQTimer * keepAliveTimer; }; @@ -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( gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ), - TQT_SLOT( lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ) ); + connect( login, TQT_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ), + TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) ); connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) ); @@ -185,7 +185,7 @@ int Client::port() return d->port; } -TQValueList<GroupWise::CustomtqStatus> Client::customStatuses() +TQValueList<GroupWise::CustomStatus> 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( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); + connect( st, TQT_SIGNAL( gotStatus( 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,7 +216,7 @@ void Client::initialiseEventTasks() connect( cont, TQT_SIGNAL( connectedElsewhere() ), TQT_SIGNAL( connectedElsewhere() ) ); } -void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply ) +void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ) { debug( TQString("Setting status to %1").tqarg( status ) );; SetStatusTask * sst = new SetStatusTask( d->root ); @@ -226,11 +226,11 @@ void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, c // TODO: set status change in progress flag } -void Client::requesttqStatus( const TQString & userDN ) +void Client::requestStatus( const TQString & userDN ) { GetStatusTask * gst = new GetStatusTask( d->root ); gst->userDN( userDN ); - connect( gst, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); + connect( gst, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); gst->go( true ); } @@ -348,7 +348,7 @@ void Client::sst_statusChanged() const SetStatusTask * sst = (SetStatusTask *)sender(); if ( sst->success() ) { - emit ourStatusChanged( sst->requestedtqStatus(), sst->awayMessage(), sst->autoReply() ); + emit ourStatusChanged( sst->requestedStatus(), sst->awayMessage(), sst->autoReply() ); } } @@ -402,7 +402,7 @@ void Client::jct_joinConfCompleted() emit conferenceJoined( jct->guid(), jct->participants(), jct->invitees() ); } -void Client::lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & custom ) +void Client::lt_gotCustomStatus( const GroupWise::CustomStatus & custom ) { d->customStatuses.append( custom ); } @@ -431,7 +431,7 @@ TQString Client::password() TQString Client::userAgent() { - return TQString::tqfromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname ); + return TQString::fromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname ); } TQCString Client::ipAddress() diff --git a/kopete/protocols/groupwise/libgroupwise/client.h b/kopete/protocols/groupwise/libgroupwise/client.h index 8bdd236d..542d32eb 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.h +++ b/kopete/protocols/groupwise/libgroupwise/client.h @@ -92,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 settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply ); + void setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ); /** * Send a message @@ -118,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 requesttqStatus( const TQString & userDN ); + void requestStatus( const TQString & userDN ); /** * Add a contact to the contact list @@ -211,7 +211,7 @@ fd * @param password /** * Obtain the list of custom statuses stored on the server */ - TQValueList<GroupWise::CustomtqStatus> customStatuses(); + TQValueList<GroupWise::CustomStatus> customStatuses(); /** * Get a reference to the RequestFactory for this Client. @@ -281,7 +281,7 @@ fd * @param password /** * Our status changed on the server */ - void ourStatusChanged( GroupWise::tqStatus status, const TQString & statusText, const TQString & autoReply ); + void ourStatusChanged( GroupWise::Status status, const TQString & statusText, const TQString & autoReply ); /** CONFERENCE (MANAGEMENT) EVENTS */ /** @@ -371,7 +371,7 @@ fd * @param password /** * Receive a custom status during login and record it */ - void lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ); + void lt_gotCustomStatus( const GroupWise::CustomStatus & ); /** * Notify us of the keepalive period contained in the login response */ diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp index b6ff646d..6ea65595 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp @@ -71,7 +71,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) // now create an event object //HACK: lowercased DN - EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::tqcurrentDateTime() ); + EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::currentDateTime() ); // 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 @@ -97,7 +97,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) return 0; } debug( TQString( "got status: %1").tqarg( status ) ); - tentative->settqStatus( status ); + tentative->setStatus( status ); debug( TQString( "tentative status: %1").tqarg( tentative->status() ) ); tentative->setStatusText( statusText ); break; @@ -116,7 +116,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) } tentative->setFlags( flags ); break; - case UndeliverabletqStatus: //102 - GUID + case UndeliverableStatus: //102 - GUID case ConferenceClosed: //105 case ConferenceInviteNotify://118 case ConferenceReject: //119 diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h index 97e48c22..bfcf732f 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h @@ -58,7 +58,7 @@ class EventTransfer; From gwerror.h: enum Event { InvalidRecipient = 101, NOTHANDLED - UndeliverabletqStatus = 102, + UndeliverableStatus = 102, NOTHANDLED * StatusChange = 103, TQ_UINT16 STATUS diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp index be645abb..fb9ab8b3 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp @@ -60,9 +60,9 @@ bool EventTransfer::hasMessage() return ( m_contentFlags & Message ); } -bool EventTransfer::hastqStatus() +bool EventTransfer::hasStatus() { - return ( m_contentFlags & tqStatus ); + return ( m_contentFlags & Status ); } bool EventTransfer::hasStatusText() @@ -131,10 +131,10 @@ void EventTransfer::setMessage( const TQString & message ) m_message = message; } -void EventTransfer::settqStatus( const TQ_UINT16 intqStatus ) +void EventTransfer::setStatus( const TQ_UINT16 inStatus ) { - m_contentFlags |= tqStatus; - m_status = intqStatus; + m_contentFlags |= Status; + m_status = inStatus; } void EventTransfer::setStatusText( const TQString & statusText ) diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h index 594d0d16..ad325619 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, - tqStatus = 0x00000040, + Status = 0x00000040, StatusText = 0x00000080 }; /** * Constructor @@ -70,7 +70,7 @@ public: bool hasGuid(); bool hasFlags(); bool hasMessage(); - bool hastqStatus(); + bool hasStatus(); bool hasStatusText(); /** @@ -92,7 +92,7 @@ public: void setGuid( const GroupWise::ConferenceGuid & guid ); void setFlags( const TQ_UINT32 flags ); void setMessage( const TQString & message ); - void settqStatus( const TQ_UINT16 status ); + void setStatus( const TQ_UINT16 status ); void setStatusText( const TQString & statusText); private: diff --git a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h index 5349fd30..4e73955a 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 UsertqStatus { Participating, NotParticipating }; + enum UserStatus { 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; - UsertqStatus usertqStatus; + UserStatus userStatus; 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/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h index f5de53ce..f19d3d39 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwerror.h +++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h @@ -36,7 +36,7 @@ typedef TQ_UINT16 NMERR_T; namespace GroupWise { - enum tqStatus { Unknown = 0, + enum Status { Unknown = 0, Offline = 1, Available = 2, Busy = 3, @@ -58,7 +58,7 @@ namespace GroupWise }; enum Event { InvalidRecipient = 101, - UndeliverabletqStatus = 102, + UndeliverableStatus = 102, StatusChange = 103, ContactAdd = 104, ConferenceClosed = 105, @@ -164,9 +164,9 @@ namespace GroupWise int operation; }; - struct CustomtqStatus + struct CustomStatus { - GroupWise::tqStatus status; + GroupWise::Status status; TQString name; TQString autoReply; }; diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp index 9aa7d80b..7e7dbeed 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp +++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp @@ -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::tqfromLatin1(cs); + return TQString::fromLatin1(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::tqfromLatin1(cs); + return TQString::fromLatin1(cs); } bool Cert::fromPEM(const TQString &str) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp index 7744552c..a62cf022 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp @@ -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_querytqStatus = (SearchResultCode)sf->value().toInt(); + m_queryStatus = (SearchResultCode)sf->value().toInt(); Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS ); if ( !resultsArray ) @@ -82,12 +82,12 @@ bool GetChatSearchResultsTask::take( Transfer * transfer ) m_results.append( cd ); } - if ( m_querytqStatus != DataRetrieved ) - setError( m_querytqStatus ); + if ( m_queryStatus != DataRetrieved ) + setError( m_queryStatus ); else { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << " we won!" << endl; - setSuccess( m_querytqStatus ); + setSuccess( m_queryStatus ); } return true; } @@ -97,9 +97,9 @@ TQValueList< GroupWise::ChatroomSearchResult > GetChatSearchResultsTask::results return m_results; } -int GetChatSearchResultsTask::querytqStatus() +int GetChatSearchResultsTask::queryStatus() { - return m_querytqStatus; + return m_queryStatus; } 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 bebe8ff7..5671a122 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h @@ -42,11 +42,11 @@ class GetChatSearchResultsTask : public RequestTask ~GetChatSearchResultsTask(); void poll( int queryHandle); bool take( Transfer * transfer ); - int querytqStatus(); + int queryStatus(); TQValueList< GroupWise::ChatroomSearchResult > results(); private: GroupWise::ChatroomSearchResult extractChatDetails( Field::FieldList & fields ); - SearchResultCode m_querytqStatus; + SearchResultCode m_queryStatus; TQValueList< GroupWise::ChatroomSearchResult > m_results; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp index 86179b62..2b77e33e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp @@ -61,7 +61,7 @@ bool GetStatusTask::take( Transfer * transfer ) // 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() here - emit gottqStatus( m_userDN, status, TQString() ); + emit gotStatus( 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 bd291c62..aec5050f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h @@ -37,7 +37,7 @@ public: void userDN( const TQString & dn ); bool take( Transfer * transfer ); signals: - void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); + void gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); private: TQString m_userDN; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index f3d55583..e2637807 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -36,7 +36,7 @@ LoginTask::~LoginTask() void LoginTask::initialise() { - TQString command = TQString::tqfromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( client()->port() ); + TQString command = TQString::fromLatin1("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() ) ); @@ -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::CustomtqStatus custom; + GroupWise::CustomStatus 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::tqStatus)sf3->value().toInt(); + custom.status = (GroupWise::Status)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 gotCustomtqStatus( custom ); + emit gotCustomStatus( custom ); } } } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h index f37add97..fdeaeb9d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h @@ -58,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 gotCustomtqStatus( const GroupWise::CustomtqStatus & ); + void gotCustomStatus( const GroupWise::CustomStatus & ); void gotKeepalivePeriod( int ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp index 38870112..d65a5a20 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp @@ -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_querytqStatus = sf->value().toInt(); + m_queryStatus = sf->value().toInt(); Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS ); if ( !resultsArray ) @@ -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_querytqStatus != 2 ) - setError( m_querytqStatus ); + if ( m_queryStatus != 2 ) + setError( m_queryStatus ); else - setSuccess( m_querytqStatus ); + setSuccess( m_queryStatus ); return true; } @@ -102,9 +102,9 @@ TQValueList< GroupWise::ContactDetails > PollSearchResultsTask::results() return m_results; } -int PollSearchResultsTask::querytqStatus() +int PollSearchResultsTask::queryStatus() { - return m_querytqStatus; + return m_queryStatus; } GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::FieldList & fields ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h index ccf0560b..c69b7e0c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h @@ -42,11 +42,11 @@ public: ~PollSearchResultsTask(); void poll( const TQString & queryHandle); bool take( Transfer * transfer ); - int querytqStatus(); + int queryStatus(); TQValueList< GroupWise::ContactDetails > results(); GroupWise::ContactDetails extractUserDetails( Field::FieldList & fields ); private: - int m_querytqStatus; + int m_queryStatus; TQValueList< GroupWise::ContactDetails > m_results; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp index 946450e9..87694eb4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp @@ -91,9 +91,9 @@ void SearchChatTask::slotPollForResults() void SearchChatTask::slotGotPollResults() { GetChatSearchResultsTask * gcsrt = (GetChatSearchResultsTask *)sender(); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->querytqStatus() << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->queryStatus() << endl; m_polls++; - switch ( gcsrt->querytqStatus() ) + switch ( gcsrt->queryStatus() ) { case GetChatSearchResultsTask::GettingData: if ( m_polls < GW_POLL_MAXIMUM ) // restart timer diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp index 3dde5297..1b64c47d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp @@ -50,7 +50,7 @@ SearchUserTask::~SearchUserTask() void SearchUserTask::search( const TQValueList<UserSearchQueryTerm> & query ) { - m_queryHandle = TQString::number( TQDateTime::tqcurrentDateTime().toTime_t () ); + m_queryHandle = TQString::number( TQDateTime::currentDateTime().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->querytqStatus() << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->queryStatus() << endl; m_polls++; - switch ( psrt->querytqStatus() ) + switch ( psrt->queryStatus() ) { case PollSearchResultsTask::Pending: case PollSearchResultsTask::InProgess: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp index 817df4a6..bf463407 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp @@ -30,20 +30,20 @@ SetStatusTask::~SetStatusTask() { } -void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply ) +void SetStatusTask::status( Status newStatus, const TQString &awayMessage, const TQString &autoReply ) { - if ( newtqStatus > GroupWise::Invalid ) + if ( newStatus > GroupWise::Invalid ) { setError( 1, "Invalid Status" ); return; } - m_status = newtqStatus; + m_status = newStatus; m_awayMessage = awayMessage; m_autoReply = autoReply; Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newtqStatus ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newStatus ) ) ); 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( tqStatus newtqStatus, const TQString &awayMessage, c createTransfer( "setstatus", lst ); } -tqStatus SetStatusTask::requestedtqStatus() const +Status SetStatusTask::requestedStatus() const { return m_status; } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h index 0c316220..4a7a753d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h @@ -34,12 +34,12 @@ Q_OBJECT public: SetStatusTask(Task* parent); ~SetStatusTask(); - void status( GroupWise::tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply ); - GroupWise::tqStatus requestedtqStatus() const; + void status( GroupWise::Status newStatus, const TQString &awayMessage, const TQString &autoReply ); + GroupWise::Status requestedStatus() const; TQString awayMessage() const; TQString autoReply() const; private: - GroupWise::tqStatus m_status; + GroupWise::Status 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 7076324a..79435010 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp @@ -38,7 +38,7 @@ bool StatusTask::take( Transfer * transfer ) { client()->debug( "Got a status change!" ); 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() ); + emit gotStatus( 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 de5839d7..cc14bace 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h @@ -35,7 +35,7 @@ public: ~StatusTask(); bool take( Transfer * transfer ); signals: - void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); + void gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp index 0eb61409..2dace60b 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp @@ -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::tqfromLatin1( "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::fromLatin1( "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::tqfromLatin1( "maeuschen" ) ); + sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "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::tqfromLatin1( "bla bla" ) ); + sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "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/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui index 21f774b5..ce17003c 100644 --- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui +++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>91</height> diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui index 63ffca38..8f7a3b65 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>340</width> <height>20</height> diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index e7b6ecb2..4a7575e2 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -47,7 +47,7 @@ GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * conta init(); // set up the contents of the props widget m_propsWidget->m_userId->setText( contact->contactId() ); - m_propsWidget->m_status->setText( contact->onlinetqStatus().description() ); + m_propsWidget->m_status->setText( contact->onlineStatus().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() ); diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui index b403abec..b4d70037 100644 --- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui @@ -73,7 +73,7 @@ <cstring>textLabel14</cstring> </property> <property name="text"> - <string>tqStatus:</string> + <string>Status:</string> </property> </widget> <widget class="TQLineEdit" row="2" column="1"> diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui index e6c6a2f6..9847a23c 100644 --- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui +++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui @@ -264,7 +264,7 @@ <widget class="TQListView"> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="clickable"> <bool>true</bool> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>141</height> diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui index 9ef4caad..9c486269 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui @@ -43,7 +43,7 @@ </widget> <widget class="TQComboBox" row="0" column="1"> <property name="name"> - <cstring>m_cmbtqStatus</cstring> + <cstring>m_cmbStatus</cstring> </property> </widget> <widget class="TQLabel" row="0" column="0"> @@ -51,7 +51,7 @@ <cstring>textLabel3</cstring> </property> <property name="text"> - <string>&tqStatus:</string> + <string>&Status:</string> </property> <property name="buddy" stdset="0"> <cstring>comboBox1</cstring> diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui index 821c6030..7afcd487 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui index 1f4b6bcb..0fa2cd65 100644 --- a/kopete/protocols/groupwise/ui/gwprivacy.ui +++ b/kopete/protocols/groupwise/ui/gwprivacy.ui @@ -76,7 +76,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>53</height> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>52</height> diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui index 48c061a9..4b23a370 100644 --- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui +++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> |