Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Signed-off-by: Michele Calgaro <[email protected]>

5 files changed, 14 insertions, 14 deletions

diff --git a/kopete/plugins/nowlistening/nlamarok.cpp b/kopete/plugins/nowlistening/nlamarok.cpp
index 348217bc..9101758c 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 == "TQString" ) {
 			reply >> newTrack;
 		}
 	}
@@ -107,7 +107,7 @@ void NLamaroK::update()
 	{
 		TQDataStream reply( replyData, IO_ReadOnly );
 
-		if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+		if ( 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 == "TQString" ) {
 			reply >> m_artist;
 		}
 	}
diff --git a/kopete/plugins/nowlistening/nljuk.cpp b/kopete/plugins/nowlistening/nljuk.cpp
index 78d6914b..422e0db9 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 == "TQString" ) {
 					reply >> m_album;
 				}
 			}
@@ -78,7 +78,7 @@ void NLJuk::update()
 			{
 				TQDataStream reply( replyData, IO_ReadOnly );
 	
-				if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+				if ( 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 == "TQString" ) {
 					reply >> newTrack;
 				}
 			}
diff --git a/kopete/plugins/nowlistening/nlkaffeine.cpp b/kopete/plugins/nowlistening/nlkaffeine.cpp
index 77dd84cb..20ba1a79 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 == "TQString" ) {
 				reply >> newTrack;
 			}
 		}
@@ -105,7 +105,7 @@ void NLKaffeine::update()
 		{
 			TQDataStream reply( replyData, IO_ReadOnly );
 
-			if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+			if ( 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 == "TQString" ) {
 				reply >> m_artist;
 			}
 		}
diff --git a/kopete/plugins/nowlistening/nlkscd.cpp b/kopete/plugins/nowlistening/nlkscd.cpp
index 92fb1f38..d2b43f16 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 == "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 == "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 == "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 84c1d051..44e012ae 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 == "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 == "TQString" )
 		{
 			reply >> result;
 		}