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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 5 insertions, 5 deletions

diff --git a/filters/kword/libexport/ProcessDocument.cpp b/filters/kword/libexport/ProcessDocument.cpp
index 69b14857..1ec7bc8c 100644
--- a/filters/kword/libexport/ProcessDocument.cpp
+++ b/filters/kword/libexport/ProcessDocument.cpp
@@ -213,12 +213,12 @@ static void ProcessBoolIntValueTag ( TQDomNode myNode, void *tagData, KWEFKWordL
 
 static void ProcessStringValueTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    ProcessOneAttrTag (myNode, "value", TQSTRING_OBJECT_NAME_STRING, tagData, leader);
+    ProcessOneAttrTag (myNode, "value", "TQString", tagData, leader);
 }
 
 static void ProcessStringNameTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    ProcessOneAttrTag (myNode, "name", TQSTRING_OBJECT_NAME_STRING, tagData, leader);
+    ProcessOneAttrTag (myNode, "name", "TQString", tagData, leader);
 }
 
 
@@ -311,7 +311,7 @@ void ProcessAnchorTag ( TQDomNode       myNode,
     *instance = TQString();
     TQValueList<AttrProcessing> attrProcessingList;
     attrProcessingList << AttrProcessing ( "type",     type    )
-                       << AttrProcessing ( "instance", TQSTRING_OBJECT_NAME_STRING, instance );
+                       << AttrProcessing ( "instance", "TQString", instance );
     ProcessAttributes (myNode, attrProcessingList);
 
     if ( type != "frameset" )
@@ -851,7 +851,7 @@ static void ProcessAnyBorderTag ( TQDomNode myNode, void *tagData, KWEFKWordLead
 
 static void ProcessFollowingTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    ProcessOneAttrTag (myNode, "name", TQSTRING_OBJECT_NAME_STRING, tagData, leader);
+    ProcessOneAttrTag (myNode, "name", "TQString", tagData, leader);
 }
 
 static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ )
diff --git a/filters/kword/libexport/TagProcessing.cpp b/filters/kword/libexport/TagProcessing.cpp
index 46a8fb35..1a993073 100644
--- a/filters/kword/libexport/TagProcessing.cpp
+++ b/filters/kword/libexport/TagProcessing.cpp
@@ -107,7 +107,7 @@ AttrProcessing::AttrProcessing ( const TQString& n, const TQString& t, void *d )
 {
     if ( t == "int" )
         type = AttrInt;
-    else if ( t == TQSTRING_OBJECT_NAME_STRING )
+    else if ( t == "TQString" )
         type = AttrTQString;
     else if ( t == "double" )
         type = AttrDouble;