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

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

2 files changed, 4 insertions, 4 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();