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

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 75b9f40221399ae82b0169494af7db6d35d0a070)

23 files changed, 61 insertions, 61 deletions

diff --git a/kget/kget_plug_in/kget_plug_in.h b/kget/kget_plug_in/kget_plug_in.h
index 10a0d205..5ae631f6 100644
--- a/kget/kget_plug_in/kget_plug_in.h
+++ b/kget/kget_plug_in/kget_plug_in.h
@@ -50,7 +50,7 @@ public:
     ~KPluginFactory() ;
 
     virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
-                                   const char* name = TQOBJECT_OBJECT_NAME_STRING,
+                                   const char* name = "TQObject",
                                    const TQStringList &args = TQStringList() );
 
 private:
diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp
index 228e0618..57f5fc6e 100644
--- a/knewsticker/common/newsiconmgr.cpp
+++ b/knewsticker/common/newsiconmgr.cpp
@@ -146,7 +146,7 @@ TQString NewsIconMgr::favicon(const KURL &url) const
 	
 	kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply);
 	
-	if (replyType == TQSTRING_OBJECT_NAME_STRING) {
+	if (replyType == "TQString") {
 		TQDataStream replyStream(reply, IO_ReadOnly);
 		TQString result;
 		replyStream >> result;
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h
index c27e3d86..9e09ff51 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h
@@ -35,7 +35,7 @@ class KntSrcFilePropsFactory : public KLibFactory
 	
 	public:
 		virtual TQObject *createObject(TQObject * = 0, const char * = 0,
-				const char * = TQOBJECT_OBJECT_NAME_STRING, const TQStringList & = TQStringList());
+				const char * = "TQObject", const TQStringList & = TQStringList());
 };
 
 class KntSrcFilePropsDlg : public KPropsDlgPlugin
diff --git a/kopete/kopete/chatwindow/emoticonselector.cpp b/kopete/kopete/chatwindow/emoticonselector.cpp
index 21a24c3e..fac6fc40 100644
--- a/kopete/kopete/chatwindow/emoticonselector.cpp
+++ b/kopete/kopete/chatwindow/emoticonselector.cpp
@@ -109,7 +109,7 @@ void EmoticonSelector::emoticonClicked(const TQString &str)
 	// KDE4/TQt TODO: use qobject_cast instead.
 	emit ItemSelected ( str );
 	if ( isVisible() && parentWidget() &&
-		parentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+		parentWidget()->inherits("TQPopupMenu") )
 	{
 		parentWidget()->close();
 	}
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index 8f9447f9..e53d27e4 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -136,7 +136,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 //	kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl;
 
 	// KDE4/TQt TODO: Use qobject_cast instead.
-	if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+	if ( widget->inherits("TQPopupMenu") )
 	{
 		TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
 		int id;
@@ -202,7 +202,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 		return containerCount() - 1;
 	}
 	// KDE4/TQt TODO: Use qobject_cast instead.
-	else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
+	else if ( widget->inherits( "TQMenuBar" ) )
 	{
 		TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
 
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index 9570f15c..23215008 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -86,11 +86,11 @@ public:
   TQAsciiDict<int> ignoreTheseWidgets;
 
   void init(){
-    ignoreTheseWidgets.insert(TQLABEL_OBJECT_NAME_STRING, new int(1));
-    ignoreTheseWidgets.insert(TQFRAME_OBJECT_NAME_STRING, new int(2));
-    ignoreTheseWidgets.insert(TQGROUPBOX_OBJECT_NAME_STRING, new int(3));
-    ignoreTheseWidgets.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, new int(4));
-    ignoreTheseWidgets.insert(TQWIDGET_OBJECT_NAME_STRING, new int(5));
+    ignoreTheseWidgets.insert("TQLabel", new int(1));
+    ignoreTheseWidgets.insert("TQFrame", new int(2));
+    ignoreTheseWidgets.insert("TQGroupBox", new int(3));
+    ignoreTheseWidgets.insert("TQButtonGroup", new int(4));
+    ignoreTheseWidgets.insert("TQWidget", new int(5));
     ignoreTheseWidgets.setAutoDelete(true);
 
     static bool defaultKDEPropertyMapInstalled = false;
@@ -141,25 +141,25 @@ bool KAutoConfig::retrieveSettings(bool trackChanges){
   
   if(trackChanges){
     // QT
-    changedMap.insert(TQString::fromLatin1(TQBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert(TQString::fromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert(TQString::fromLatin1(TQPUSHBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert(TQString::fromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(activated (int)));
+    changedMap.insert(TQString::fromLatin1("TQButton"), TQT_SIGNAL(stateChanged(int)));
+    changedMap.insert(TQString::fromLatin1("TQCheckBox"), TQT_SIGNAL(stateChanged(int)));
+    changedMap.insert(TQString::fromLatin1("TQPushButton"), TQT_SIGNAL(stateChanged(int)));
+    changedMap.insert(TQString::fromLatin1("TQRadioButton"), TQT_SIGNAL(stateChanged(int)));
+    changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(activated (int)));
     //qsqlproperty map doesn't store the text, but the value!
-    //changedMap.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert(TQString::fromLatin1(TQDATEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDate &)));
-    changedMap.insert(TQString::fromLatin1(TQDATETIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDateTime &)));
-    changedMap.insert(TQString::fromLatin1(TQDIAL_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged (int)));
-    changedMap.insert(TQString::fromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert(TQString::fromLatin1(TQSLIDER_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int)));
-    changedMap.insert(TQString::fromLatin1(TQSPINBOX_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int)));
-    changedMap.insert(TQString::fromLatin1(TQTIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQTime &)));
-    changedMap.insert(TQString::fromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged()));
-    changedMap.insert(TQString::fromLatin1(TQTEXTBROWSER_OBJECT_NAME_STRING), TQT_SIGNAL(sourceChanged(const TQString &)));
-    changedMap.insert(TQString::fromLatin1(TQMULTILINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged()));
-    changedMap.insert(TQString::fromLatin1(TQLISTBOX_OBJECT_NAME_STRING), TQT_SIGNAL(selectionChanged()));
-    changedMap.insert(TQString::fromLatin1(TQTABWIDGET_OBJECT_NAME_STRING), TQT_SIGNAL(currentChanged(TQWidget *)));
+    //changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert(TQString::fromLatin1("TQDateEdit"), TQT_SIGNAL(valueChanged(const TQDate &)));
+    changedMap.insert(TQString::fromLatin1("TQDateTimeEdit"), TQT_SIGNAL(valueChanged(const TQDateTime &)));
+    changedMap.insert(TQString::fromLatin1("TQDial"), TQT_SIGNAL(valueChanged (int)));
+    changedMap.insert(TQString::fromLatin1("TQLineEdit"), TQT_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert(TQString::fromLatin1("TQSlider"), TQT_SIGNAL(valueChanged(int)));
+    changedMap.insert(TQString::fromLatin1("TQSpinBox"), TQT_SIGNAL(valueChanged(int)));
+    changedMap.insert(TQString::fromLatin1("TQTimeEdit"), TQT_SIGNAL(valueChanged(const TQTime &)));
+    changedMap.insert(TQString::fromLatin1("TQTextEdit"), TQT_SIGNAL(textChanged()));
+    changedMap.insert(TQString::fromLatin1("TQTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &)));
+    changedMap.insert(TQString::fromLatin1("TQMultiLineEdit"), TQT_SIGNAL(textChanged()));
+    changedMap.insert(TQString::fromLatin1("TQListBox"), TQT_SIGNAL(selectionChanged()));
+    changedMap.insert(TQString::fromLatin1("TQTabWidget"), TQT_SIGNAL(currentChanged(TQWidget *)));
 
     // KDE
     changedMap.insert( TQString::fromLatin1("KComboBox"), TQT_SIGNAL(activated (int)));
diff --git a/kopete/plugins/nowlistening/nlamarok.cpp b/kopete/plugins/nowlistening/nlamarok.cpp
index 348217bc..9101758c 100644
--- a/kopete/plugins/nowlistening/nlamarok.cpp
+++ b/kopete/plugins/nowlistening/nlamarok.cpp
@@ -91,7 +91,7 @@ void NLamaroK::update()
 	{
 		TQDataStream reply( replyData, IO_ReadOnly );
 
-		if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+		if ( replyType == "TQString" ) {
 			reply >> newTrack;
 		}
 	}
@@ -107,7 +107,7 @@ void NLamaroK::update()
 	{
 		TQDataStream reply( replyData, IO_ReadOnly );
 
-		if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+		if ( replyType == "TQString" ) {
 			reply >> m_album;
 		}
 	}
@@ -117,7 +117,7 @@ void NLamaroK::update()
 	{
 		TQDataStream reply( replyData, IO_ReadOnly );
 
-		if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+		if ( replyType == "TQString" ) {
 			reply >> m_artist;
 		}
 	}
diff --git a/kopete/plugins/nowlistening/nljuk.cpp b/kopete/plugins/nowlistening/nljuk.cpp
index 78d6914b..422e0db9 100644
--- a/kopete/plugins/nowlistening/nljuk.cpp
+++ b/kopete/plugins/nowlistening/nljuk.cpp
@@ -64,7 +64,7 @@ void NLJuk::update()
 			{
 				TQDataStream reply( replyData, IO_ReadOnly );
 	
-				if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+				if ( replyType == "TQString" ) {
 					reply >> m_album;
 				}
 			}
@@ -78,7 +78,7 @@ void NLJuk::update()
 			{
 				TQDataStream reply( replyData, IO_ReadOnly );
 	
-				if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+				if ( replyType == "TQString" ) {
 					reply >> m_artist;
 				}
 			}
@@ -92,7 +92,7 @@ void NLJuk::update()
 			{
 				TQDataStream reply( replyData, IO_ReadOnly );
 	
-				if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+				if ( replyType == "TQString" ) {
 					reply >> newTrack;
 				}
 			}
diff --git a/kopete/plugins/nowlistening/nlkaffeine.cpp b/kopete/plugins/nowlistening/nlkaffeine.cpp
index 77dd84cb..20ba1a79 100644
--- a/kopete/plugins/nowlistening/nlkaffeine.cpp
+++ b/kopete/plugins/nowlistening/nlkaffeine.cpp
@@ -85,7 +85,7 @@ void NLKaffeine::update()
 		{
 			TQDataStream reply( replyData, IO_ReadOnly );
 
-			if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+			if ( replyType == "TQString" ) {
 				reply >> newTrack;
 			}
 		}
@@ -105,7 +105,7 @@ void NLKaffeine::update()
 		{
 			TQDataStream reply( replyData, IO_ReadOnly );
 
-			if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+			if ( replyType == "TQString" ) {
 				reply >> m_album;
 			}
 		}
@@ -115,7 +115,7 @@ void NLKaffeine::update()
 		{
 			TQDataStream reply( replyData, IO_ReadOnly );
 
-			if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+			if ( replyType == "TQString" ) {
 				reply >> m_artist;
 			}
 		}
diff --git a/kopete/plugins/nowlistening/nlkscd.cpp b/kopete/plugins/nowlistening/nlkscd.cpp
index 92fb1f38..d2b43f16 100644
--- a/kopete/plugins/nowlistening/nlkscd.cpp
+++ b/kopete/plugins/nowlistening/nlkscd.cpp
@@ -69,7 +69,7 @@ void NLKscd::update()
 				<< endl;
 		else {
 			TQDataStream reply( replyData, IO_ReadOnly );
-			if ( replyType == TQSTRING_OBJECT_NAME_STRING )
+			if ( replyType == "TQString" )
 				reply >> m_artist;
 			else
 				kdDebug( 14307 ) << "NLKscd::update() trackList returned unexpected reply type!" << endl;
@@ -82,7 +82,7 @@ void NLKscd::update()
 				<< endl;
 		else {
 			TQDataStream reply( replyData, IO_ReadOnly );
-			if ( replyType == TQSTRING_OBJECT_NAME_STRING )
+			if ( replyType == "TQString" )
 				reply >> m_album;
 			else
 				kdDebug( 14307 ) << "NLKscd::update() trackList returned unexpected reply type!" << endl;
@@ -94,7 +94,7 @@ void NLKscd::update()
 			kdDebug( 14307 ) << "NLKscd::update() - there was some error using DCOP." << endl;
 		else {
 			TQDataStream reply( replyData, IO_ReadOnly );
-			if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+			if ( replyType == "TQString" ) {
 				reply >> newTrack;
 				//kdDebug( 14307 ) << "the result is: " << newTrack.latin1()
 				//	<< endl;
diff --git a/kopete/plugins/nowlistening/nlnoatun.cpp b/kopete/plugins/nowlistening/nlnoatun.cpp
index 84c1d051..44e012ae 100644
--- a/kopete/plugins/nowlistening/nlnoatun.cpp
+++ b/kopete/plugins/nowlistening/nlnoatun.cpp
@@ -76,7 +76,7 @@ void NLNoatun::update()
 					<< endl;
 			else {
 				TQDataStream reply( replyData, IO_ReadOnly );
-				if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+				if ( replyType == "TQString" ) {
 					reply >> newTrack;
 				} else
 					kdDebug( 14307 ) << "NLNoatun::update(), title() returned unexpected reply type!" << endl;
@@ -137,7 +137,7 @@ TQString NLNoatun::currentProperty( TQCString appname, TQString property ) const
 	else
 	{
 		TQDataStream reply( replyData, IO_ReadOnly );
-		if ( replyType == TQSTRING_OBJECT_NAME_STRING )
+		if ( replyType == "TQString" )
 		{
 			reply >> result;
 		}
diff --git a/ksirc/puke/pbutton.cpp b/ksirc/puke/pbutton.cpp
index f21cdf03..edccbe81 100644
--- a/ksirc/puke/pbutton.cpp
+++ b/ksirc/puke/pbutton.cpp
@@ -84,7 +84,7 @@ void PButton::messageHandler(int fd, PukeMessage *pm)
 
 void PButton::setWidget(TQObject *_qb)
 {
-  if(_qb != 0 && _qb->inherits(TQBUTTON_OBJECT_NAME_STRING) == FALSE)
+  if(_qb != 0 && _qb->inherits("TQButton") == FALSE)
   {
     errorInvalidSet(_qb);
     return;
diff --git a/ksirc/puke/pframe.cpp b/ksirc/puke/pframe.cpp
index 11d504c5..26051757 100644
--- a/ksirc/puke/pframe.cpp
+++ b/ksirc/puke/pframe.cpp
@@ -63,7 +63,7 @@ void PFrame::messageHandler(int fd, PukeMessage *pm)
 
 void PFrame::setWidget(TQObject *w)
 {
-  if(w != 0 && w->inherits(TQFRAME_OBJECT_NAME_STRING) == FALSE)
+  if(w != 0 && w->inherits("TQFrame") == FALSE)
   {
     errorInvalidSet(w);
     return;
diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp
index 7567ac08..4d2bba48 100644
--- a/ksirc/puke/plabel.cpp
+++ b/ksirc/puke/plabel.cpp
@@ -10,7 +10,7 @@ PLabel::createWidget(CreateArgs &ca)
 {
   PLabel *pw = new PLabel(ca.parent);
   TQLabel *le;
-  if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLABEL_OBJECT_NAME_STRING) == TRUE){
+  if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("TQLabel") == TRUE){
     le = (TQLabel *) ca.fetchedObj;
     pw->setDeleteAble(FALSE);
   }
@@ -97,7 +97,7 @@ void PLabel::messageHandler(int fd, PukeMessage *pm)
 
 void PLabel::setWidget(TQObject *_l)
 {
-  if(_l != 0 && _l->inherits(TQLABEL_OBJECT_NAME_STRING) == FALSE)
+  if(_l != 0 && _l->inherits("TQLabel") == FALSE)
   {
      errorInvalidSet(_l);
      return;
diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp
index f57bacc9..22e60887 100644
--- a/ksirc/puke/playout.cpp
+++ b/ksirc/puke/playout.cpp
@@ -88,7 +88,7 @@ void PLayout::messageHandler(int fd, PukeMessage *pm)
     }
     PObject *pld = controller()->id2pobject(fd, pm->iWinId);
     PObject *pls = controller()->id2pobject(fd, pm->iArg);
-    if( (pld->widget()->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING) == FALSE) || (pls->widget()->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING) == FALSE))
+    if( (pld->widget()->inherits("TQBoxLayout") == FALSE) || (pls->widget()->inherits("TQBoxLayout") == FALSE))
       throw(errorCommandFailed(PUKE_LAYOUT_ADDLAYOUT_ACK, 1));
     PLayout *plbd = (PLayout *) pld;
     PLayout *plbs = (PLayout *) pls;
@@ -136,7 +136,7 @@ void PLayout::messageHandler(int fd, PukeMessage *pm)
 void PLayout::setWidget(TQObject *_layout)
 {
   //  kdDebug(5008) << "PObject setwidget called" << endl;
-  if(_layout != 0 && _layout->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING) == FALSE)
+  if(_layout != 0 && _layout->inherits("TQBoxLayout") == FALSE)
   {
      errorInvalidSet(_layout);
      return;
diff --git a/ksirc/puke/plined.cpp b/ksirc/puke/plined.cpp
index 250edc13..56a4ddc0 100644
--- a/ksirc/puke/plined.cpp
+++ b/ksirc/puke/plined.cpp
@@ -103,7 +103,7 @@ void PLineEdit::messageHandler(int fd, PukeMessage *pm)
 
 void PLineEdit::setWidget(TQObject *_le)
 {
-  if(_le != 0 && _le->inherits(TQLINEEDIT_OBJECT_NAME_STRING) == FALSE)
+  if(_le != 0 && _le->inherits("TQLineEdit") == FALSE)
   {
      errorInvalidSet(_le);
      return;
diff --git a/ksirc/puke/plistbox.cpp b/ksirc/puke/plistbox.cpp
index c244f81b..d0b98305 100644
--- a/ksirc/puke/plistbox.cpp
+++ b/ksirc/puke/plistbox.cpp
@@ -8,7 +8,7 @@ PListBox::createWidget(CreateArgs &ca)
 {
   PListBox *plb = new PListBox(ca.parent);
   TQListBox *lb;
-  if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLISTBOX_OBJECT_NAME_STRING) == TRUE){
+  if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("TQListBox") == TRUE){
     lb = (TQListBox *) ca.fetchedObj;
     plb->setDeleteAble(FALSE);
   }
@@ -152,7 +152,7 @@ void PListBox::messageHandler(int fd, PukeMessage *pm)
 
 void PListBox::setWidget(TQObject *_lb) 
 {
-  if(_lb != 0 && _lb->inherits(TQLISTBOX_OBJECT_NAME_STRING) == FALSE)
+  if(_lb != 0 && _lb->inherits("TQListBox") == FALSE)
   {
     errorInvalidSet(_lb);
     return;
diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp
index 02687c2a..d50f6610 100644
--- a/ksirc/puke/ppopmenu.cpp
+++ b/ksirc/puke/ppopmenu.cpp
@@ -8,7 +8,7 @@ PPopupMenu::createWidget(CreateArgs &ca)
 {
   PPopupMenu *pm = new PPopupMenu(ca.parent);
   TQPopupMenu *qpm;
-  if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) == TRUE){
+  if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("TQPopupMenu") == TRUE){
     qpm= (TQPopupMenu *) ca.fetchedObj;
     pm->setDeleteAble(FALSE);
   }
@@ -81,7 +81,7 @@ void PPopupMenu::messageHandler(int fd, PukeMessage *pm)
 
 void PPopupMenu::setWidget(TQObject *_menu)
 {
-  if(_menu != 0 && _menu->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) == FALSE)
+  if(_menu != 0 && _menu->inherits("TQPopupMenu") == FALSE)
   {
      errorInvalidSet(_menu);
      return;
diff --git a/ksirc/puke/ppushbt.cpp b/ksirc/puke/ppushbt.cpp
index f006fbd2..346abcd3 100644
--- a/ksirc/puke/ppushbt.cpp
+++ b/ksirc/puke/ppushbt.cpp
@@ -45,7 +45,7 @@ void PPushButton::messageHandler(int fd, PukeMessage *pm)
 
 void PPushButton::setWidget(TQObject *_qb)
 {
-  if(_qb != 0 && _qb->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING) == FALSE)
+  if(_qb != 0 && _qb->inherits("TQPushButton") == FALSE)
   {
      errorInvalidSet(_qb);
      return;
diff --git a/ksirc/puke/ptabdialog.cpp b/ksirc/puke/ptabdialog.cpp
index e4fc8dea..3538c8c7 100644
--- a/ksirc/puke/ptabdialog.cpp
+++ b/ksirc/puke/ptabdialog.cpp
@@ -12,7 +12,7 @@ PTabDialog::createWidget(CreateArgs &ca)
   TQTabDialog *qtd;
   // Retreive the border and direction information out of the
   // carg string
-  if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQTABDIALOG_OBJECT_NAME_STRING) == TRUE){
+  if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("TQTabDialog") == TRUE){
     qtd = (TQTabDialog *) ca.fetchedObj;
     ptd->setDeleteAble(FALSE);
   }
@@ -78,7 +78,7 @@ void PTabDialog::messageHandler(int fd, PukeMessage *pm)
 
 void PTabDialog::setWidget(TQObject *tb)
 {
-  if(tb != 0 && tb->inherits(TQTABDIALOG_OBJECT_NAME_STRING) == FALSE)
+  if(tb != 0 && tb->inherits("TQTabDialog") == FALSE)
   {
      errorInvalidSet(tb);
      return;
diff --git a/ksirc/puke/ptablevw.cpp b/ksirc/puke/ptablevw.cpp
index 918b0676..eff40d44 100644
--- a/ksirc/puke/ptablevw.cpp
+++ b/ksirc/puke/ptablevw.cpp
@@ -52,7 +52,7 @@ void PTableView::messageHandler(int fd, PukeMessage *pm)
 
 void PTableView::setWidget(TQObject *_tbv)
 {
-  if(_tbv != 0 && _tbv->inherits(TQGRIDVIEW_OBJECT_NAME_STRING) == FALSE)
+  if(_tbv != 0 && _tbv->inherits("TQGridView") == FALSE)
   {
     errorInvalidSet(_tbv);
     return;
diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp
index 7bf30cda..64ab03cb 100644
--- a/ksirc/puke/pwidget.cpp
+++ b/ksirc/puke/pwidget.cpp
@@ -55,7 +55,7 @@ PObject *PWidget::createWidget(CreateArgs &ca)
 {
   PWidget *pw = new PWidget();
   TQWidget *tw;
-  if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQWIDGET_OBJECT_NAME_STRING) == TRUE){
+  if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("TQWidget") == TRUE){
     tw = (TQWidget *) ca.fetchedObj;
     pw->setDeleteAble(FALSE);
   }
@@ -266,7 +266,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
 
 void PWidget::setWidget(TQObject *_w)
 {
-  if(_w != 0 && _w->inherits(TQWIDGET_OBJECT_NAME_STRING) == FALSE)
+  if(_w != 0 && _w->inherits("TQWidget") == FALSE)
   {
     errorInvalidSet(_w);
     return;
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index 4800a596..d0f05756 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -1285,7 +1285,7 @@ void KSircTopLevel::control_message(int command, TQString str)
           logFile->open();
       }
       setName(m_channelInfo.server().utf8() + "_" + m_channelInfo.channel().utf8() + "_" + "toplevel");
-      pan->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + TQSPLITTER_OBJECT_NAME_STRING);
+      pan->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + "TQSplitter");
       kmenu->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_tdetoolframe");
       linee->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + "LineEnter");
       kmenu->show();