Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit c872aae88b)
r14.1.x
Michele Calgaro 12 months ago
parent 36a7c6b68f
commit 4edd87ce22
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -92,7 +92,7 @@ static void setSignalHandler(void (*handler) (int))
static void cleanup(void) static void cleanup(void)
{ {
tqInstallMsgHandler(0L /*oldMsgHandler*/); qInstallMsgHandler(0L /*oldMsgHandler*/);
// TQString cmd; // TQString cmd;
} }

@ -434,7 +434,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
if( !m_emoticons.contains(msnobj) || !m_emoticons[msnobj].second ) if( !m_emoticons.contains(msnobj) || !m_emoticons[msnobj].second )
{ {
m_emoticons.insert(msnobj, tqMakePair(txt,(KTempFile*)0L)); m_emoticons.insert(msnobj, qMakePair(txt,(KTempFile*)0L));
MSNContact *c=static_cast<MSNContact*>(m_account->contacts()[m_msgHandle]); MSNContact *c=static_cast<MSNContact*>(m_account->contacts()[m_msgHandle]);
if(!c) if(!c)
return; return;

@ -115,13 +115,13 @@ void ConnectionHandler::addChatInfoForConnection( Connection* c, Oscar::WORD exc
if ( d->connections.findIndex( c ) == -1 ) if ( d->connections.findIndex( c ) == -1 )
d->connections.append( c ); d->connections.append( c );
ConnectionRoomInfo info = tqMakePair( exchange, room ); ConnectionRoomInfo info = qMakePair( exchange, room );
d->chatRoomConnections[c] = info; d->chatRoomConnections[c] = info;
} }
Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, const TQString& room ) Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, const TQString& room )
{ {
ConnectionRoomInfo infoToFind = tqMakePair( exchange, room ); ConnectionRoomInfo infoToFind = qMakePair( exchange, room );
TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end(); TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it ) for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it )
{ {

Loading…
Cancel
Save