summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-24 10:56:13 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-25 15:15:15 +0900
commit4edd87ce22471182533a7adf734701a30f6f21a6 (patch)
tree1af66ba7f69cc7076e201d27e5c4423e16825a90
parent36a7c6b68f686133f3e975e107fcb941730bd221 (diff)
downloadtdenetwork-4edd87ce22471182533a7adf734701a30f6f21a6.tar.gz
tdenetwork-4edd87ce22471182533a7adf734701a30f6f21a6.zip
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit c872aae88b96bf8978e123b9074d5e389d245140)
-rw-r--r--kget/main.cpp2
-rw-r--r--kopete/protocols/msn/msnswitchboardsocket.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/connectionhandler.cpp4
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<MSNContact*>(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<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it )
{