From 16a78de1f2c976a97da2c041043e66e13fa722ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 20 Jun 2012 20:47:29 +0200 Subject: Fix checking DCOP replyType This partially resolves Bug 994 An alternative way to compile with the original tqtinterface v3.5.13 --- knewsticker/common/newsiconmgr.cpp | 2 +- kopete/plugins/nowlistening/nlamarok.cpp | 6 +++--- kopete/plugins/nowlistening/nljuk.cpp | 6 +++--- kopete/plugins/nowlistening/nlkaffeine.cpp | 6 +++--- kopete/plugins/nowlistening/nlkscd.cpp | 6 +++--- kopete/plugins/nowlistening/nlnoatun.cpp | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp index 6e8e88d7..3d7b345a 100644 --- a/knewsticker/common/newsiconmgr.cpp +++ b/knewsticker/common/newsiconmgr.cpp @@ -146,7 +146,7 @@ TQString NewsIconMgr::favicon(const KURL &url) const kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply); - if (replyType == TQSTRING_OBJECT_NAME_STRING) { + if (replyType == "QString" || replyType == "TQString") { TQDataStream replyStream(reply, IO_ReadOnly); TQString result; replyStream >> result; diff --git a/kopete/plugins/nowlistening/nlamarok.cpp b/kopete/plugins/nowlistening/nlamarok.cpp index 348217bc..d56aec0f 100644 --- a/kopete/plugins/nowlistening/nlamarok.cpp +++ b/kopete/plugins/nowlistening/nlamarok.cpp @@ -91,7 +91,7 @@ void NLamaroK::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> newTrack; } } @@ -107,7 +107,7 @@ void NLamaroK::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> m_album; } } @@ -117,7 +117,7 @@ void NLamaroK::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> m_artist; } } diff --git a/kopete/plugins/nowlistening/nljuk.cpp b/kopete/plugins/nowlistening/nljuk.cpp index 78d6914b..986e23ba 100644 --- a/kopete/plugins/nowlistening/nljuk.cpp +++ b/kopete/plugins/nowlistening/nljuk.cpp @@ -64,7 +64,7 @@ void NLJuk::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> m_album; } } @@ -78,7 +78,7 @@ void NLJuk::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> m_artist; } } @@ -92,7 +92,7 @@ void NLJuk::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> newTrack; } } diff --git a/kopete/plugins/nowlistening/nlkaffeine.cpp b/kopete/plugins/nowlistening/nlkaffeine.cpp index 77dd84cb..d9989054 100644 --- a/kopete/plugins/nowlistening/nlkaffeine.cpp +++ b/kopete/plugins/nowlistening/nlkaffeine.cpp @@ -85,7 +85,7 @@ void NLKaffeine::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> newTrack; } } @@ -105,7 +105,7 @@ void NLKaffeine::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> m_album; } } @@ -115,7 +115,7 @@ void NLKaffeine::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> m_artist; } } diff --git a/kopete/plugins/nowlistening/nlkscd.cpp b/kopete/plugins/nowlistening/nlkscd.cpp index bd9b9b6b..00f6c729 100644 --- a/kopete/plugins/nowlistening/nlkscd.cpp +++ b/kopete/plugins/nowlistening/nlkscd.cpp @@ -69,7 +69,7 @@ void NLKscd::update() << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) + if ( replyType == "QString" || replyType == "TQString" ) reply >> m_artist; else kdDebug( 14307 ) << "NLKscd::update() trackList returned unexpected reply type!" << endl; @@ -82,7 +82,7 @@ void NLKscd::update() << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) + if ( replyType == "QString" || replyType == "TQString" ) reply >> m_album; else kdDebug( 14307 ) << "NLKscd::update() trackList returned unexpected reply type!" << endl; @@ -94,7 +94,7 @@ void NLKscd::update() kdDebug( 14307 ) << "NLKscd::update() - there was some error using DCOP." << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> newTrack; //kdDebug( 14307 ) << "the result is: " << newTrack.latin1() // << endl; diff --git a/kopete/plugins/nowlistening/nlnoatun.cpp b/kopete/plugins/nowlistening/nlnoatun.cpp index e563eb0e..22195808 100644 --- a/kopete/plugins/nowlistening/nlnoatun.cpp +++ b/kopete/plugins/nowlistening/nlnoatun.cpp @@ -76,7 +76,7 @@ void NLNoatun::update() << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "QString" || replyType == "TQString" ) { reply >> newTrack; } else kdDebug( 14307 ) << "NLNoatun::update(), title() returned unexpected reply type!" << endl; @@ -137,7 +137,7 @@ TQString NLNoatun::currentProperty( TQCString appname, TQString property ) const else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) + if ( replyType == "QString" || replyType == "TQString" ) { reply >> result; } -- cgit v1.2.3