Fix checking DCOP replyType

This partially resolves Bug 994
An alternative way to compile with the original tqtinterface v3.5.13
v3.5.13-sru
Slávek Banko 13 years ago
parent ef4a78ff54
commit 16a78de1f2

@ -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;

@ -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;
}
}

@ -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;
}
}

@ -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;
}
}

@ -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;

@ -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;
}

Loading…
Cancel
Save