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>
(cherry picked from commit 566a2d4dc8)

sipgen/export.c

@@ -968,12 +968,12 @@ static const char *pyType(sipSpec *pt, argDef *ad, int sec, classDef **scope)
         if (sec)
             type_name = "callable";
         else
-            type_name = TQOBJECT_OBJECT_NAME_STRING;
+            type_name = "TQObject";
 
         break;
 
     case tqobject_type:
-        type_name = TQOBJECT_OBJECT_NAME_STRING;
+        type_name = "TQObject";
         break;
 
     case ustring_type:

sipgen/gencode.c

@@ -8174,7 +8174,7 @@ static void generateNamedBaseType(ifaceFileDef *scope, argDef *ad, char *name,
         case rxcon_type:
         case rxdis_type:
             nr_derefs = 1;
-            prcode(fp, TQOBJECT_OBJECT_NAME_STRING);
+            prcode(fp, "TQObject");
             break;
 
         case mapped_type:

sipgen/transform.c

@@ -121,7 +121,7 @@ void transform(sipSpec *pt)
          * Mark any TQObject class.  This flag will ripple through all derived
          * classes when we set the hierarchy.
          */
-        if (strcmp(classBaseName(cd), TQOBJECT_OBJECT_NAME_STRING) == 0)
+        if (strcmp(classBaseName(cd), "TQObject") == 0)
             setIsTQObjectSubClass(cd);
 
         cd = next;
@@ -3405,7 +3405,7 @@ static void createSortedNumberedTypesTable(sipSpec *pt, moduleDef *mod)
             ad->u.cd->iff->ifacenr = i;
 
             /* If we find a class called TQObject, assume it's TQt. */
-            if (strcmp(ad->name->text, TQOBJECT_OBJECT_NAME_STRING) == 0)
+            if (strcmp(ad->name->text, "TQObject") == 0)
                 mod->tqobjclass = i;
 
             break;