From c872aae88b96bf8978e123b9074d5e389d245140 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 24 Nov 2023 10:56:13 +0900 Subject: [PATCH] Replaced various '#define' with actual strings - part 3 Signed-off-by: Michele Calgaro --- kget/main.cpp | 2 +- kopete/protocols/msn/msnswitchboardsocket.cpp | 2 +- kopete/protocols/oscar/liboscar/connectionhandler.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kget/main.cpp b/kget/main.cpp index 7f65e3f5..00d3e4db 100644 --- a/kget/main.cpp +++ b/kget/main.cpp @@ -92,7 +92,7 @@ static void setSignalHandler(void (*handler) (int)) static void cleanup(void) { - tqInstallMsgHandler(0L /*oldMsgHandler*/); + qInstallMsgHandler(0L /*oldMsgHandler*/); // TQString cmd; } diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index c55c9a58..e74e728f 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -434,7 +434,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) 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(m_account->contacts()[m_msgHandle]); if(!c) return; diff --git a/kopete/protocols/oscar/liboscar/connectionhandler.cpp b/kopete/protocols/oscar/liboscar/connectionhandler.cpp index 1cac6611..92759961 100644 --- a/kopete/protocols/oscar/liboscar/connectionhandler.cpp +++ b/kopete/protocols/oscar/liboscar/connectionhandler.cpp @@ -115,13 +115,13 @@ void ConnectionHandler::addChatInfoForConnection( Connection* c, Oscar::WORD exc if ( d->connections.findIndex( c ) == -1 ) d->connections.append( c ); - ConnectionRoomInfo info = tqMakePair( exchange, room ); + ConnectionRoomInfo info = qMakePair( exchange, room ); d->chatRoomConnections[c] = info; } Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, const TQString& room ) { - ConnectionRoomInfo infoToFind = tqMakePair( exchange, room ); + ConnectionRoomInfo infoToFind = qMakePair( exchange, room ); TQMap::iterator it, itEnd = d->chatRoomConnections.end(); for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it ) {