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

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

4 files changed, 9 insertions, 9 deletions

diff --git a/filters/karbon/ai/aielement.cpp b/filters/karbon/ai/aielement.cpp
index 2f514d06..f6f45164 100644
--- a/filters/karbon/ai/aielement.cpp
+++ b/filters/karbon/ai/aielement.cpp
@@ -283,7 +283,7 @@ void AIElement::detach()
 /*!
   Returns the name of the type stored in the aielement.
   The returned strings describe the C++ datatype used to store the
-  data: for example, "TQFont", TQSTRING_OBJECT_NAME_STRING, or "TQValueList<AIElement>".
+  data: for example, "TQFont", "TQString", or "TQValueList<AIElement>".
   An Invalid aielement returns 0.
 */
 const char* AIElement::typeName() const
@@ -311,7 +311,7 @@ static const char* const type_map[ntypes] =
 {
   0,
 //  "TQValueList<AIElement>",
-  TQSTRING_OBJECT_NAME_STRING,
+  "TQString",
   "int",
   "uint",
   "double",
@@ -319,7 +319,7 @@ static const char* const type_map[ntypes] =
   "Operator",
   "Reference",
   "TQValueVector<AIElement>",
-  TQBYTEARRAY_OBJECT_NAME_STRING,
+  "TQByteArray",
   "uchar",
 };
 
diff --git a/filters/karbon/xfig/xfigimport_factory.h b/filters/karbon/xfig/xfigimport_factory.h
index 9760a92f..da49c273 100644
--- a/filters/karbon/xfig/xfigimport_factory.h
+++ b/filters/karbon/xfig/xfigimport_factory.h
@@ -37,7 +37,7 @@ public:
     XFIGImportFactory(TQObject* parent = 0, const char* name = 0);
     virtual ~XFIGImportFactory();
 
-    virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+    virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = "TQObject", const TQStringList &args = TQStringList());
 
     static TDEInstance* global();
 
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;