summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/groupwise/libgroupwise
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/groupwise/libgroupwise')
-rw-r--r--kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp10
-rw-r--r--kopete/protocols/groupwise/libgroupwise/chatroommanager.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/client.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/eventtransfer.h4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwfield.cpp12
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwfield.h6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/privacymanager.cpp14
-rw-r--r--kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp8
-rw-r--r--kopete/protocols/groupwise/libgroupwise/rtf.cc16
-rw-r--r--kopete/protocols/groupwise/libgroupwise/rtf.ll16
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp8
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp8
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp18
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp10
-rw-r--r--kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp6
22 files changed, 84 insertions, 84 deletions
diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
index 87333c41..d285b8af 100644
--- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
@@ -29,7 +29,7 @@
#include "chatroommanager.h"
ChatroomManager::ChatroomManager( Client * tqparent, const char *name)
- : TQObject(tqparent, name), m_client( tqparent ), m_tqreplace( false )
+ : TQObject(tqparent, name), m_client( tqparent ), m_replace( false )
{
}
@@ -49,7 +49,7 @@ GroupWise::ChatroomMap ChatroomManager::rooms()
void ChatroomManager::getChatrooms( bool refresh )
{
- m_tqreplace = !refresh;
+ m_replace = !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_tqreplace )
+ if ( m_replace )
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.tqcontains( it.key() ) )
+ if ( m_rooms.contains( 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.tqcontains( displayName ) */)
+ if ( 0 /*m_rooms.contains( displayName ) */)
emit gotProperties( m_rooms[ displayName ] );
else
{
diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
index 60f55b01..2cb73cbf 100644
--- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
@@ -61,7 +61,7 @@ class ChatroomManager : public TQObject
private:
Client * m_client;
GroupWise::ChatroomMap m_rooms;
- bool m_tqreplace;
+ bool m_replace;
};
#endif
diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp
index c91f652d..e7395157 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/client.cpp
@@ -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.tqreplace( rx, "</span></span></span>" );
+ transformedEvent.message.replace( rx, "</span></span></span>" );
// missing linebreak after first line of an encrypted message
TQRegExp ry("-----BEGIN PGP MESSAGE----- </span> </span> </span>");
- transformedEvent.message.tqreplace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" );
+ transformedEvent.message.replace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" );
emit messageReceived( transformedEvent );
}
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
index 7b071f35..79ecf419 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
@@ -185,7 +185,7 @@ Transfer* CoreProtocol::incomingTransfer()
void cp_dump( const TQByteArray &bytes )
{
#ifdef LIBGW_DEBUG
- CoreProtocol::debug( TQString( "tqcontains: %1 bytes" ).tqarg( bytes.count() ) );
+ CoreProtocol::debug( TQString( "contains: %1 bytes" ).tqarg( bytes.count() ) );
for ( uint i = 0; i < bytes.count(); ++i )
{
printf( "%02x ", bytes[ i ] );
@@ -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.tqreplace( "%20", "+" );
+// encoded.replace( "%20", "+" );
// dout << encoded.ascii();
snprintf( valString, NMFIELD_MAX_STR_LENGTH, "%s", url_escape_string( sField->value().toString().utf8() ).data() );
diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
index f08e350e..b55ba48e 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
@@ -58,11 +58,11 @@ public:
EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp );
~EventTransfer();
/**
- * Access the bittqmask that describes the transfer's contents. Use @ref Contents to determine what it tqcontains
+ * Access the bittqmask that describes the transfer's contents. Use @ref Contents to determine what it contains
*/
TQ_UINT32 contents();
/**
- * Convenience accessors to see what the transfer tqcontains
+ * Convenience accessors to see what the transfer contains
*/
bool hasEventType();
bool hasSource();
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index e2e5269a..8b5f9708 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -378,7 +378,7 @@ void cs_dump( const TQByteArray &bytes )
{
//#define GW_CLIENTSTREAM_DEBUG 1
#ifdef GW_CLIENTSTREAM_DEBUG
- CoreProtocol::debug( TQString( "tqcontains: %1 bytes " ).tqarg( bytes.count() ) );
+ CoreProtocol::debug( TQString( "contains: %1 bytes " ).tqarg( bytes.count() ) );
uint count = 0;
while ( count < bytes.count() )
{
diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp
index 94f82937..a89f2057 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp
@@ -36,16 +36,16 @@ FieldList::~FieldList()
{
}
-FieldListIterator FieldList::tqfind( TQCString tag )
+FieldListIterator FieldList::find( TQCString tag )
{
FieldListIterator it = begin();
- return tqfind( it, tag );
+ return find( it, tag );
}
-FieldListIterator FieldList::tqfind( FieldListIterator &it, TQCString tag )
+FieldListIterator FieldList::find( FieldListIterator &it, TQCString tag )
{
FieldListIterator theEnd = end();
- //cout << "FieldList::tqfind() looking for " << tag.data() << endl;
+ //cout << "FieldList::find() 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 = tqfind( it, tag );
+ FieldListIterator found = find( 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 = tqfind( it, tag );
+ FieldListIterator found = find( it, tag );
if ( found == end() )
return 0;
else
diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.h b/kopete/protocols/groupwise/libgroupwise/gwfield.h
index 6d3cb5a9..4e1b1f94 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwfield.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwfield.h
@@ -194,18 +194,18 @@ namespace Field
*/
virtual ~FieldList();
/**
- * Locate the first occurrence of a given field in the list. Same semantics as TQValueList::tqfind().
+ * Locate the first occurrence of a given field in the list. Same semantics as TQValueList::find().
* @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 tqfind( TQCString tag );
+ FieldListIterator find( 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 tqfind( FieldListIterator &it, TQCString tag );
+ FieldListIterator find( FieldListIterator &it, TQCString tag );
/**
* Get the index of the first occurrence of tag, or -1 if not found
*/
diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp
index a887c8cc..4960310a 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.tqcontains( dn );
+ return !m_allowList.contains( dn );
else
- return m_denyList.tqcontains( dn );
+ return m_denyList.contains( dn );
}
void PrivacyManager::setAllow( const TQString & dn )
{
if ( m_defaultDeny )
{
- if ( !m_allowList.tqcontains( dn ) )
+ if ( !m_allowList.contains( dn ) )
addAllow( dn );
}
else
{
- if ( m_denyList.tqcontains( dn ) )
+ if ( m_denyList.contains( dn ) )
removeDeny( dn );
}
}
@@ -82,12 +82,12 @@ void PrivacyManager::setDeny( const TQString & dn )
{
if ( m_defaultDeny )
{
- if ( m_allowList.tqcontains( dn ) )
+ if ( m_allowList.contains( dn ) )
removeAllow( dn );
}
else
{
- if ( !m_denyList.tqcontains( dn ) )
+ if ( !m_denyList.contains( 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.tqfind( *lhsIt ) == rhsEnd )
+ if ( rhs.find( *lhsIt ) == rhsEnd )
diff.append( *lhsIt );
}
return diff;
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
index 652cd5f2..c455eaec 100644
--- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
@@ -53,8 +53,8 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
if ( !readGroupWiseLine( headerFirst ) )
return 0;
// pull out the HTTP return code
- int firstSpace = headerFirst.tqfind( ' ' );
- TQString rtnField = headerFirst.mid( firstSpace, headerFirst.tqfind( ' ', firstSpace + 1 ) );
+ int firstSpace = headerFirst.find( ' ' );
+ TQString rtnField = headerFirst.mid( firstSpace, headerFirst.find( ' ', firstSpace + 1 ) );
bool ok = true;
int rtnCode;
int packetState = -1;
@@ -116,7 +116,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
int resultCode = 0;
Field::FieldListIterator it;
Field::FieldListIterator end = m_collatingFields.end();
- it = m_collatingFields.tqfind( NM_A_SZ_TRANSACTION_ID );
+ it = m_collatingFields.find( NM_A_SZ_TRANSACTION_ID );
if ( it != end )
{
Field::SingleField * sf = dynamic_cast<Field::SingleField*>( *it );
@@ -128,7 +128,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
delete sf;
}
}
- it = m_collatingFields.tqfind( NM_A_SZ_RESULT_CODE );
+ it = m_collatingFields.find( NM_A_SZ_RESULT_CODE );
if ( it != end )
{
Field::SingleField * sf = dynamic_cast<Field::SingleField*>( *it );
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc
index 35fea9d1..afe7b18e 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.tqreplace(TQRegExp("&"), "&amp;");
- str.tqreplace(TQRegExp("<"), "&lt;");
- str.tqreplace(TQRegExp(">"), "&gt;");
- str.tqreplace(TQRegExp("\""), "&quot;");
- str.tqreplace(TQRegExp("\r"), "");
+ str.replace(TQRegExp("&"), "&amp;");
+ str.replace(TQRegExp("<"), "&lt;");
+ str.replace(TQRegExp(">"), "&gt;");
+ str.replace(TQRegExp("\""), "&quot;");
+ str.replace(TQRegExp("\r"), "");
switch (mode){
case quoteHTML:
- str.tqreplace(TQRegExp("\n"), "<br>\n");
+ str.replace(TQRegExp("\n"), "<br>\n");
break;
case quoteXML:
- str.tqreplace(TQRegExp("\n"), "<br/>\n");
+ str.replace(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 += "&nbsp;";
- str.tqreplace(pos, len, s);
+ str.replace(pos, len, s);
}
return str;
}
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll
index 70d4daa5..7f2f1841 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.tqreplace(QRegExp("&"), "&amp;");
- str.tqreplace(QRegExp("<"), "&lt;");
- str.tqreplace(QRegExp(">"), "&gt;");
- str.tqreplace(QRegExp("\""), "&quot;");
- str.tqreplace(QRegExp("\r"), "");
+ str.replace(QRegExp("&"), "&amp;");
+ str.replace(QRegExp("<"), "&lt;");
+ str.replace(QRegExp(">"), "&gt;");
+ str.replace(QRegExp("\""), "&quot;");
+ str.replace(QRegExp("\r"), "");
switch (mode){
case quoteHTML:
- str.tqreplace(QRegExp("\n"), "<br>\n");
+ str.replace(QRegExp("\n"), "<br>\n");
break;
case quoteXML:
- str.tqreplace(QRegExp("\n"), "<br/>\n");
+ str.replace(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 += "&nbsp;";
- str.tqreplace(pos, len, s);
+ str.replace(pos, len, s);
}
return str;
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp
index 08f04b40..fa28ece0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp
@@ -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.tqfind( NM_A_FA_CHAT );
+ for ( Field::FieldListIterator it = counts.find( NM_A_FA_CHAT );
it != end;
- it = counts.tqfind( ++it, NM_A_FA_CHAT ) )
+ it = counts.find( ++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/eventtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp
index 8af45d93..6d252a4d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp
@@ -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.tqfind( event->eventType() ) != m_eventCodes.end() );
+ return ( m_eventCodes.find( event->eventType() ) != m_eventCodes.end() );
}
return false;
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
index 81898ca2..1c8e1d39 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
@@ -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.tqfind( NM_A_FA_CHAT );
+ for ( Field::FieldListIterator it = matches.find( NM_A_FA_CHAT );
it != end;
- it = matches.tqfind( ++it, NM_A_FA_CHAT ) )
+ it = matches.find( ++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/getdetailstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
index 27a0c7f0..5f2cbe18 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
@@ -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.tqfind( NM_A_FA_RESULTS );
+ for ( Field::FieldListIterator it = detailsFields.find( NM_A_FA_RESULTS );
it != end;
- it = detailsFields.tqfind( ++it, NM_A_FA_RESULTS ) )
+ it = detailsFields.find( ++it, NM_A_FA_RESULTS ) )
{
container = static_cast<Field::MultiField *>( *it );
ContactDetails cd = extractUserDetails( container );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp
index 35fab516..d8a4c709 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp
@@ -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.tqfind( NM_A_SZ_DN );
+ for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN );
it != end;
- it = contactList.tqfind( ++it, NM_A_SZ_DN ) )
+ it = contactList.find( ++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.tqfind( NM_A_SZ_DN );
+ for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN );
it != end;
- it = contactList.tqfind( ++it, NM_A_SZ_DN ) )
+ it = contactList.find( ++it, NM_A_SZ_DN ) )
{
contact = static_cast<Field::SingleField *>( *it );
if ( contact )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
index 63a57fda..9ab94d0d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
@@ -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.tqfind( NM_A_SZ_DN );
+ for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN );
it != end;
- it = contactList.tqfind( ++it, NM_A_SZ_DN ) )
+ it = contactList.find( ++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.tqfind( NM_A_SZ_DN );
+ for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN );
it != end;
- it = contactList.tqfind( ++it, NM_A_SZ_DN ) )
+ it = contactList.find( ++it, NM_A_SZ_DN ) )
{
contact = static_cast<Field::SingleField *>( *it );
if ( contact )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
index 2474aaaa..a3a0f556 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
@@ -80,18 +80,18 @@ bool LoginTask::take( Transfer * transfer )
Field::FieldList contactListFields = contactList->fields();
Field::MultiField * container;
// read folders
- for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_FOLDER );
+ for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_FOLDER );
it != contactListFields.end();
- it = contactListFields.tqfind( ++it, NM_A_FA_FOLDER ) )
+ it = contactListFields.find( ++it, NM_A_FA_FOLDER ) )
{
container = static_cast<Field::MultiField *>( *it );
extractFolder( container );
}
// read contacts
- for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_CONTACT );
+ for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_CONTACT );
it != contactListFields.end();
- it = contactListFields.tqfind( ++it, NM_A_FA_CONTACT ) )
+ it = contactListFields.find( ++it, NM_A_FA_CONTACT ) )
{
container = static_cast<Field::MultiField *>( *it );
extractContact( container );
@@ -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.tqfind( NM_A_LOCKED_ATTR_LIST );
+ Field::FieldListIterator it = fields.find( NM_A_LOCKED_ATTR_LIST );
if ( it != fields.end() )
{
if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) )
{
- if ( sf->value().toString().tqfind( NM_A_BLOCKING ) )
+ if ( sf->value().toString().find( 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.tqfind( tag );
+ Field::FieldListIterator it = fields.find( 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.tqfind( NM_A_FA_CUSTOM_STATUSES );
+ Field::FieldListIterator it = fields.find( NM_A_FA_CUSTOM_STATUSES );
if ( it != fields.end() )
{
if ( Field::MultiField * mf = dynamic_cast<Field::MultiField *>( *it ) )
@@ -342,7 +342,7 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields )
void LoginTask::extractKeepalivePeriod( Field::FieldList & fields )
{
- Field::FieldListIterator it = fields.tqfind( NM_A_UD_KEEPALIVE );
+ Field::FieldListIterator it = fields.find( 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/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
index 1cc33e75..3fadb5a5 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
@@ -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.tqfind( NM_A_FA_CONTACT );
+ for ( Field::FieldListIterator it = matches.find( NM_A_FA_CONTACT );
it != end;
- it = matches.tqfind( ++it, NM_A_FA_CONTACT ) )
+ it = matches.find( ++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 tqcontains
+ // first field: NM_A_SZ_STATUS contains
#define SEARCH_PENDING 0
#define SEARCH_INPROGRESS 1
#define SEARCH_COMPLETED 2
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
index 69cd1991..0eb61409 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.tqfind( NM_A_FA_MESSAGE ) != fl.end() )
+/* if ( fl.find( 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.tqfind( NM_A_SZ_OBJECT_ID ) ) != fl.end() )
+ if ( (it = fl.find( 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.tqfind( NM_A_FA_CONTACT_LIST ) ) );
+ Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.find( NM_A_FA_CONTACT_LIST ) ) );
if ( clf )
{
Field::FieldList cl = clf->fields();
// look for a folder in the list
- Field::FieldListIterator it = cl.tqfind( NM_A_FA_FOLDER );
+ Field::FieldListIterator it = cl.find( 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.tqfind( ++it, NM_A_FA_FOLDER );
+ it = cl.find( ++it, NM_A_FA_FOLDER );
if ( it == cl.end() )
printf( "Didn't find a second folder :)\n" );
else
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
index 315a60d0..c10fda5c 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
@@ -41,8 +41,8 @@ bool UserDetailsManager::known( const TQString & dn )
{
if ( dn == m_client->userDN() )
return true;
- // TODO: replace with m_detailsMap.tqcontains( dn );
- TQStringList::Iterator found = m_detailsMap.keys().tqfind( dn );
+ // TODO: replace with m_detailsMap.contains( dn );
+ TQStringList::Iterator found = m_detailsMap.keys().find( dn );
// we always know the local user's details, so don't look them up
return ( found !=m_detailsMap.keys().end() );
}
@@ -85,7 +85,7 @@ 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.tqfind( *it );
+ TQStringList::Iterator found = m_pendingDNs.find( *it );
if ( found == m_pendingDNs.end() )
{
m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).tqarg( (*it) ) );