summaryrefslogtreecommitdiffstats
path: root/ksirc/puke
diff options
context:
space:
mode:
Diffstat (limited to 'ksirc/puke')
-rw-r--r--ksirc/puke/controller.cpp56
-rw-r--r--ksirc/puke/palistbox.cpp16
-rw-r--r--ksirc/puke/pbutton.cpp14
-rw-r--r--ksirc/puke/pframe.cpp4
-rw-r--r--ksirc/puke/plabel.cpp12
-rw-r--r--ksirc/puke/playout.cpp10
-rw-r--r--ksirc/puke/plined.cpp4
-rw-r--r--ksirc/puke/plistbox.cpp12
-rw-r--r--ksirc/puke/pmenudta.cpp4
-rw-r--r--ksirc/puke/pobject.cpp8
-rw-r--r--ksirc/puke/ppopmenu.cpp10
-rw-r--r--ksirc/puke/pprogress.cpp4
-rw-r--r--ksirc/puke/ppushbt.cpp4
-rw-r--r--ksirc/puke/ptabdialog.cpp8
-rw-r--r--ksirc/puke/ptablevw.cpp2
-rw-r--r--ksirc/puke/ptdefiledialog.cpp8
-rw-r--r--ksirc/puke/pwidget.cpp8
17 files changed, 92 insertions, 92 deletions
diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index a854cd60..b4c1dd20 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -55,8 +55,8 @@ PukeController::PukeController(TQString sock, TQObject *parent, const char *name
int len, prev_umask;
struct sockaddr_un unix_addr;
- running = FALSE; // Running has to be true before we do any work
- bClosing = FALSE; // we're not trying to close so set this false.
+ running = false; // Running has to be true before we do any work
+ bClosing = false; // we're not trying to close so set this false.
// Set the umask to something sane that doesn't allow others to take over ksirc
prev_umask = umask(0177);
@@ -97,7 +97,7 @@ PukeController::PukeController(TQString sock, TQObject *parent, const char *name
return;
}
- running = TRUE;
+ running = true;
fcntl(iListenFd, F_SETFL, O_NONBLOCK); // Set it non-block so that
// accept() never blocks.
@@ -109,16 +109,16 @@ PukeController::PukeController(TQString sock, TQObject *parent, const char *name
connect(objFind, TQ_SIGNAL(inserted(TQObject *)),
this, TQ_SLOT(slotInserted(TQObject *)));
- qidConnectFd.setAutoDelete(TRUE);
+ qidConnectFd.setAutoDelete(true);
- qidCommandTable.setAutoDelete(TRUE);
+ qidCommandTable.setAutoDelete(true);
/*
* Setup widget data trees
*/
- WidgetList.setAutoDelete(TRUE);
- revWidgetList.setAutoDelete(TRUE);
- widgetCF.setAutoDelete(TRUE);
+ WidgetList.setAutoDelete(true);
+ revWidgetList.setAutoDelete(true);
+ widgetCF.setAutoDelete(true);
/*
* Connect outputMessage to the acutal write buffer function
@@ -181,7 +181,7 @@ void PukeController::NewConnect(int)
connect(fds->sw, TQ_SIGNAL(activated(int)),
this, TQ_SLOT(Writeable(int)));
qidConnectFd.insert(cfd, fds);
- qsnListen->setEnabled(TRUE);
+ qsnListen->setEnabled(true);
/*
* Now we add ourselves as a client to the fd so we can process messages going to us
@@ -197,8 +197,8 @@ void PukeController::NewConnect(int)
void PukeController::Writeable(int fd)
{
if(qidConnectFd[fd]){
- qidConnectFd[fd]->writeable = TRUE;
- qidConnectFd[fd]->sw->setEnabled(FALSE);
+ qidConnectFd[fd]->writeable = true;
+ qidConnectFd[fd]->sw->setEnabled(false);
//
// Insert buffer flushing code here.
//
@@ -211,7 +211,7 @@ void PukeController::Writeable(int fd)
void PukeController::writeBuffer(int fd, PukeMessage *message)
{
if(qidConnectFd[fd]){
- // if(qidConnectFd[fd]->writeable == FALSE){
+ // if(!qidConnectFd[fd]->writeable){
// kdDebug(5008) << "PUKE: Writing to FD that's not writeable: " << fd << endl;
// }
if(message != 0){
@@ -345,7 +345,7 @@ void PukeController::Traffic(int fd)
}
}
else{
- qidConnectFd[fd]->sr->setEnabled(TRUE);
+ qidConnectFd[fd]->sr->setEnabled(true);
}
}
@@ -656,7 +656,7 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm)
}
*/
- if(checkWidgetId(&wI) == FALSE){
+ if(!checkWidgetId(&wI)){
tqWarning("WidgetRunner: no such widget: %d", wI.iWinId);
throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_WIDGET));
}
@@ -672,16 +672,16 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm)
void PukeController::closefd(int fd)
{
- if(bClosing == TRUE)
+ if(bClosing)
return;
- bClosing = TRUE;
+ bClosing = true;
if(qidConnectFd[fd] == NULL){
kdDebug(5008) << "PukeController: Connect table NULL, closed twice?" << endl;
return;
}
// Shutof the listener before closing the socket, just in case.
- qidConnectFd[fd]->sr->setEnabled(FALSE); // Shut them off
- qidConnectFd[fd]->sw->setEnabled(FALSE);
+ qidConnectFd[fd]->sr->setEnabled(false); // Shut them off
+ qidConnectFd[fd]->sw->setEnabled(false);
delete qidConnectFd[fd]->sr;
delete qidConnectFd[fd]->sw;
qidConnectFd[fd]->server.truncate(0);
@@ -694,7 +694,7 @@ void PukeController::closefd(int fd)
TQIntDict<WidgetS> *qidWS = WidgetList[fd];
if(qidWS == 0){
kdDebug(5008) << "WidgetRunner:: Close called twice?" << endl;
- bClosing = FALSE;
+ bClosing = false;
return;
}
@@ -739,20 +739,20 @@ void PukeController::closefd(int fd)
} while (qidWS->count() > 0);
WidgetList.remove(fd);
- bClosing = FALSE;
+ bClosing = false;
}
bool PukeController::checkWidgetId(widgetId *pwi)
{
if(WidgetList[pwi->fd] != NULL)
if(WidgetList[pwi->fd]->find(pwi->iWinId) != NULL)
- return TRUE;
+ return true;
- return FALSE;
+ return false;
}
PObject *PukeController::id2pobject(widgetId *pwi){
- if(checkWidgetId(pwi) == TRUE){
+ if(checkWidgetId(pwi)){
return WidgetList[pwi->fd]->find(pwi->iWinId)->pwidget;
}
throw(errorNoSuchWidget(*pwi));
@@ -779,7 +779,7 @@ void PukeController::insertPObject(int fd, int iWinId, WidgetS *obj){
// If no widget list exists for this fd, create one
if(WidgetList[fd] == NULL){
TQIntDict<WidgetS> *qidWS = new TQIntDict<WidgetS>;
- qidWS->setAutoDelete(TRUE);
+ qidWS->setAutoDelete(true);
WidgetList.insert(fd, qidWS);
}
// Set main widget structure list
@@ -813,7 +813,7 @@ void PukeController::pobjectDestroyed(){
return;
}
- if(checkWidgetId(pwi) == TRUE){
+ if(checkWidgetId(pwi)){
WidgetList[pwi->fd]->remove(pwi->iWinId);
}
else {
@@ -898,7 +898,7 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) {
}
}
else{
- if(checkWidgetId(&wI) == TRUE){
+ if(checkWidgetId(&wI)){
WidgetList[wI.fd]->find(wI.iWinId)->pwidget->messageHandler(fd, pm);
}
else{
@@ -942,9 +942,9 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm)
wIret.iWinId = uiBaseWinId;
wIret.fd = wI.fd;
- if(checkWidgetId(&wI) == TRUE){
+ if(checkWidgetId(&wI)){
PObject *obj = WidgetList[wI.fd]->find(wI.iWinId)->pwidget;
- if(obj->widget()->isWidgetType() == FALSE){
+ if(!obj->widget()->isWidgetType()){
throw(errorCommandFailed(PUKE_INVALID, 0));
}
parent = (PWidget *) obj;
diff --git a/ksirc/puke/palistbox.cpp b/ksirc/puke/palistbox.cpp
index 9f43b124..9a930da7 100644
--- a/ksirc/puke/palistbox.cpp
+++ b/ksirc/puke/palistbox.cpp
@@ -8,11 +8,11 @@ PAListBox::createWidget(CreateArgs &ca)
{
PAListBox *plb = new PAListBox(ca.parent);
aListBox *lb;
- if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("aListBox") == TRUE){
+ if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("aListBox")){
lb = (aListBox *) ca.fetchedObj;
- plb->setDeleteAble(FALSE);
+ plb->setDeleteAble(false);
}
- else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType())
lb = new aListBox((TQWidget *) ca.parent->widget());
else
lb = new aListBox();
@@ -88,7 +88,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm)
widget()->removeItem(index);
item->setVoice(pm->iArg);
widget()->inSort(item);
- widget()->repaint(TRUE);
+ widget()->repaint(true);
pmRet.iCommand = - pm->iCommand;
pmRet.iWinId = pm->iWinId;
@@ -108,7 +108,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm)
widget()->removeItem(index);
item->setOp(pm->iArg);
widget()->inSort(item);
- widget()->repaint(TRUE);
+ widget()->repaint(true);
pmRet.iCommand = - pm->iCommand;
pmRet.iWinId = pm->iWinId;
@@ -125,7 +125,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm)
void PAListBox::setWidget(TQObject *_lb)
{
- if(_lb != 0 && _lb->inherits("aListBox") == FALSE)
+ if(_lb != 0 && !_lb->inherits("aListBox"))
{
errorInvalidSet(_lb);
return;
@@ -147,9 +147,9 @@ aListBox *PAListBox::widget()
bool PAListBox::checkWidget(){
if(widget() == 0){
kdDebug(5008) << "PAListBox: No Widget set" << endl;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#include "palistbox.moc"
diff --git a/ksirc/puke/pbutton.cpp b/ksirc/puke/pbutton.cpp
index 6f128464..9751f875 100644
--- a/ksirc/puke/pbutton.cpp
+++ b/ksirc/puke/pbutton.cpp
@@ -12,7 +12,7 @@ PButton::createWidget(CreateArgs &ca)
{
PButton *pb = new PButton(ca.parent);
TQButton *qb;
- if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ if(ca.parent != 0 && ca.parent->widget()->isWidgetType())
qb = new TQButton((TQWidget *) ca.parent->widget());
else
qb = new TQButton();
@@ -45,7 +45,7 @@ void PButton::messageHandler(int fd, PukeMessage *pm)
PukeMessage pmRet;
switch(pm->iCommand){
case PUKE_BUTTON_SET_TEXT:
- if(checkWidget() == FALSE)
+ if(!checkWidget())
return;
widget()->setText(pm->cArg); // set the text
@@ -57,7 +57,7 @@ void PButton::messageHandler(int fd, PukeMessage *pm)
emit outputMessage(fd, &pmRet);
break;
case PUKE_BUTTON_SET_PIXMAP:
- if(checkWidget() == FALSE)
+ if(!checkWidget())
return;
widget()->setPixmap(TQPixmap(pm->cArg));
@@ -69,7 +69,7 @@ void PButton::messageHandler(int fd, PukeMessage *pm)
emit outputMessage(fd, &pmRet);
break;
case PUKE_BUTTON_SET_AUTORESIZE:
- if(checkWidget() == FALSE)
+ if(!checkWidget())
return;
pmRet.iCommand = - pm->iCommand;
@@ -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"))
{
errorInvalidSet(_qb);
return;
@@ -148,9 +148,9 @@ bool PButton::checkWidget()
{
if(widget() == 0){
kdDebug(5008) << "PButton: No Widget set" << endl;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#include "pbutton.moc"
diff --git a/ksirc/puke/pframe.cpp b/ksirc/puke/pframe.cpp
index 26051757..e83c2e49 100644
--- a/ksirc/puke/pframe.cpp
+++ b/ksirc/puke/pframe.cpp
@@ -7,7 +7,7 @@ PFrame::createWidget(CreateArgs &ca)
PFrame *pw = new PFrame(ca.parent);
TQFrame *tf;
if(ca.parent != 0 &&
- ca.parent->widget()->isWidgetType() == TRUE)
+ ca.parent->widget()->isWidgetType())
tf = new TQFrame((TQWidget *) ca.parent->widget());
else
tf = new TQFrame();
@@ -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"))
{
errorInvalidSet(w);
return;
diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp
index 4d2bba48..64da06b2 100644
--- a/ksirc/puke/plabel.cpp
+++ b/ksirc/puke/plabel.cpp
@@ -10,11 +10,11 @@ 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")){
le = (TQLabel *) ca.fetchedObj;
- pw->setDeleteAble(FALSE);
+ pw->setDeleteAble(false);
}
- else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType())
le = new TQLabel((TQWidget *) ca.parent->widget());
else
le = new TQLabel((TQWidget *)0L);
@@ -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"))
{
errorInvalidSet(_l);
return;
@@ -117,9 +117,9 @@ TQLabel *PLabel::widget()
bool PLabel::checkWidget(){
if(widget() == 0){
kdDebug(5008) << "PLabel: No Widget set" << endl;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp
index 22e60887..86ab097f 100644
--- a/ksirc/puke/playout.cpp
+++ b/ksirc/puke/playout.cpp
@@ -32,7 +32,7 @@ PObject *PLayout::createWidget(CreateArgs &ca)
throw(errorCommandFailed(-ca.pm->iCommand, -1));
if((ca.parent != 0) &&
- (ca.parent->widget()->isWidgetType() == TRUE)){
+ (ca.parent->widget()->isWidgetType())){
qbl = new TQBoxLayout((TQWidget *) ca.parent->widget(), (TQBoxLayout::Direction) direction, border);
// kdDebug(5008) << "Creating layout with parent: " << parent.iWinId << endl;
@@ -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") || !pls->widget()->inherits("TQBoxLayout") )
throw(errorCommandFailed(PUKE_LAYOUT_ADDLAYOUT_ACK, 1));
PLayout *plbd = (PLayout *) pld;
PLayout *plbs = (PLayout *) pls;
@@ -102,7 +102,7 @@ void PLayout::messageHandler(int fd, PukeMessage *pm)
}
else if(pm->iCommand == PUKE_LAYOUT_ADDSTRUT){
PObject *po = controller()->id2pobject(fd, pm->iWinId);
- if(po->widget()->inherits("PBoxLayout") != TRUE)
+ if(!po->widget()->inherits("PBoxLayout"))
throw(errorCommandFailed(PUKE_LAYOUT_ADDSTRUT_ACK, 1));
PLayout *pl = (PLayout *) po;
@@ -115,7 +115,7 @@ void PLayout::messageHandler(int fd, PukeMessage *pm)
}
else if(pm->iCommand == PUKE_LAYOUT_ACTIVATE){
PObject *po = controller()->id2pobject(fd, pm->iWinId);
- if(po->widget()->inherits("PBoxLayout") != TRUE)
+ if(!po->widget()->inherits("PBoxLayout"))
throw(errorCommandFailed(PUKE_LAYOUT_ACTIVATE_ACK, 1));
PLayout *pl = (PLayout *) po;
@@ -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"))
{
errorInvalidSet(_layout);
return;
diff --git a/ksirc/puke/plined.cpp b/ksirc/puke/plined.cpp
index 1817e0a9..bfedcb01 100644
--- a/ksirc/puke/plined.cpp
+++ b/ksirc/puke/plined.cpp
@@ -10,7 +10,7 @@ PLineEdit::createWidget(CreateArgs &ca)
{
PLineEdit *pw = new PLineEdit(ca.parent);
TQLineEdit *le;
- if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ if(ca.parent != 0 && ca.parent->widget()->isWidgetType())
le = new TQLineEdit((TQWidget *) ca.parent->widget());
else
le = new TQLineEdit(0L);
@@ -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"))
{
errorInvalidSet(_le);
return;
diff --git a/ksirc/puke/plistbox.cpp b/ksirc/puke/plistbox.cpp
index b8f9b8b8..e171c02d 100644
--- a/ksirc/puke/plistbox.cpp
+++ b/ksirc/puke/plistbox.cpp
@@ -8,11 +8,11 @@ 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")){
lb = (TQListBox *) ca.fetchedObj;
- plb->setDeleteAble(FALSE);
+ plb->setDeleteAble(false);
}
- else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType())
lb = new TQListBox((TQWidget *) ca.parent->widget());
else
lb = new TQListBox();
@@ -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"))
{
errorInvalidSet(_lb);
return;
@@ -215,9 +215,9 @@ void PListBox::selected(int index) {
bool PListBox::checkWidget(){
if(widget() == 0){
kdDebug(5008) << "PListBox: No Widget set" << endl;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#include "plistbox.moc"
diff --git a/ksirc/puke/pmenudta.cpp b/ksirc/puke/pmenudta.cpp
index 1bf7f9bd..0cc8a1b1 100644
--- a/ksirc/puke/pmenudta.cpp
+++ b/ksirc/puke/pmenudta.cpp
@@ -70,9 +70,9 @@ bool PMenuData::menuMessageHandler(int fd, PukeMessage *pm)
}
default:
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#include "pmenudta.moc"
diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp
index 28a305c1..db9fe89f 100644
--- a/ksirc/puke/pobject.cpp
+++ b/ksirc/puke/pobject.cpp
@@ -8,8 +8,8 @@ PObject::PObject(TQObject *pobject, const char *name)
// Connect slots as needed
obj = 0;
setWidget(0);
- manualTerm = FALSE;
- deleteAble = TRUE;
+ manualTerm = false;
+ deleteAble = true;
m_hasError = false;
}
@@ -114,7 +114,7 @@ widgetId PObject::widgetIden()
void PObject::swidgetDestroyed(){
setWidget(0x0);
- if(manualTerm == FALSE){
+ if(!manualTerm){
manTerm();
delete this;
}
@@ -126,7 +126,7 @@ PukeController *PObject::controller() {
}
void PObject::manTerm() {
- manualTerm = TRUE;
+ manualTerm = true;
}
void PObject::errorInvalidSet(TQObject *_w)
diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp
index fe8bb1f7..d1509c33 100644
--- a/ksirc/puke/ppopmenu.cpp
+++ b/ksirc/puke/ppopmenu.cpp
@@ -8,11 +8,11 @@ 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")){
qpm= (TQPopupMenu *) ca.fetchedObj;
- pm->setDeleteAble(FALSE);
+ pm->setDeleteAble(false);
}
- else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType())
qpm = new TQPopupMenu((TQWidget *) ca.parent->widget());
else
qpm = new TQPopupMenu();
@@ -74,14 +74,14 @@ void PPopupMenu::messageHandler(int fd, PukeMessage *pm)
break;
default:
- if(pmd->menuMessageHandler(fd, pm) == FALSE) // Call pmd's even filter
+ if(!pmd->menuMessageHandler(fd, pm)) // Call pmd's even filter
PFrame::messageHandler(fd, pm);
}
}
void PPopupMenu::setWidget(TQObject *_menu)
{
- if(_menu != 0 && _menu->inherits("TQPopupMenu") == FALSE)
+ if(_menu != 0 && !_menu->inherits("TQPopupMenu"))
{
errorInvalidSet(_menu);
return;
diff --git a/ksirc/puke/pprogress.cpp b/ksirc/puke/pprogress.cpp
index 4666fa59..9b5a0beb 100644
--- a/ksirc/puke/pprogress.cpp
+++ b/ksirc/puke/pprogress.cpp
@@ -10,7 +10,7 @@ PProgress::createWidget(CreateArgs &ca)
{
PProgress *pw = new PProgress(ca.parent);
KSProgress *ksp;
- if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ if(ca.parent != 0 && ca.parent->widget()->isWidgetType())
ksp = new KSProgress((TQWidget *) ca.parent->widget());
else
ksp = new KSProgress();
@@ -107,7 +107,7 @@ void PProgress::cancelPressed(){
void PProgress::setWidget(TQObject *_f)
{
// kdDebug(5008) << "PProgress setWidget called" << endl;
- if(_f != 0 && _f->inherits("KSProgress") == FALSE)
+ if(_f != 0 && !_f->inherits("KSProgress"))
{
errorInvalidSet(_f);
return;
diff --git a/ksirc/puke/ppushbt.cpp b/ksirc/puke/ppushbt.cpp
index 346abcd3..b4c6477d 100644
--- a/ksirc/puke/ppushbt.cpp
+++ b/ksirc/puke/ppushbt.cpp
@@ -7,7 +7,7 @@ PPushButton::createWidget(CreateArgs &ca)
{
PPushButton *pb = new PPushButton(ca.parent);
TQPushButton *qb;
- if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ if(ca.parent != 0 && ca.parent->widget()->isWidgetType())
qb = new TQPushButton((TQWidget *) ca.parent->widget());
else
qb = new TQPushButton(0L);
@@ -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"))
{
errorInvalidSet(_qb);
return;
diff --git a/ksirc/puke/ptabdialog.cpp b/ksirc/puke/ptabdialog.cpp
index 3538c8c7..b0cb85bc 100644
--- a/ksirc/puke/ptabdialog.cpp
+++ b/ksirc/puke/ptabdialog.cpp
@@ -12,11 +12,11 @@ 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")){
qtd = (TQTabDialog *) ca.fetchedObj;
- ptd->setDeleteAble(FALSE);
+ ptd->setDeleteAble(false);
}
- else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType())
qtd = new TQTabDialog((TQWidget *) ca.parent->widget());
else
qtd = new TQTabDialog();
@@ -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"))
{
errorInvalidSet(tb);
return;
diff --git a/ksirc/puke/ptablevw.cpp b/ksirc/puke/ptablevw.cpp
index eff40d44..9c191ab8 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"))
{
errorInvalidSet(_tbv);
return;
diff --git a/ksirc/puke/ptdefiledialog.cpp b/ksirc/puke/ptdefiledialog.cpp
index d60b47d5..2ff4d68f 100644
--- a/ksirc/puke/ptdefiledialog.cpp
+++ b/ksirc/puke/ptdefiledialog.cpp
@@ -11,12 +11,12 @@ PKFileDialog::createWidget(CreateArgs &ca)
{
PKFileDialog *pw = new PKFileDialog(ca.parent);
KFileDialog *kfbd;
- if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("KFileDialog") == TRUE){
+ if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("KFileDialog")){
kfbd = (KFileDialog *) ca.fetchedObj;
- pw->setDeleteAble(FALSE);
+ pw->setDeleteAble(false);
}
else // Never takes a parent in Puke
- kfbd = new KFileDialog("/", TQString(), 0L, "PukeKFileDialog", TRUE);
+ kfbd = new KFileDialog("/", TQString(), 0L, "PukeKFileDialog", true);
pw->setWidget(kfbd);
pw->setWidgetId(ca.pwI);
return pw;
@@ -104,7 +104,7 @@ void PKFileDialog::messageHandler(int fd, PukeMessage *pm)
void PKFileDialog::setWidget(TQObject *_kbfd)
{
- if(_kbfd != 0 && _kbfd->inherits("KFileBaseDialog") == FALSE)
+ if(_kbfd != 0 && !_kbfd->inherits("KFileBaseDialog"))
{
errorInvalidSet(_kbfd);
return;
diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp
index 64ab03cb..0dce8615 100644
--- a/ksirc/puke/pwidget.cpp
+++ b/ksirc/puke/pwidget.cpp
@@ -55,11 +55,11 @@ 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")){
tw = (TQWidget *) ca.fetchedObj;
- pw->setDeleteAble(FALSE);
+ pw->setDeleteAble(false);
}
- else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType())
tw = new TQWidget((TQWidget *) ca.parent->widget());
else
tw = new TQWidget();
@@ -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"))
{
errorInvalidSet(_w);
return;