summaryrefslogtreecommitdiffstats
path: root/ksirc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-24 07:08:32 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-24 07:08:32 +0000
commitaca844682f86c04f6b67b23de2a820fb0c63a32e (patch)
tree2c26de587f689a20a49e400eab3fcb6d88c78b13 /ksirc
parent9c496cd9917ea30e87a6f697b5d19119a9e2e563 (diff)
downloadtdenetwork-aca844682f86c04f6b67b23de2a820fb0c63a32e.tar.gz
tdenetwork-aca844682f86c04f6b67b23de2a820fb0c63a32e.zip
Fix a number of runtime object identification problems which led to an even larger array of minor glitches
NOTE: kdevelop and kdewebdev still need to be fully repaired git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksirc')
-rw-r--r--ksirc/puke/pbutton.cpp2
-rw-r--r--ksirc/puke/pframe.cpp2
-rw-r--r--ksirc/puke/plabel.cpp4
-rw-r--r--ksirc/puke/playout.cpp4
-rw-r--r--ksirc/puke/plined.cpp2
-rw-r--r--ksirc/puke/plistbox.cpp4
-rw-r--r--ksirc/puke/ppopmenu.cpp4
-rw-r--r--ksirc/puke/ppushbt.cpp2
-rw-r--r--ksirc/puke/ptabdialog.cpp4
-rw-r--r--ksirc/puke/ptablevw.cpp2
-rw-r--r--ksirc/puke/pwidget.cpp4
11 files changed, 17 insertions, 17 deletions
diff --git a/ksirc/puke/pbutton.cpp b/ksirc/puke/pbutton.cpp
index edccbe81..f21cdf03 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") == FALSE)
+ if(_qb != 0 && _qb->inherits(TQBUTTON_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(_qb);
return;
diff --git a/ksirc/puke/pframe.cpp b/ksirc/puke/pframe.cpp
index d0dc79e3..ed58d5a7 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") == FALSE)
+ if(w != 0 && w->inherits(TQFRAME_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(w);
return;
diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp
index 4d2bba48..7567ac08 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") == TRUE){
+ if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLABEL_OBJECT_NAME_STRING) == 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") == FALSE)
+ if(_l != 0 && _l->inherits(TQLABEL_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(_l);
return;
diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp
index ae4fa6d1..9bcdfa2a 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") == FALSE) || (pls->widget()->inherits("TQBoxLayout") == FALSE))
+ if( (pld->widget()->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING) == FALSE) || (pls->widget()->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING) == 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") == FALSE)
+ if(_layout != 0 && _layout->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(_layout);
return;
diff --git a/ksirc/puke/plined.cpp b/ksirc/puke/plined.cpp
index 56a4ddc0..250edc13 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") == FALSE)
+ if(_le != 0 && _le->inherits(TQLINEEDIT_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(_le);
return;
diff --git a/ksirc/puke/plistbox.cpp b/ksirc/puke/plistbox.cpp
index d0b98305..c244f81b 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") == TRUE){
+ if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLISTBOX_OBJECT_NAME_STRING) == 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") == FALSE)
+ if(_lb != 0 && _lb->inherits(TQLISTBOX_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(_lb);
return;
diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp
index cabf4d94..3ed66aa3 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") == TRUE){
+ if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) == 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") == FALSE)
+ if(_menu != 0 && _menu->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(_menu);
return;
diff --git a/ksirc/puke/ppushbt.cpp b/ksirc/puke/ppushbt.cpp
index 346abcd3..f006fbd2 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") == FALSE)
+ if(_qb != 0 && _qb->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(_qb);
return;
diff --git a/ksirc/puke/ptabdialog.cpp b/ksirc/puke/ptabdialog.cpp
index 4099aa0a..ee3054ff 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") == TRUE){
+ if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQTABDIALOG_OBJECT_NAME_STRING) == 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") == FALSE)
+ if(tb != 0 && tb->inherits(TQTABDIALOG_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(tb);
return;
diff --git a/ksirc/puke/ptablevw.cpp b/ksirc/puke/ptablevw.cpp
index 7c744ac9..64c8fa2e 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") == FALSE)
+ if(_tbv != 0 && _tbv->inherits(TQGRIDVIEW_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(_tbv);
return;
diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp
index 9ce99a2b..b62f64c1 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") == TRUE){
+ if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQWIDGET_OBJECT_NAME_STRING) == 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") == FALSE)
+ if(_w != 0 && _w->inherits(TQWIDGET_OBJECT_NAME_STRING) == FALSE)
{
errorInvalidSet(_w);
return;