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

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

12 files changed, 18 insertions, 18 deletions

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();