diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp
index 43c82cf2..02f8aea1 100644
--- a/cervisia/qttableview.cpp
+++ b/cervisia/qttableview.cpp
@@ -1390,7 +1390,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 	TQRect r = viewR;
 	r.setLeft( xPos );
 	r.setBottom( yPos<maxY?yPos:maxY );
-	if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) )
+	if ( inherits( "TQMultiLineEdit" ) )
 	    paint.fillRect( r.intersect( updateR ), g.base() );
 	else
 	    paint.eraseRect( r.intersect( updateR ) );
@@ -1398,7 +1398,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
     if ( yPos <= maxY ) {
 	TQRect r = viewR;
 	r.setTop( yPos );
-	if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) )
+	if ( inherits( "TQMultiLineEdit" ) )
 	    paint.fillRect( r.intersect( updateR ), g.base() );
 	else
 	    paint.eraseRect( r.intersect( updateR ) );
diff --git a/kbabel/commonui/tdeactionselector.cpp b/kbabel/commonui/tdeactionselector.cpp
index 9f364e7e..7cb5160c 100644
--- a/kbabel/commonui/tdeactionselector.cpp
+++ b/kbabel/commonui/tdeactionselector.cpp
@@ -409,7 +409,7 @@ bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e )
       }
       return true;
     }
-    else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) )
+    else if ( o->inherits( "TQListBox" ) )
     {
       switch ( ((TQKeyEvent*)e)->key() )
       {
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h
index c5fb96af..6c72c11a 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h
@@ -14,7 +14,7 @@ public:
 	~DbSeFactory();
 
 	virtual TQObject *createObject( TQObject *parent=0, const char *name=0,
-	                               const char *classname=TQOBJECT_OBJECT_NAME_STRING,
+	                               const char *classname="TQObject",
 	                               const TQStringList &args = TQStringList());
 
 	static TDEInstance *instance();
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h
index a34cf1ed..b2f2dba0 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h
@@ -14,7 +14,7 @@ public:
 	~DbSe2Factory();
 
 	virtual TQObject *createObject( TQObject *parent=0, const char *name=0,
-	                               const char *classname=TQOBJECT_OBJECT_NAME_STRING,
+	                               const char *classname="TQObject",
 	                               const TQStringList &args = TQStringList());
 
 	static TDEInstance *instance();
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h
index a0a5a361..dfcfae24 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h
+++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h
@@ -48,7 +48,7 @@ public:
 	~PaFactory();
 
 	virtual TQObject *createObject( TQObject *parent=0, const char *name=0
-					, const char *classname=TQOBJECT_OBJECT_NAME_STRING
+					, const char *classname="TQObject"
 					, const TQStringList &args = TQStringList());
 
 	static TDEInstance *instance();
diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.h b/kbabel/kbabeldict/modules/pocompendium/pc_factory.h
index bd94712a..cb2c4246 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.h
+++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.h
@@ -48,7 +48,7 @@ public:
 	~PcFactory();
 
 	virtual TQObject *createObject( TQObject *parent=0, const char *name=0
-					, const char *classname=TQOBJECT_OBJECT_NAME_STRING
+					, const char *classname="TQObject"
 					, const TQStringList &args = TQStringList());
 
 	static TDEInstance *instance();
diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.h b/kbabel/kbabeldict/modules/tmx/pc_factory.h
index 6c8a900f..6c450e9a 100644
--- a/kbabel/kbabeldict/modules/tmx/pc_factory.h
+++ b/kbabel/kbabeldict/modules/tmx/pc_factory.h
@@ -50,7 +50,7 @@ public:
 	~PcFactory();
 
 	virtual TQObject *createObject( TQObject *parent=0, const char *name=0
-					, const char *classname=TQOBJECT_OBJECT_NAME_STRING
+					, const char *classname="TQObject"
 					, const TQStringList &args = TQStringList());
 
 	static TDEInstance *instance();
diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff
index ad3a9132..436f926b 100644
--- a/kompare/tests/cvsdiff/contextm.diff
+++ b/kompare/tests/cvsdiff/contextm.diff
@@ -827,7 +827,7 @@ diff -c -r1.3 marshall.cpp
   
 ! void  marshall(QDataStream &arg, int argc, char **argv, int &i, QString type)
   {
-! 	if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+! 	if (type == "TQStringList")
 !            type = "QValueList<QString>";
 ! 	if (type == "QCStringList")
 !            type = "QValueList<QCString>";
@@ -860,13 +860,13 @@ diff -c -r1.3 marshall.cpp
 ! 	    arg << s.toDouble();
 ! 	else if ( type == "bool" )
 ! 	    arg << mkBool( s );
-! 	else if ( type == TQSTRING_OBJECT_NAME_STRING )
+! 	else if ( type == "TQString" )
 ! 	    arg << s;
 ! 	else if ( type == "QCString" )
 ! 	    arg << QCString( argv[i] );
 ! 	else if ( type == "QColor" )
 ! 	    arg << mkColor( s );
-! 	else if ( type == TQPOINT_OBJECT_NAME_STRING )
+! 	else if ( type == "TQPoint" )
 ! 	    arg << mkPoint( s );
 ! 	else if ( type == "QSize" )
 ! 	    arg << mkSize( s );
@@ -936,7 +936,7 @@ diff -c -r1.3 marshall.cpp
   
 ! void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
   {
-!     if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+!     if (type == "TQStringList")
 !        type = "QValueList<QString>";
 !     if (type == "QCStringList")
 !        type = "QValueList<QCString>";
@@ -969,13 +969,13 @@ diff -c -r1.3 marshall.cpp
 ! 	arg << s.toDouble();
 !     else if ( type == "bool" )
 ! 	arg << mkBool( s );
-!     else if ( type == TQSTRING_OBJECT_NAME_STRING )
+!     else if ( type == "TQString" )
 ! 	arg << s;
 !     else if ( type == "QCString" )
 ! 	arg << QCString( args[ i ] );
 !     else if ( type == "QColor" )
 ! 	arg << mkColor( s );
-!     else if ( type == TQPOINT_OBJECT_NAME_STRING )
+!     else if ( type == "TQPoint" )
 ! 	arg << mkPoint( s );
 !     else if ( type == "QSize" )
 ! 	arg << mkSize( s );
diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff
index a88ddde7..f1c582cb 100644
--- a/kompare/tests/cvsdiff/edm.diff
+++ b/kompare/tests/cvsdiff/edm.diff
@@ -636,13 +636,13 @@ diff -e -r1.3 marshall.cpp
 	arg << s.toDouble();
     else if ( type == "bool" )
 	arg << mkBool( s );
-    else if ( type == TQSTRING_OBJECT_NAME_STRING )
+    else if ( type == "TQString" )
 	arg << s;
     else if ( type == "QCString" )
 	arg << QCString( args[ i ] );
     else if ( type == "QColor" )
 	arg << mkColor( s );
-    else if ( type == TQPOINT_OBJECT_NAME_STRING )
+    else if ( type == "TQPoint" )
 	arg << mkPoint( s );
     else if ( type == "QSize" )
 	arg << mkSize( s );
@@ -673,7 +673,7 @@ diff -e -r1.3 marshall.cpp
 	   delim = ")";
 .
 247,317c
-    if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+    if (type == "TQStringList")
        type = "QValueList<QString>";
     if (type == "QCStringList")
        type = "QValueList<QCString>";
diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff
index 6a62dbb5..cca2cd9a 100644
--- a/kompare/tests/cvsdiff/normalm.diff
+++ b/kompare/tests/cvsdiff/normalm.diff
@@ -651,7 +651,7 @@ diff -r1.3 marshall.cpp
 ---
 > void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
 247,317c247,256
-< 	if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+< 	if (type == "TQStringList")
 <            type = "QValueList<QString>";
 < 	if (type == "QCStringList")
 <            type = "QValueList<QCString>";
@@ -684,13 +684,13 @@ diff -r1.3 marshall.cpp
 < 	    arg << s.toDouble();
 < 	else if ( type == "bool" )
 < 	    arg << mkBool( s );
-< 	else if ( type == TQSTRING_OBJECT_NAME_STRING )
+< 	else if ( type == "TQString" )
 < 	    arg << s;
 < 	else if ( type == "QCString" )
 < 	    arg << QCString( argv[i] );
 < 	else if ( type == "QColor" )
 < 	    arg << mkColor( s );
-< 	else if ( type == TQPOINT_OBJECT_NAME_STRING )
+< 	else if ( type == "TQPoint" )
 < 	    arg << mkPoint( s );
 < 	else if ( type == "QSize" )
 < 	    arg << mkSize( s );
@@ -723,7 +723,7 @@ diff -r1.3 marshall.cpp
 < 	    QByteArray dummy_data;
 <             QDataStream dummy_arg(dummy_data, IO_WriteOnly);
 ---
->     if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+>     if (type == "TQStringList")
 >        type = "QValueList<QString>";
 >     if (type == "QCStringList")
 >        type = "QValueList<QCString>";
@@ -785,13 +785,13 @@ diff -r1.3 marshall.cpp
 > 	arg << s.toDouble();
 >     else if ( type == "bool" )
 > 	arg << mkBool( s );
->     else if ( type == TQSTRING_OBJECT_NAME_STRING )
+>     else if ( type == "TQString" )
 > 	arg << s;
 >     else if ( type == "QCString" )
 > 	arg << QCString( args[ i ] );
 >     else if ( type == "QColor" )
 > 	arg << mkColor( s );
->     else if ( type == TQPOINT_OBJECT_NAME_STRING )
+>     else if ( type == "TQPoint" )
 > 	arg << mkPoint( s );
 >     else if ( type == "QSize" )
 > 	arg << mkSize( s );
diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff
index 3f4884d5..5ffc4d4f 100644
--- a/kompare/tests/cvsdiff/rcsm.diff
+++ b/kompare/tests/cvsdiff/rcsm.diff
@@ -573,7 +573,7 @@ a245 1
 void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
 d247 71
 a317 10
-    if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+    if (type == "TQStringList")
        type = "QValueList<QString>";
     if (type == "QCStringList")
        type = "QValueList<QCString>";
@@ -607,13 +607,13 @@ a346 57
 	arg << s.toDouble();
     else if ( type == "bool" )
 	arg << mkBool( s );
-    else if ( type == TQSTRING_OBJECT_NAME_STRING )
+    else if ( type == "TQString" )
 	arg << s;
     else if ( type == "QCString" )
 	arg << QCString( args[ i ] );
     else if ( type == "QColor" )
 	arg << mkColor( s );
-    else if ( type == TQPOINT_OBJECT_NAME_STRING )
+    else if ( type == "TQPoint" )
 	arg << mkPoint( s );
     else if ( type == "QSize" )
 	arg << mkSize( s );
diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff
index b7a319f5..356a7f52 100644
--- a/kompare/tests/cvsdiff/unifiedm.diff
+++ b/kompare/tests/cvsdiff/unifiedm.diff
@@ -715,7 +715,7 @@ diff -u -r1.3 marshall.cpp
 -void  marshall(QDataStream &arg, int argc, char **argv, int &i, QString type)
 +void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
  {
--	if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+-	if (type == "TQStringList")
 -           type = "QValueList<QString>";
 -	if (type == "QCStringList")
 -           type = "QValueList<QCString>";
@@ -748,13 +748,13 @@ diff -u -r1.3 marshall.cpp
 -	    arg << s.toDouble();
 -	else if ( type == "bool" )
 -	    arg << mkBool( s );
--	else if ( type == TQSTRING_OBJECT_NAME_STRING )
+-	else if ( type == "TQString" )
 -	    arg << s;
 -	else if ( type == "QCString" )
 -	    arg << QCString( argv[i] );
 -	else if ( type == "QColor" )
 -	    arg << mkColor( s );
--	else if ( type == TQPOINT_OBJECT_NAME_STRING )
+-	else if ( type == "TQPoint" )
 -	    arg << mkPoint( s );
 -	else if ( type == "QSize" )
 -	    arg << mkSize( s );
@@ -786,7 +786,7 @@ diff -u -r1.3 marshall.cpp
 -            i++;
 -	    QByteArray dummy_data;
 -            QDataStream dummy_arg(dummy_data, IO_WriteOnly);
-+    if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
++    if (type == "TQStringList")
 +       type = "QValueList<QString>";
 +    if (type == "QCStringList")
 +       type = "QValueList<QCString>";
@@ -847,13 +847,13 @@ diff -u -r1.3 marshall.cpp
 +	arg << s.toDouble();
 +    else if ( type == "bool" )
 +	arg << mkBool( s );
-+    else if ( type == TQSTRING_OBJECT_NAME_STRING )
++    else if ( type == "TQString" )
 +	arg << s;
 +    else if ( type == "QCString" )
 +	arg << QCString( args[ i ] );
 +    else if ( type == "QColor" )
 +	arg << mkColor( s );
-+    else if ( type == TQPOINT_OBJECT_NAME_STRING )
++    else if ( type == "TQPoint" )
 +	arg << mkPoint( s );
 +    else if ( type == "QSize" )
 +	arg << mkSize( s );
diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff
index 5607c94a..2f0fd151 100644
--- a/kompare/tests/diff/contextm.diff
+++ b/kompare/tests/diff/contextm.diff
@@ -813,7 +813,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
   
 ! void  marshall(QDataStream &arg, int argc, char **argv, int &i, QString type)
   {
-! 	if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+! 	if (type == "TQStringList")
 !            type = "QValueList<QString>";
 ! 	if (type == "QCStringList")
 !            type = "QValueList<QCString>";
@@ -846,13 +846,13 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
 ! 	    arg << s.toDouble();
 ! 	else if ( type == "bool" )
 ! 	    arg << mkBool( s );
-! 	else if ( type == TQSTRING_OBJECT_NAME_STRING )
+! 	else if ( type == "TQString" )
 ! 	    arg << s;
 ! 	else if ( type == "QCString" )
 ! 	    arg << QCString( argv[i] );
 ! 	else if ( type == "QColor" )
 ! 	    arg << mkColor( s );
-! 	else if ( type == TQPOINT_OBJECT_NAME_STRING )
+! 	else if ( type == "TQPoint" )
 ! 	    arg << mkPoint( s );
 ! 	else if ( type == "QSize" )
 ! 	    arg << mkSize( s );
@@ -922,7 +922,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
   
 ! void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
   {
-!     if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+!     if (type == "TQStringList")
 !        type = "QValueList<QString>";
 !     if (type == "QCStringList")
 !        type = "QValueList<QCString>";
@@ -955,13 +955,13 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
 ! 	arg << s.toDouble();
 !     else if ( type == "bool" )
 ! 	arg << mkBool( s );
-!     else if ( type == TQSTRING_OBJECT_NAME_STRING )
+!     else if ( type == "TQString" )
 ! 	arg << s;
 !     else if ( type == "QCString" )
 ! 	arg << QCString( args[ i ] );
 !     else if ( type == "QColor" )
 ! 	arg << mkColor( s );
-!     else if ( type == TQPOINT_OBJECT_NAME_STRING )
+!     else if ( type == "TQPoint" )
 ! 	arg << mkPoint( s );
 !     else if ( type == "QSize" )
 ! 	arg << mkSize( s );
diff --git a/kompare/tests/diff/edm.diff b/kompare/tests/diff/edm.diff
index 44489e8d..45d559cc 100644
--- a/kompare/tests/diff/edm.diff
+++ b/kompare/tests/diff/edm.diff
@@ -623,13 +623,13 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp
 	arg << s.toDouble();
     else if ( type == "bool" )
 	arg << mkBool( s );
-    else if ( type == TQSTRING_OBJECT_NAME_STRING )
+    else if ( type == "TQString" )
 	arg << s;
     else if ( type == "QCString" )
 	arg << QCString( args[ i ] );
     else if ( type == "QColor" )
 	arg << mkColor( s );
-    else if ( type == TQPOINT_OBJECT_NAME_STRING )
+    else if ( type == "TQPoint" )
 	arg << mkPoint( s );
     else if ( type == "QSize" )
 	arg << mkSize( s );
@@ -660,7 +660,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp
 	   delim = ")";
 .
 247,317c
-    if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+    if (type == "TQStringList")
        type = "QValueList<QString>";
     if (type == "QCStringList")
        type = "QValueList<QCString>";
diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff
index 38676f0e..0344923a 100644
--- a/kompare/tests/diff/normalm.diff
+++ b/kompare/tests/diff/normalm.diff
@@ -639,7 +639,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
 ---
 > void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
 247,317c247,256
-< 	if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+< 	if (type == "TQStringList")
 <            type = "QValueList<QString>";
 < 	if (type == "QCStringList")
 <            type = "QValueList<QCString>";
@@ -672,13 +672,13 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
 < 	    arg << s.toDouble();
 < 	else if ( type == "bool" )
 < 	    arg << mkBool( s );
-< 	else if ( type == TQSTRING_OBJECT_NAME_STRING )
+< 	else if ( type == "TQString" )
 < 	    arg << s;
 < 	else if ( type == "QCString" )
 < 	    arg << QCString( argv[i] );
 < 	else if ( type == "QColor" )
 < 	    arg << mkColor( s );
-< 	else if ( type == TQPOINT_OBJECT_NAME_STRING )
+< 	else if ( type == "TQPoint" )
 < 	    arg << mkPoint( s );
 < 	else if ( type == "QSize" )
 < 	    arg << mkSize( s );
@@ -711,7 +711,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
 < 	    QByteArray dummy_data;
 <             QDataStream dummy_arg(dummy_data, IO_WriteOnly);
 ---
->     if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+>     if (type == "TQStringList")
 >        type = "QValueList<QString>";
 >     if (type == "QCStringList")
 >        type = "QValueList<QCString>";
@@ -773,13 +773,13 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
 > 	arg << s.toDouble();
 >     else if ( type == "bool" )
 > 	arg << mkBool( s );
->     else if ( type == TQSTRING_OBJECT_NAME_STRING )
+>     else if ( type == "TQString" )
 > 	arg << s;
 >     else if ( type == "QCString" )
 > 	arg << QCString( args[ i ] );
 >     else if ( type == "QColor" )
 > 	arg << mkColor( s );
->     else if ( type == TQPOINT_OBJECT_NAME_STRING )
+>     else if ( type == "TQPoint" )
 > 	arg << mkPoint( s );
 >     else if ( type == "QSize" )
 > 	arg << mkSize( s );
diff --git a/kompare/tests/diff/rcsm.diff b/kompare/tests/diff/rcsm.diff
index 588fd7f1..e64fc43f 100644
--- a/kompare/tests/diff/rcsm.diff
+++ b/kompare/tests/diff/rcsm.diff
@@ -561,7 +561,7 @@ a245 1
 void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
 d247 71
 a317 10
-    if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+    if (type == "TQStringList")
        type = "QValueList<QString>";
     if (type == "QCStringList")
        type = "QValueList<QCString>";
@@ -595,13 +595,13 @@ a346 57
 	arg << s.toDouble();
     else if ( type == "bool" )
 	arg << mkBool( s );
-    else if ( type == TQSTRING_OBJECT_NAME_STRING )
+    else if ( type == "TQString" )
 	arg << s;
     else if ( type == "QCString" )
 	arg << QCString( args[ i ] );
     else if ( type == "QColor" )
 	arg << mkColor( s );
-    else if ( type == TQPOINT_OBJECT_NAME_STRING )
+    else if ( type == "TQPoint" )
 	arg << mkPoint( s );
     else if ( type == "QSize" )
 	arg << mkSize( s );
diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff
index 1b62d739..49aff880 100644
--- a/kompare/tests/diff/unifiedm.diff
+++ b/kompare/tests/diff/unifiedm.diff
@@ -702,7 +702,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
 -void  marshall(QDataStream &arg, int argc, char **argv, int &i, QString type)
 +void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
  {
--	if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+-	if (type == "TQStringList")
 -           type = "QValueList<QString>";
 -	if (type == "QCStringList")
 -           type = "QValueList<QCString>";
@@ -735,13 +735,13 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
 -	    arg << s.toDouble();
 -	else if ( type == "bool" )
 -	    arg << mkBool( s );
--	else if ( type == TQSTRING_OBJECT_NAME_STRING )
+-	else if ( type == "TQString" )
 -	    arg << s;
 -	else if ( type == "QCString" )
 -	    arg << QCString( argv[i] );
 -	else if ( type == "QColor" )
 -	    arg << mkColor( s );
--	else if ( type == TQPOINT_OBJECT_NAME_STRING )
+-	else if ( type == "TQPoint" )
 -	    arg << mkPoint( s );
 -	else if ( type == "QSize" )
 -	    arg << mkSize( s );
@@ -773,7 +773,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
 -            i++;
 -	    QByteArray dummy_data;
 -            QDataStream dummy_arg(dummy_data, IO_WriteOnly);
-+    if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
++    if (type == "TQStringList")
 +       type = "QValueList<QString>";
 +    if (type == "QCStringList")
 +       type = "QValueList<QCString>";
@@ -834,13 +834,13 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
 +	arg << s.toDouble();
 +    else if ( type == "bool" )
 +	arg << mkBool( s );
-+    else if ( type == TQSTRING_OBJECT_NAME_STRING )
++    else if ( type == "TQString" )
 +	arg << s;
 +    else if ( type == "QCString" )
 +	arg << QCString( args[ i ] );
 +    else if ( type == "QColor" )
 +	arg << mkColor( s );
-+    else if ( type == TQPOINT_OBJECT_NAME_STRING )
++    else if ( type == "TQPoint" )
 +	arg << mkPoint( s );
 +    else if ( type == "QSize" )
 +	arg << mkSize( s );
diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp
index 487a54c6..d2952577 100644
--- a/kuiviewer/kuiviewer_part.cpp
+++ b/kuiviewer/kuiviewer_part.cpp
@@ -185,7 +185,7 @@ void KUIViewerPart::slotStyle(int)
     TQApplication::setOverrideCursor( WaitCursor );
     m_widget->setStyle( style);
 
-    TQObjectList *l = m_widget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList *l = m_widget->queryList( "TQWidget" );
     for ( TQObject *o = l->first(); o; o = l->next() )
         ( TQT_TQWIDGET(o) )->setStyle( style );
     delete l;
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp
index b8d6bf2d..9dc2fa4a 100644
--- a/scheck/scheck.cpp
+++ b/scheck/scheck.cpp
@@ -944,25 +944,25 @@ void StyleCheckStyle::polish(const TQStyleControlElementData &ceData, ControlEle
 	topLevelAccelManageTimer->start(200, true);
 	//
 
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
 		// Put in order of highest occurance to maximise hit rate
-		if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
+		if (widget->inherits("TQPushButton")) {
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 	
-		if (widget->inherits(TQLABEL_OBJECT_NAME_STRING))
+		if (widget->inherits("TQLabel"))
 		{
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 	
-		if (widget->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
+		if (widget->inherits("TQGroupBox"))
 		{
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 	
-		if (widget->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) || widget->inherits(TQDIALOG_OBJECT_NAME_STRING) )
+		if (widget->inherits("TQMainWindow") || widget->inherits("TQDialog") )
 		{
 			watcher->addWatched(widget);
 		}
@@ -974,19 +974,19 @@ void StyleCheckStyle::polish(const TQStyleControlElementData &ceData, ControlEle
 
 void StyleCheckStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
-		if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
+		if (widget->inherits("TQPushButton")) {
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 	
-		if (widget->inherits(TQLABEL_OBJECT_NAME_STRING))
+		if (widget->inherits("TQLabel"))
 		{
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 	
-		if (widget->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
+		if (widget->inherits("TQGroupBox"))
 		{
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
@@ -2348,7 +2348,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control,
 				}
 				else if (widget->parent())
 				{
-					if (widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING))
+					if (widget->parent()->inherits("TQToolBar"))
 					{
 						TQToolBar* parent = (TQToolBar*)widget->parent();
 						TQRect pr = parent->rect();
@@ -2616,7 +2616,7 @@ bool StyleCheckStyle::objectEventHandler( const TQStyleControlElementData &ceDat
 	if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event ))
 		return true;
 
-	if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQObject")) {
 		TQObject* object = reinterpret_cast<TQObject*>(source);
 
 		// Handle push button hover effects.
@@ -2635,7 +2635,7 @@ bool StyleCheckStyle::objectEventHandler( const TQStyleControlElementData &ceDat
 			}
 		}
 	
-		if ( event->type() == TQEvent::Paint && object->inherits(TQLABEL_OBJECT_NAME_STRING) )
+		if ( event->type() == TQEvent::Paint && object->inherits("TQLabel") )
 		{
 			TQLabel* lb = static_cast<TQLabel*>(TQT_TQWIDGET(object));
 			if (lb->pixmap() || lb->picture() || lb->movie() || (lb->textFormat() == TQt::RichText) ||
@@ -2699,7 +2699,7 @@ bool StyleCheckStyle::objectEventHandler( const TQStyleControlElementData &ceDat
 			return true;
 		}
 	
-		if ( event->type() == TQEvent::Paint && object->inherits(TQGROUPBOX_OBJECT_NAME_STRING) )
+		if ( event->type() == TQEvent::Paint && object->inherits("TQGroupBox") )
 		{
 			TQPaintEvent * pevent = TQT_TQPAINTEVENT(event);
 			TQGroupBox* gb = static_cast<TQGroupBox*>(TQT_TQWIDGET(object));
@@ -2713,7 +2713,7 @@ bool StyleCheckStyle::objectEventHandler( const TQStyleControlElementData &ceDat
 			// I suggested that it could eat me. GCC won.
 			while ( (parent = parent->parent()) )
 			{
-				if (parent->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
+				if (parent->inherits("TQGroupBox"))
 				{
 					nestedGroupBox = true;
 					break;
diff --git a/tdecachegrind/tdecachegrind/tabview.cpp b/tdecachegrind/tdecachegrind/tabview.cpp
index f809e921..7cdb0852 100644
--- a/tdecachegrind/tdecachegrind/tabview.cpp
+++ b/tdecachegrind/tdecachegrind/tabview.cpp
@@ -580,7 +580,7 @@ TQString TabView::whatsThis() const
 
 void TabView::installFocusFilters()
 {
-    TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+    TQObjectList *l = queryList("TQWidget");
     TQObjectListIt it( *l );
     TQObject *obj;
 
diff --git a/tdeioslave/svn/svn.cpp b/tdeioslave/svn/svn.cpp
index cac709c3..a25abe36 100644
--- a/tdeioslave/svn/svn.cpp
+++ b/tdeioslave/svn/svn.cpp
@@ -1371,7 +1371,7 @@ svn_error_t *tdeio_svnProtocol::commitLogPrompt( const char **log_msg, const cha
 		return SVN_NO_ERROR;
 	}
 
-	if ( replyType != TQSTRING_OBJECT_NAME_STRING ) {
+	if ( replyType != "TQString" ) {
 		kdWarning() << "Unexpected reply type" << endl;
 		return SVN_NO_ERROR;
 	}
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
index 05fe6482..0b6eb488 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
@@ -93,9 +93,9 @@ TQString RubyCodeGenerator::cppToRubyType(const TQString &typeStr) {
     type.replace("const ", "");
     type.replace(TQRegExp("[*&\\s]"), "");
     type.replace(TQRegExp("[<>]"), "_");
-    type.replace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array");
+    type.replace("TQStringList", "Array");
     type.replace(TQRegExp("^string$"),"String");
-    type.replace(TQSTRING_OBJECT_NAME_STRING, "String");
+    type.replace("TQString", "String");
     type.replace("bool", "true|false");
     type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer");
     type.replace(TQRegExp("^(float|double)$"), "Float");
diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp
index 9eedaba7..90d55eab 100644
--- a/umbrello/umbrello/codegenerators/rubywriter.cpp
+++ b/umbrello/umbrello/codegenerators/rubywriter.cpp
@@ -149,8 +149,8 @@ TQString RubyWriter::cppToRubyType(const TQString &typeStr) {
     type.replace("const ", "");
     type.replace(TQRegExp("[*&\\s]"), "");
     type.replace(TQRegExp("[<>]"), "_");
-    type.replace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array");
-    type.replace(TQSTRING_OBJECT_NAME_STRING, "String");
+    type.replace("TQStringList", "Array");
+    type.replace("TQString", "String");
     type.replace("bool", "true|false");
     type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer");
     type.replace(TQRegExp("^(float|double)$"), "Float");
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 8e0279fe..6069800d 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -142,7 +142,7 @@ UMLListView::UMLListView(TQWidget *parent, const char *name)
 UMLListView::~UMLListView() {}
 
 bool UMLListView::eventFilter(TQObject *o, TQEvent *e) {
-    if (e->type() != TQEvent::MouseButtonPress || !o->isA(TQHEADER_OBJECT_NAME_STRING))
+    if (e->type() != TQEvent::MouseButtonPress || !o->isA("TQHeader"))
         return TQListView::eventFilter(o, e);
     TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
     if (me->button() == Qt::RightButton) {