summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/liboscar/connectionhandler.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/oscar/liboscar/connectionhandler.cpp
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/oscar/liboscar/connectionhandler.cpp')
-rw-r--r--kopete/protocols/oscar/liboscar/connectionhandler.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kopete/protocols/oscar/liboscar/connectionhandler.cpp b/kopete/protocols/oscar/liboscar/connectionhandler.cpp
index bd4df3c5..3f2c1eff 100644
--- a/kopete/protocols/oscar/liboscar/connectionhandler.cpp
+++ b/kopete/protocols/oscar/liboscar/connectionhandler.cpp
@@ -112,16 +112,16 @@ Connection* ConnectionHandler::defaultConnection() const
void ConnectionHandler::addChatInfoForConnection( Connection* c, Oscar::WORD exchange, const TQString& room )
{
- if ( d->connections.findIndex( c ) == -1 )
+ if ( d->connections.tqfindIndex( c ) == -1 )
d->connections.append( c );
- ConnectionRoomInfo info = qMakePair( exchange, room );
+ ConnectionRoomInfo info = tqMakePair( exchange, room );
d->chatRoomConnections[c] = info;
}
Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, const TQString& room )
{
- ConnectionRoomInfo infoToFind = qMakePair( exchange, room );
+ ConnectionRoomInfo infoToFind = tqMakePair( exchange, room );
TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it )
{
@@ -137,8 +137,8 @@ Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, cons
TQString ConnectionHandler::chatRoomForConnection( Connection* c )
{
- if ( d->connections.findIndex( c ) == -1 )
- return TQString::null;
+ if ( d->connections.tqfindIndex( c ) == -1 )
+ return TQString();
TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it )
@@ -150,13 +150,13 @@ TQString ConnectionHandler::chatRoomForConnection( Connection* c )
}
}
- return TQString::null;
+ return TQString();
}
Oscar::WORD ConnectionHandler::exchangeForConnection( Connection* c )
{
- if ( d->connections.findIndex( c ) == -1 )
+ if ( d->connections.tqfindIndex( c ) == -1 )
return 0xFFFF;
TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();