diff options
Diffstat (limited to 'ksirc')
58 files changed, 350 insertions, 350 deletions
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp index 44d9d338..67d8d492 100644 --- a/ksirc/FilterRuleEditor.cpp +++ b/ksirc/FilterRuleEditor.cpp @@ -51,7 +51,7 @@ FilterRuleEditor::FilterRuleEditor filter->RuleList->setHScrollBarMode( TQListBox::AlwaysOff ); - filter->RuleList->setMultiSelection( FALSE ); + filter->RuleList->setMultiSelection( false ); filter->DownButton->setPixmap( BarIcon( "go-down", TDEIcon::SizeSmall ) ); filter->UpButton->setPixmap( BarIcon( "go-up", TDEIcon::SizeSmall ) ); diff --git a/ksirc/KSOpenkSirc/enter_combo.h b/ksirc/KSOpenkSirc/enter_combo.h index 349e9768..a5fddf7c 100644 --- a/ksirc/KSOpenkSirc/enter_combo.h +++ b/ksirc/KSOpenkSirc/enter_combo.h @@ -13,7 +13,7 @@ class EnterCombo : public TQComboBox { public: EnterCombo ( TQWidget * parent=0, const char * name=0 ) - : TQComboBox(TRUE, parent, name) + : TQComboBox(true, parent, name) { } EnterCombo ( bool rw, TQWidget * parent=0, const char * name=0 ) diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp index 7a7cee21..1f3775ef 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.cpp +++ b/ksirc/KSOpenkSirc/open_ksirc.cpp @@ -50,7 +50,7 @@ open_ksirc::open_ksirc TQString filename = locate("appdata", "servers.txt"); serverFileParser::readDatafile( filename.ascii() ); - Groups.setAutoDelete(TRUE); + Groups.setAutoDelete(true); // TODO add "Recent" to global listing servers here.. // Now we read in the Recent group from the config file @@ -102,8 +102,8 @@ open_ksirc::open_ksirc } } - ComboB_ServerName->setAutoCompletion( TRUE ); - ComboB_ServerPort->setAutoCompletion( TRUE ); + ComboB_ServerName->setAutoCompletion( true ); + ComboB_ServerPort->setAutoCompletion( true ); insertGroupList(); @@ -119,8 +119,8 @@ open_ksirc::open_ksirc connect(PB_Edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickEdit())); connect(PB_Cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickCancel())); - PB_Connect->setDefault(TRUE); - PB_Connect->setAutoDefault(TRUE); + PB_Connect->setDefault(true); + PB_Connect->setAutoDefault(true); PB_Edit->setEnabled(false); // Not yet implemented. ComboB_ServerName->setFocus(); @@ -180,7 +180,7 @@ void open_ksirc::setServer( const TQString &serveraddress ) Server *serv; TQPtrList<port> portlist; port *p; - bool defaultport = FALSE; + bool defaultport = false; for ( serv=Groups.first(); serv != 0; serv=Groups.next() ) { if (serv->server() == serveraddress) { @@ -189,7 +189,7 @@ void open_ksirc::setServer( const TQString &serveraddress ) for ( p=portlist.last(); p != 0; p=portlist.prev() ) { newListBox->insertItem( p->portnum() ); if (strcmp(p->portnum().ascii(), "6667") == 0) - defaultport = TRUE; + defaultport = true; } LineE_Password->setText( serv->password() ); CheckB_StorePassword->setEnabled( !serv->password().isEmpty() ); diff --git a/ksirc/KSOpenkSirc/serverDataType.h b/ksirc/KSOpenkSirc/serverDataType.h index 417625e8..257348ee 100644 --- a/ksirc/KSOpenkSirc/serverDataType.h +++ b/ksirc/KSOpenkSirc/serverDataType.h @@ -32,7 +32,7 @@ public: g=group; s=server; p=ports; sd=serverdesc; sc=script; pass=password; ssl = dossl; - p.setAutoDelete(TRUE); + p.setAutoDelete(true); } TQString group() const { return g; } TQString server() const { return s; } diff --git a/ksirc/KSOpenkSirc/serverFileParser.cpp b/ksirc/KSOpenkSirc/serverFileParser.cpp index 59288d00..1b482486 100644 --- a/ksirc/KSOpenkSirc/serverFileParser.cpp +++ b/ksirc/KSOpenkSirc/serverFileParser.cpp @@ -14,7 +14,7 @@ extern TQPtrList<Server> Groups; int serverFileParser::readDatafile( const char *fileName ) { - Groups.setAutoDelete( TRUE ); + Groups.setAutoDelete( true ); Groups.clear(); TQFile serverFile( fileName ); if ( !serverFile.open( IO_ReadOnly ) ) diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp index 8ce6311d..9849df56 100644 --- a/ksirc/KSPrefs/page_autoconnect.cpp +++ b/ksirc/KSPrefs/page_autoconnect.cpp @@ -31,8 +31,8 @@ PageAutoConnect::PageAutoConnect( TQWidget *parent, const char *name ) : PageAut KLVAutoConnect->setSorting( 0 ); //KLVAutoConnect->header()->hide(); - AddPB->setEnabled(FALSE); - DeletePB->setEnabled(FALSE); + AddPB->setEnabled(false); + DeletePB->setEnabled(false); PortKI->setValue(6667); } @@ -122,7 +122,7 @@ void PageAutoConnect::readConfig() } kdDebug(5008) << server << ": Done " << port << " " << ssl << " " << pass << endl; TQListViewItem *s = new TQListViewItem(KLVAutoConnect, server, port, pass, ssl); - s->setOpen(TRUE); + s->setOpen(true); channels.sort(); TQStringList::ConstIterator chan = channels.begin(); for(; chan != channels.end(); chan++){ @@ -165,7 +165,7 @@ void PageAutoConnect::add_pressed() ssl = i18n("SSL"); s = new TQListViewItem(KLVAutoConnect, server, port, PassLE->text(), ssl); - s->setOpen(TRUE); + s->setOpen(true); s = new TQListViewItem(s, ChannelLE->text(), KeyLE->text()); KLVAutoConnect->setCurrentItem(s); } @@ -233,7 +233,7 @@ void PageAutoConnect::delete_pressed() it = it->nextSibling()){ if(it->text(NAME) == ServerLE->text()){ - if(ChannelLE->text().isEmpty() == FALSE){ + if(!ChannelLE->text().isEmpty()){ for(TQListViewItem *ch = it->firstChild(); ch != 0; ch = ch->nextSibling()){ diff --git a/ksirc/KSPrefs/page_colors.cpp b/ksirc/KSPrefs/page_colors.cpp index 31d22044..9e76850f 100644 --- a/ksirc/KSPrefs/page_colors.cpp +++ b/ksirc/KSPrefs/page_colors.cpp @@ -202,7 +202,7 @@ void PageColors::defaultConfig() void PageColors::changed() { if(changing == 0) - themeLB->setSelected(0, TRUE); + themeLB->setSelected(0, true); coloursSetEnable(); emit modified(); } diff --git a/ksirc/KSProgress/ksprogress.cpp b/ksirc/KSProgress/ksprogress.cpp index ccf3b194..5feed079 100644 --- a/ksirc/KSProgress/ksprogress.cpp +++ b/ksirc/KSProgress/ksprogress.cpp @@ -18,7 +18,7 @@ KSProgress::KSProgress { setCaption("KSProgress"); id = ""; - canceled = FALSE; + canceled = false; } @@ -49,7 +49,7 @@ void KSProgress::setValue(int value) void KSProgress::cancelPressed() { - canceled = TRUE; + canceled = true; emit cancel(); emit cancel(id); } diff --git a/ksirc/KSProgress/ksprogressdata.cpp b/ksirc/KSProgress/ksprogressdata.cpp index 4c83794d..64dbfbbd 100644 --- a/ksirc/KSProgress/ksprogressdata.cpp +++ b/ksirc/KSProgress/ksprogressdata.cpp @@ -39,7 +39,7 @@ ksprogressData::ksprogressData dlgedit_PushButton_1->setMinimumSize( 10, 10 ); dlgedit_PushButton_1->setMaximumSize( 32767, 32767 ); connect( dlgedit_PushButton_1, TQ_SIGNAL(clicked()), TQ_SLOT(cancelPressed()) ); - dlgedit_PushButton_1->setAutoRepeat( FALSE ); + dlgedit_PushButton_1->setAutoRepeat( false ); fileName = new TQLabel( this, "Label_1" ); fileName->setGeometry( 10, 10, 230, 20 ); diff --git a/ksirc/KSTicker/kspainter.cpp b/ksirc/KSTicker/kspainter.cpp index 2b8f83a8..6e933808 100644 --- a/ksirc/KSTicker/kspainter.cpp +++ b/ksirc/KSTicker/kspainter.cpp @@ -58,7 +58,7 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty, char buf[3]; int loc = 0, i; buf[2] = 0; - bool ReverseText = FALSE; + bool ReverseText = false; // Default pen (colour) @@ -131,18 +131,18 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty, case 'C': p->setPen(qpDefPen); p->setBackgroundMode(TQt::TransparentMode); - fnt.setBold(FALSE); - fnt.setItalic(FALSE); - fnt.setUnderline(FALSE); - ReverseText = TRUE; // Force reverse removed, all fall through. + fnt.setBold(false); + fnt.setItalic(false); + fnt.setUnderline(false); + ReverseText = true; // Force reverse removed, all fall through. // FALL THROUGH. case 'r': - if(ReverseText == TRUE) { - ReverseText = FALSE; + if(ReverseText) { + ReverseText = false; p->setBackgroundMode(TQt::TransparentMode); } else { - ReverseText = TRUE; + ReverseText = true; p->setBackgroundMode(TQt::OpaqueMode); } temppen = p->pen().color(); @@ -150,22 +150,22 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty, p->setBackgroundColor( temppen ); break; case 'b': - if(fnt.bold() == TRUE) - fnt.setBold(FALSE); + if(fnt.bold()) + fnt.setBold(false); else - fnt.setBold(TRUE); + fnt.setBold(true); break; case 'i': - if(fnt.italic() == TRUE) - fnt.setItalic(FALSE); + if(fnt.italic()) + fnt.setItalic(false); else - fnt.setItalic(TRUE); + fnt.setItalic(true); break; case 'u': - if(fnt.underline() == TRUE) - fnt.setUnderline(FALSE); + if(fnt.underline()) + fnt.setUnderline(false); else - fnt.setUnderline(TRUE); + fnt.setUnderline(true); break; case '~': loc++; // Skip ahead 2 characters diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index 5fe687e2..fd76c31e 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -32,9 +32,9 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f) TDEConfig *conf = kapp->config(); conf->setGroup("KSTicker"); - bScrollConstantly = conf->readNumEntry("ScollConst", FALSE); + bScrollConstantly = conf->readNumEntry("ScollConst", false); - bAtEnd = FALSE; + bAtEnd = false; setFont(conf->readFontEntry("Font", &ksopts->defaultFont)); ourFont = font(); //TQFont("Courier"); setFont(ourFont); @@ -77,9 +77,9 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f) KSPainter::initOptColours(); - bold = FALSE; - underline = FALSE; - italics = FALSE; + bold = false; + underline = false; + italics = false; defbg = ksopts->backgroundColor; deffg = ksopts->textColor; setBackgroundColor(defbg); @@ -110,7 +110,7 @@ void KSTicker::show() if(currentStr.length() != 0) startTicker(); currentChar = 0; - repaint(TRUE); + repaint(true); } void KSTicker::hide() @@ -129,7 +129,7 @@ void KSTicker::setString(TQString str) { strlist.clear(); strlist.append(str); - repaint(TRUE); + repaint(true); startTicker(); } @@ -162,8 +162,8 @@ void KSTicker::mergeString(TQString str) int found = 0; TQStringList::Iterator it = strlist.begin(); for(; it != strlist.end(); it++){ - if(((*it).find(ksopts->server["global"].nick, 0, FALSE) == -1) && - ((*it).find(ksopts->server["global"].altNick, 0, FALSE) == -1)){ + if(((*it).find(ksopts->server["global"].nick, 0, false) == -1) && + ((*it).find(ksopts->server["global"].altNick, 0, false) == -1)){ strlist.remove(it); found = 1; break; @@ -176,7 +176,7 @@ void KSTicker::mergeString(TQString str) } } - if(bScrollConstantly == FALSE) + if(!bScrollConstantly) startTicker(); TQStringList sep = TQStringList::split(" ", stripCols(str)); @@ -209,7 +209,7 @@ void KSTicker::timerEvent(TQTimerEvent *) { if((uint)currentChar >= currentStr.length()){ if(strlist.isEmpty()){ - if(bScrollConstantly == TRUE){ + if(bScrollConstantly){ currentStr = strbuffer.first(); strbuffer.append(strbuffer.first()); strbuffer.pop_front(); @@ -230,7 +230,7 @@ void KSTicker::timerEvent(TQTimerEvent *) } } - bAtEnd = FALSE; + bAtEnd = false; static TQt::BGMode bgmode = TQt::TransparentMode; bitBlt(pic, -tickStep, 0, pic); @@ -293,9 +293,9 @@ void KSTicker::timerEvent(TQTimerEvent *) case 'C': fg = deffg; bg = defbg; - bold = FALSE; - underline = FALSE; - italics = FALSE; + bold = false; + underline = false; + italics = false; step++; break; case '#': @@ -303,15 +303,15 @@ void KSTicker::timerEvent(TQTimerEvent *) step += 7; break; case 'b': - bold == TRUE ? bold = FALSE : bold = TRUE; + bold = !bold; step++; break; case 'u': - underline == TRUE ? underline = FALSE : underline = TRUE; + underline = !underline; step++; break; case 'i': - italics == TRUE ? italics = FALSE : italics = TRUE; + italics = !italics; step++; break; case 'n': @@ -366,7 +366,7 @@ void KSTicker::timerEvent(TQTimerEvent *) void KSTicker::paintEvent( TQPaintEvent *) { - if(isVisible() == FALSE) + if(!isVisible()) return; bitBlt(this, 0, descent, pic); } @@ -383,7 +383,7 @@ void KSTicker::resizeEvent( TQResizeEvent *e) new_pic->width() - pic->width(), 0, pic, 0, 0, pic->width(), pic->height(), - CopyROP, TRUE); + CopyROP, true); delete pic; pic = new_pic; // if(ring.length() > (uint) chars) @@ -443,7 +443,7 @@ void KSTicker::scrollConstantly() { bScrollConstantly = !bScrollConstantly; popup->setItemChecked(iScrollItem, bScrollConstantly); - if(bScrollConstantly == TRUE) + if(bScrollConstantly) startTicker(); TDEConfig *conf = kapp->config(); conf->setGroup("KSTicker"); diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index 88669f8d..bf0a1aa4 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -21,7 +21,7 @@ StdInTicker::StdInTicker() kConfig->setGroup("defaults"); TQFont font; font = kConfig->readFontEntry("font"); - font.setFixedPitch(TRUE); + font.setFixedPitch(true); setFont(font); setSpeed(kConfig->readNumEntry("tick", 30), kConfig->readNumEntry("step", 3)); diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp index 6e2c01bf..dfc64426 100644 --- a/ksirc/KSTicker/speeddialogData.cpp +++ b/ksirc/KSTicker/speeddialogData.cpp @@ -30,7 +30,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) sliderTick->setRange( 10, 200 ); sliderTick->setSteps( 10, 50 ); sliderTick->setValue( 30 ); - sliderTick->setTracking( TRUE ); + sliderTick->setTracking( true ); sliderTick->setTickmarks( TQSlider::NoMarks ); sliderTick->setTickInterval( 0 ); @@ -42,13 +42,13 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) sliderStep->setRange( 1, 10 ); sliderStep->setSteps( 1, 2 ); sliderStep->setValue( 3 ); - sliderStep->setTracking( TRUE ); + sliderStep->setTracking( true ); sliderStep->setTickmarks( TQSlider::NoMarks ); sliderStep->setTickInterval( 0 ); lcdTick = new TQLCDNumber( this, "LCDNumber_1" ); lcdTick->setFrameStyle( 33 ); - lcdTick->setSmallDecimalPoint( FALSE ); + lcdTick->setSmallDecimalPoint( false ); lcdTick->setNumDigits( 3 ); lcdTick->setMode( TQLCDNumber::DEC ); lcdTick->setSegmentStyle( TQLCDNumber::Outline ); @@ -56,7 +56,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) lcdStep = new TQLCDNumber( this, "LCDNumber_2" ); lcdStep->setFrameStyle( 33 ); - lcdStep->setSmallDecimalPoint( FALSE ); + lcdStep->setSmallDecimalPoint( false ); lcdStep->setNumDigits( 3 ); lcdStep->setMode( TQLCDNumber::DEC ); lcdStep->setSegmentStyle( TQLCDNumber::Outline ); diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp index 7557e2b6..592e4dda 100644 --- a/ksirc/alistbox.cpp +++ b/ksirc/alistbox.cpp @@ -60,7 +60,7 @@ void aListBox::inSort ( nickListItem *lbi) int insert; bool found; insert = searchFor(lbi->text(), found, lbi->op()); - if(found == TRUE){ + if(found){ //kdDebug(5008) << lbi->text() << " is already in nick list!" << endl; return; } @@ -76,8 +76,8 @@ void aListBox::inSort ( TQString text, bool top) { nickListItem *nli = new nickListItem(); nli->setText(text); - if(top == TRUE) - nli->setOp(TRUE); + if(top) + nli->setOp(true); inSort(nli); } @@ -85,7 +85,7 @@ int aListBox::findSep() { uint i = 0; for(; i < count(); i++) - if(item(i)->op() == FALSE) + if(!item(i)->op()) break; // stop now return i; @@ -98,7 +98,7 @@ int aListBox::searchFor(const TQString &nick, bool &found, bool top) int real_max = 0; int insert; - found = FALSE; + found = false; // If there's nothing in the list, don't try and search it, etc @@ -108,7 +108,7 @@ int aListBox::searchFor(const TQString &nick, bool &found, bool top) else{ int sep = findSep(); if(sep >= 0){ - if(top == TRUE){ + if(top){ min = 0; max = (sep >= 1) ? sep - 1 : 0; } @@ -149,7 +149,7 @@ int aListBox::searchFor(const TQString &nick, bool &found, bool top) else {// We got a match? insert = current; min = current; - found = TRUE; + found = true; break; } current = (min + max)/2; @@ -166,13 +166,13 @@ int aListBox::searchFor(const TQString &nick, bool &found, bool top) else if (compare == 0){// We got a match insert = real_max + 1; min = real_max; - found = TRUE; + found = true; } } // Sanity check - if((top == TRUE && insert > sep) || - (top == FALSE && insert < sep)){ + if((top && insert > sep) || + (!top && insert < sep)){ insert = sep; } @@ -181,7 +181,7 @@ int aListBox::searchFor(const TQString &nick, bool &found, bool top) // debug("Loop inifitly on: %s", nick.data()); } - if(found == TRUE){ + if(found){ // debug("Found %s", nick.data()); return min; // We found one, so return the number found } @@ -193,20 +193,20 @@ int aListBox::searchFor(const TQString &nick, bool &found, bool top) bool aListBox::isTop(int index) { if(index >= findSep()) - return FALSE; + return false; else - return TRUE; + return true; } int aListBox::findNick(const TQString &str) { bool found; int index; - index = searchFor(str, found, TRUE); - if(found == TRUE) + index = searchFor(str, found, true); + if(found) return index; - index = searchFor(str, found, FALSE); - if(found == TRUE) + index = searchFor(str, found, false); + if(found) return index; // debug("Did not find: %s", str.data()); return -1; @@ -263,7 +263,7 @@ void aListBox::updateNeedNickPrefixFlag() const { m_needNickPrefix = false; - if(ksopts->useColourNickList == false){ + if(!ksopts->useColourNickList){ TQListBoxItem *item = firstItem(); for (; item; item = item->next() ) { @@ -294,7 +294,7 @@ void aListBox::updateNickPrefixWidth() m_nickPrefixWidth = 0; - if(ksopts->useColourNickList == false){ + if(!ksopts->useColourNickList){ nickListItem *item = static_cast<nickListItem *>( firstItem() ); for ( ; item; item = static_cast<nickListItem *>( item->next() ) ) m_nickPrefixWidth = kMax( m_nickPrefixWidth, metrics.width( item->nickPrefix() ) ); @@ -322,10 +322,10 @@ void aListBox::clearAdvOps() nickListItem::nickListItem() : TQListBoxItem() { - is_op = FALSE; - is_voice = FALSE; - is_away = FALSE; - is_ircop = FALSE; + is_op = false; + is_voice = false; + is_away = false; + is_ircop = false; forcedCol = 0x0; } @@ -386,7 +386,7 @@ void nickListItem::paint(TQPainter *p) yPos = fm.ascent() + fm.leading()/2; TQPen pen = p->pen(); TQFont font = p->font(); - if(ksopts->useColourNickList == true) { + if(ksopts->useColourNickList) { if(ksopts->nickColourization){ if(!isSelected()) { @@ -399,7 +399,7 @@ void nickListItem::paint(TQPainter *p) p->setPen(ksopts->selForegroundColor); } - if(is_voice == TRUE){ + if(is_voice){ TQPen open = p->pen(); p->setPen(ksopts->channelColor); p->drawText( nickPosX, yPos, TQString("+") ); @@ -407,7 +407,7 @@ void nickListItem::paint(TQPainter *p) p->setPen(open); // p->fillRect(0,0, listBox()->maxItemWidth(), height(listBox()), TQBrush(ksopts->channelColor, TQt::Dense7Pattern)); } - if(is_op == TRUE) { + if(is_op) { TQPen open = p->pen(); p->setPen(ksopts->errorColor); p->drawText( nickPosX, yPos, TQString("@") ); @@ -415,9 +415,9 @@ void nickListItem::paint(TQPainter *p) p->setPen(open); // p->fillRect(0,0, listBox()->maxItemWidth(), height(listBox()), TQBrush(ksopts->errorColor, TQt::Dense7Pattern)); } - if(is_away == TRUE) + if(is_away) p->setPen(p->pen().color().dark(150)); - if(is_ircop == TRUE){ + if(is_ircop){ TQPen open = p->pen(); p->setPen(ksopts->errorColor); p->drawText( nickPosX, yPos, TQString("*") ); @@ -428,15 +428,15 @@ void nickListItem::paint(TQPainter *p) } else { - if(is_voice == TRUE) + if(is_voice) p->setPen(ksopts->channelColor); - if(is_op == TRUE) + if(is_op) p->setPen(ksopts->errorColor); - if(is_away == TRUE) + if(is_away) p->setPen(p->pen().color().dark(150)); - if(is_ircop == TRUE){ + if(is_ircop){ TQFont bfont = font; - bfont.setBold(TRUE); + bfont.setBold(true); p->setFont(bfont); } } @@ -444,7 +444,7 @@ void nickListItem::paint(TQPainter *p) else { } - if(ksopts->useColourNickList == false) { + if(!ksopts->useColourNickList) { aListBox *lb = static_cast<aListBox *>( listBox() ); if ( lb->needNickPrefix() ) diff --git a/ksirc/alistbox.h b/ksirc/alistbox.h index f0c7262b..433433b2 100644 --- a/ksirc/alistbox.h +++ b/ksirc/alistbox.h @@ -21,10 +21,10 @@ class nickListItem : public TQListBoxItem bool away() const { return is_away; } bool ircOp() const { return is_ircop; } - void setOp(bool _op = FALSE); - void setVoice(bool _voice = FALSE); - void setAway(bool _away = FALSE); - void setIrcOp(bool _ircop = FALSE); + void setOp(bool _op = false); + void setVoice(bool _voice = false); + void setAway(bool _away = false); + void setIrcOp(bool _ircop = false); void setText(const TQString &str) { string = str; } @@ -60,7 +60,7 @@ public: void clear(); void inSort ( nickListItem *); - void inSort ( TQString text, bool top=FALSE); + void inSort ( TQString text, bool top=false); nickListItem *item(int index); diff --git a/ksirc/baserules.cpp b/ksirc/baserules.cpp index e6b1f896..facffd70 100644 --- a/ksirc/baserules.cpp +++ b/ksirc/baserules.cpp @@ -19,7 +19,7 @@ filterRuleList *KSMBaseRules::defaultRules() { filterRule *fr; filterRuleList *frl = new filterRuleList(); - frl->setAutoDelete(TRUE); + frl->setAutoDelete(true); if( ksopts->ksircColors ){ // 3 stage rule to filter: // ~blah~<something> stuff with ~ here and ~ there diff --git a/ksirc/baserules.h b/ksirc/baserules.h index 1ba79bf7..4b530d58 100644 --- a/ksirc/baserules.h +++ b/ksirc/baserules.h @@ -9,7 +9,7 @@ public: KSMBaseRules(KSircProcess *proc) : KSircMessageReceiver(proc) { - broadcast = FALSE; + broadcast = false; } virtual ~KSMBaseRules() { diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index ad729924..6ebd7de8 100644 --- a/ksirc/chanparser.cpp +++ b/ksirc/chanparser.cpp @@ -35,8 +35,8 @@ ChannelParser::ChannelParser(KSircTopLevel *_top) current_item = -1; top_item = 0; - if(parserTable.isEmpty() == TRUE){ - parserTable.setAutoDelete(TRUE); + if(parserTable.isEmpty()){ + parserTable.setAutoDelete(true); parserTable.insert("`l`", new parseFunc(&ChannelParser::parseSSFEClear)); parserTable.insert("`s`", new parseFunc(&ChannelParser::parseSSFEStatus)); parserTable.insert("`i`", new parseFunc(&ChannelParser::parseSSFEInit)); @@ -118,7 +118,7 @@ parseResult * ChannelParser::parseSSFEClear(TQString string) { // top->mainw->clear(); top->clearWindow(); -// top->mainw->repaint(TRUE); +// top->mainw->repaint(true); string.truncate(0); return new parseSucc(TQString()); // Null string, don't display anything } @@ -226,12 +226,12 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string) // If we're an op,, // update the nicks popup menu top->channelButtons->setButtonsEnabled(true); // set the buttons enabled if were an op - top->opami = TRUE; + top->opami = true; } // opami = true sets us to an op else { top->channelButtons->setButtonsEnabled(false); // set the buttons enabled if were an op - top->opami = FALSE; - } // FALSE, were not an ops + top->opami = false; + } // false, were not an ops top->UserUpdateMenu(); // update the menu top->setCaption(status_line); top->setIconText(status_line); @@ -271,7 +271,7 @@ parseResult * ChannelParser::parseSSFEMsg(TQString string) parseResult * ChannelParser::parseSSFEPrompt(TQString string) { - if(prompt_active == FALSE){ + if(!prompt_active){ TQString prompt, caption; ssfePrompt *sp; @@ -279,7 +279,7 @@ parseResult * ChannelParser::parseSSFEPrompt(TQString string) // First remove the prompt message from the Buffer. // (it's garunteed to be the first one) top->LineBuffer.remove( *top->LineBuffer.begin() ); - top->Buffer = FALSE; + top->Buffer = false; top->sirc_receive(TQString("")); // "'[pP]' " gives 4 spaces @@ -287,14 +287,14 @@ parseResult * ChannelParser::parseSSFEPrompt(TQString string) caption = ""; else caption = string.mid(3); - prompt_active = TRUE; + prompt_active = true; // If we use this, then it blows up // if we haven't popped up on the remote display yet. KSirc::TextParagIterator it = top->mainw->firstParag(); TQString last; - while(it.atEnd() == FALSE) { + while(!it.atEnd()) { last = it.plainText(); ++it; } @@ -309,14 +309,14 @@ parseResult * ChannelParser::parseSSFEPrompt(TQString string) sp = new ssfePrompt(prompt, 0); sp->setCaption(caption); if(string[1] == 'P') - sp->setPassword(TRUE); + sp->setPassword(true); sp->exec(); // cerr << "Entered: " << sp->text() << endl; prompt = sp->text(); prompt += "\n"; emit top->outputUnicodeLine(prompt); delete sp; - prompt_active = FALSE; + prompt_active = false; } return new parseSucc(TQString()); // Null string, don't display anything @@ -352,22 +352,22 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) { TQString string = in_string; TQString channel_name; - bool clear_box = FALSE; + bool clear_box = false; // Check to see if it's a continued line if(string[1] == 'C'){ string[1] = '!'; - clear_box = TRUE; + clear_box = true; } if(string[1] == '#'){ string[1] = '!'; - clear_box = FALSE; + clear_box = false; } else if(string[1] == 'c'){ if(current_item > 0) top->nicks->setCurrentItem(current_item); top->nicks->setTopItem(top_item); - top->nicks->repaint(TRUE); + top->nicks->repaint(true); return new parseSucc(TQString()); // Parsing ok, don't print anything though } else if(string[1] == '$'){ @@ -393,13 +393,13 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) return new parseSucc(string,ksopts->infoColor,"user|misc4"); } - if(clear_box == TRUE){ + if(clear_box){ current_item = top->nicks->currentItem(); top_item = top->nicks->topItem(); top->nicks->clear(); } - //int start = string.find(": ", 0, FALSE); // Find start of nicks + //int start = string.find(": ", 0, false); // Find start of nicks //if (start < 0) // return new parseError(string, i18n("Could not find start of nicks")); // @@ -413,31 +413,31 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) TQString nick = *it; nickListItem *irc = new nickListItem(); - bool done = FALSE; + bool done = false; uint i; for(i = 0; i < nick.length();i++){ switch(nick[0].unicode()){ case '@': - irc->setOp(TRUE); + irc->setOp(true); nick.remove(0,1); break; case '+': - irc->setVoice(TRUE); + irc->setVoice(true); nick.remove(0,1); break; case '#': - irc->setAway(TRUE); + irc->setAway(true); nick.remove(0,1); break; case '*': - irc->setIrcOp(TRUE); + irc->setIrcOp(true); nick.remove(0,1); break; default: - done = TRUE; + done = true; } - if(done == TRUE) + if(done) break; } @@ -520,7 +520,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) * You have left channel <channel> */ rx.setPattern("You have left channel (\\S+)"); - if((foundNick == false) && (rx.search(string) != -1)) { + if(!foundNick && (rx.search(string) != -1)) { TQString channel = rx.cap(1); if(top->channelInfo().channel().lower() == channel.lower()) { TQApplication::postEvent(top, new TQCloseEvent()); @@ -534,11 +534,11 @@ parseResult * ChannelParser::parseINFOPart(TQString string) * You have been kicked off channel <channel> */ rx.setPattern("You have been kicked off channel (\\S+)"); - if((foundNick == false) && (rx.search(string) != -1)) { + if(!foundNick && (rx.search(string) != -1)) { TQString channel = rx.cap(1); if(top->channelInfo().channel().lower() != channel.lower()) return new parseWrongChannel(string, ksopts->errorColor, "user|kick"); - if (ksopts->autoRejoin == TRUE) + if (ksopts->autoRejoin) { TQString str = TQString("/join %1\n").arg(top->channelInfo().channel()); emit top->outputUnicodeLine(str); @@ -576,7 +576,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) * <nick> has left channel <channel> */ rx.setPattern("(\\S+) has left channel (\\S+)"); - if((foundNick == false) && (rx.search(string) != -1)) { + if(!foundNick && (rx.search(string) != -1)) { nick = rx.cap(1); TQString channel = rx.cap(2); // kdDebug(5008) << "Nick: " << nick << " Channel: " << channel << " top: " << top->channelInfo().channel() << endl; @@ -593,7 +593,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) * "<nick> has been kicked off channel <channel>" */ rx.setPattern("(\\S+) has been kicked off channel (\\S+)"); - if((foundNick == false) && (rx.search(string) != -1)) { + if(!foundNick && (rx.search(string) != -1)) { nick = rx.cap(1); TQString channel = rx.cap(2); if(top->channelInfo().channel().lower() == channel.lower()) { @@ -678,7 +678,7 @@ parseResult * ChannelParser::parseINFOChangeNick(TQString string) top->changeCompleteNick(old_nick, new_nick); top->nicks->setCurrentItem(selection); - top->nicks->repaint(TRUE); + top->nicks->repaint(true); // We're done, so let's finish up return new parseSucc(" " + string, ksopts->channelColor, "user|join"); } @@ -813,7 +813,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) * -l doesn't take any arguments, so just add the mode and break * +l otoh does, so read the argument */ - if(op == false){ + if(!op){ pmList.append(new mode_info(op, 'l', TQString())); break; } @@ -878,7 +878,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) irc->setOp(mi->op()); // add new nick in sorted pass,with colour top->nicks->inSort(irc); - top->nicks->repaint(TRUE); + top->nicks->repaint(true); } else{ kdDebug(5008) << "Toplevel+o: nick search failed on " << mi->arg() << endl; @@ -905,9 +905,9 @@ parseResult * ChannelParser::parseINFOMode(TQString string) else if(mi->mode() == 'v'){ bool voice; if(mi->op()) - voice = TRUE; + voice = true; else - voice = FALSE; + voice = false; if(mi->arg().length() == 0){ tqWarning("Invalid nick in +-v mode change"); diff --git a/ksirc/charSelector.cpp b/ksirc/charSelector.cpp index 7d239276..55d3dcc4 100644 --- a/ksirc/charSelector.cpp +++ b/ksirc/charSelector.cpp @@ -68,10 +68,10 @@ bool charSelector::eventFilter ( TQObject *, TQEvent * e ) TQKeyEvent *k = (TQKeyEvent *)e; if(k->key() == Key_Escape){ keyPressEvent(k); - return TRUE; // eat event + return true; // eat event } } // standard event processing - return FALSE; + return false; } diff --git a/ksirc/displayMgrMDI.h b/ksirc/displayMgrMDI.h index dc64565c..52d44afe 100644 --- a/ksirc/displayMgrMDI.h +++ b/ksirc/displayMgrMDI.h @@ -12,7 +12,7 @@ public: DisplayMgrMDI(); virtual ~DisplayMgrMDI(); - virtual void newTopLevel(TQWidget *, bool show = FALSE); + virtual void newTopLevel(TQWidget *, bool show = false); virtual void removeTopLevel(TQWidget *); virtual void show(TQWidget *); diff --git a/ksirc/displayMgrSDI.cpp b/ksirc/displayMgrSDI.cpp index 5b59f815..777ad842 100644 --- a/ksirc/displayMgrSDI.cpp +++ b/ksirc/displayMgrSDI.cpp @@ -10,7 +10,7 @@ DisplayMgrSDI::~DisplayMgrSDI(){ } void DisplayMgrSDI::newTopLevel(TQWidget *w, bool show){ - if(show == TRUE) + if(show) w->show(); } diff --git a/ksirc/displayMgrSDI.h b/ksirc/displayMgrSDI.h index 02ac88aa..3051c69d 100644 --- a/ksirc/displayMgrSDI.h +++ b/ksirc/displayMgrSDI.h @@ -8,7 +8,7 @@ public: DisplayMgrSDI(); virtual ~DisplayMgrSDI(); - virtual void newTopLevel(TQWidget *, bool show = FALSE); + virtual void newTopLevel(TQWidget *, bool show = false); virtual void removeTopLevel(TQWidget *); virtual void show(TQWidget *); diff --git a/ksirc/ioBroadcast.cpp b/ksirc/ioBroadcast.cpp index b36e4420..25fb0aa8 100644 --- a/ksirc/ioBroadcast.cpp +++ b/ksirc/ioBroadcast.cpp @@ -33,13 +33,13 @@ void KSircIOBroadcast::sirc_receive(TQCString str, bool) TQDictIterator<KSircMessageReceiver> it(proc->getWindowList()); KSircMessageReceiver *dflt = (proc->getWindowList())["!default"]; - if(dflt->getBroadcast() == TRUE) + if(dflt->getBroadcast()) dflt->sirc_receive(str, true); it.toFirst(); while(it.current()){ - if((it.current()->getBroadcast() == TRUE) && (it.current() != dflt)) + if(it.current()->getBroadcast() && (it.current() != dflt)) it.current()->sirc_receive(str, true); ++it; } @@ -65,7 +65,7 @@ filterRuleList *KSircIOBroadcast::defaultRules() { filterRule *fr; filterRuleList *frl = new filterRuleList(); - frl->setAutoDelete(TRUE); + frl->setAutoDelete(true); fr = new filterRule(); fr->desc = "Inverse to KSIRC inverse"; fr->search = ".*"; diff --git a/ksirc/ioBroadcast.h b/ksirc/ioBroadcast.h index 9bb33ff9..f68d760b 100644 --- a/ksirc/ioBroadcast.h +++ b/ksirc/ioBroadcast.h @@ -9,7 +9,7 @@ public: KSircIOBroadcast(KSircProcess *_proc) : KSircMessageReceiver(_proc) { proc = _proc; - setBroadcast(FALSE); + setBroadcast(false); } virtual ~KSircIOBroadcast(); diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp index f5053400..bc7bda33 100644 --- a/ksirc/ioDCC.cpp +++ b/ksirc/ioDCC.cpp @@ -26,9 +26,9 @@ KSircIODCC::KSircIODCC(KSircProcess *_proc) : KSircMessageReceiver(_proc) { proc = _proc; - setBroadcast(FALSE); + setBroadcast(false); mgr = new dccTopLevel(0x0, "dccTopLevel Manager"); - displayMgr->newTopLevel(mgr, FALSE); + displayMgr->newTopLevel(mgr, false); displayMgr->setCaption(mgr, proc->serverName() + i18n(" DCC Controller")); connect(mgr->mgr(), TQ_SIGNAL(dccConnectClicked(dccItem *)), this, TQ_SLOT(dccConnectClicked(dccItem *))); @@ -486,7 +486,7 @@ void KSircIODCC::getFile() TQString nick = text.mid(0, pos); pos = text.find(" ", pos+1) + 1; TQString filename = text.mid(pos, text.length() - pos); - //if(DlgList[filename]->isVisible() == FALSE) + //if(!DlgList[filename]->isVisible()) // DlgList[filename]->show(); TQString command = "/dcc get " + nick + " " + filename + "\n"; emit outputLine(command.ascii()); @@ -524,7 +524,7 @@ filterRuleList *KSircIODCC::defaultRules() // filterRule *fr; filterRuleList *frl = new filterRuleList(); - frl->setAutoDelete(TRUE); + frl->setAutoDelete(true); /* fr = new filterRule(); fr->desc = "Capture DCC IO Messages"; diff --git a/ksirc/ioLAG.cpp b/ksirc/ioLAG.cpp index 0a1a2ec7..7265b383 100644 --- a/ksirc/ioLAG.cpp +++ b/ksirc/ioLAG.cpp @@ -17,7 +17,7 @@ KSircIOLAG::KSircIOLAG(KSircProcess *_proc) KSircMessageReceiver(_proc) { proc = _proc; - setBroadcast(FALSE); + setBroadcast(false); startTimer(30000); // startTimer(5000); //(proc->getWindowList())["!all"]->control_message(SET_LAG, "99"); diff --git a/ksirc/ioNotify.cpp b/ksirc/ioNotify.cpp index b3b4a52f..7f1748cc 100644 --- a/ksirc/ioNotify.cpp +++ b/ksirc/ioNotify.cpp @@ -16,7 +16,7 @@ KSircIONotify::KSircIONotify(KSircProcess *_proc) KSircMessageReceiver(_proc) { proc = _proc; - setBroadcast(FALSE); + setBroadcast(false); } @@ -63,7 +63,7 @@ filterRuleList *KSircIONotify::defaultRules() { filterRule *fr; filterRuleList *frl = new filterRuleList(); - frl->setAutoDelete(TRUE); + frl->setAutoDelete(true); fr = new filterRule(); fr->desc = "Send Nick Notifies to notifier parser"; fr->search = "^\\*\\S?[\\(\\)]\\S?\\* "; diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp index a9e5571a..97aa2ecf 100644 --- a/ksirc/iocontroller.cpp +++ b/ksirc/iocontroller.cpp @@ -117,7 +117,7 @@ KSircIOController::KSircIOController(TDEProcess *_proc, KSircProcess *_ksircproc // Notify on sirc dying connect(proc, TQ_SIGNAL(wroteStdin(TDEProcess*)), this, TQ_SLOT(procCTS(TDEProcess*))); - proc_CTS = TRUE; + proc_CTS = true; #if 0 showDebugTraffic(true); #endif @@ -261,9 +261,9 @@ void KSircIOController::stdout_read(TDEProcess *, char *_buffer, int buflen) // Ignore ssfe control messages with ` // we left channel, don't open a window for a control message bool noticeCreate = true; - if(ksopts->autoCreateWinForNotice == false && (line[0] == '-' || line[0] == '*')) + if(!ksopts->autoCreateWinForNotice && (line[0] == '-' || line[0] == '*')) noticeCreate = false; - if(ksopts->autoCreateWin == TRUE && line[0] != '`' && line[1] != '#' && line[1] != '&' && noticeCreate) { + if(ksopts->autoCreateWin && line[0] != '`' && line[1] != '#' && line[1] != '&' && noticeCreate) { //kdDebug(5008) << "Creating window for: " << qsname << " because of: " << line.data() << endl; ksircproc->new_toplevel(KSircChannel(ksircproc->serverName(), qsname)); } @@ -315,7 +315,7 @@ void KSircIOController::stdin_write(TQCString s) //fprintf(stderr, "Buffer output: "); //my_print(buffer); - if(proc_CTS == TRUE){ + if(proc_CTS){ int len = buffer.length(); if(send_buf != 0x0){ tqWarning("TDEProcess barfed in all clear signal again"); @@ -323,7 +323,7 @@ void KSircIOController::stdin_write(TQCString s) } send_buf = new char[len]; memcpy(send_buf, buffer.data(), len); - if(proc->writeStdin(send_buf, len) == FALSE){ + if(!proc->writeStdin(send_buf, len)){ kdDebug(5008) << "Failed to write but CTS HIGH! Setting low!: " << s << endl; } else{ @@ -334,7 +334,7 @@ void KSircIOController::stdin_write(TQCString s) } buffer.truncate(0); } - proc_CTS = FALSE; + proc_CTS = false; } if(buffer.length() > 5000){ @@ -393,14 +393,14 @@ void KSircIOController::showContextMenuOnDebugWindow(TQListBoxItem *, const TQPo void KSircIOController::showDebugTraffic(bool show) { kdDebug(5008) << "Got show request: " << show << endl; - if(m_debugLB == 0 && show == true){ + if(m_debugLB == 0 && show){ m_debugLB = new TQListBox(0x0, TQCString(this->name()) + "_debugWindow"); m_debugLB->resize(600, 300); m_debugLB->show(); connect(m_debugLB,TQ_SIGNAL(contextMenuRequested(TQListBoxItem *,const TQPoint &)), this,TQ_SLOT(showContextMenuOnDebugWindow(TQListBoxItem *,const TQPoint &))); } - else if(m_debugLB != 0 && show == false){ + else if(m_debugLB != 0 && !show){ delete m_debugLB; m_debugLB = 0x0; } diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp index fb82e61a..add300e9 100644 --- a/ksirc/ksirc.cpp +++ b/ksirc/ksirc.cpp @@ -136,7 +136,7 @@ extern "C" TDE_EXPORT int kdemain( int argc, char ** argv ) } } else { - if(args->isSet("autoconnect") == TRUE){ + if(args->isSet("autoconnect")){ sc->start_autoconnect(); } } diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 3bbee663..fd812a99 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -130,11 +130,11 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa //server = tqstrdup(kss.server()); - TQDict<KSircMessageReceiver> nTopList(17, FALSE); + TQDict<KSircMessageReceiver> nTopList(17, false); TopList = nTopList; - // TopList.setAutoDelete(TRUE) + // TopList.setAutoDelete(true) - auto_create_really = FALSE; + auto_create_really = false; // Create the ksopts server structure ksopts->serverSetup(kss); @@ -151,16 +151,16 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa m_nick = qsNick; - if((qsNick.isEmpty() == FALSE)){ + if(!qsNick.isEmpty()){ proc->setEnvironment("SIRCNICK", qsNick); } - if((qsAltNick.isEmpty() == FALSE)){ + if(!qsAltNick.isEmpty()){ proc->setEnvironment("BACKUPNICK", qsAltNick); } - if((qsRealname.isEmpty() == FALSE)){ + if(!qsRealname.isEmpty()){ proc->setEnvironment("SIRCNAME", qsRealname); } - if((qsUserID.isEmpty() == FALSE)){ + if(!qsUserID.isEmpty()){ proc->setEnvironment("SIRCUSER", qsUserID); kdDebug(5008) << "Set SIRCUSER to: " << qsUserID << endl; } @@ -199,13 +199,13 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa // Create toplevel before iocontroller so it has somewhere to write stuff. - running_window = TRUE; // True so we do create the default - default_follow_focus = TRUE; + running_window = true; // True so we do create the default + default_follow_focus = true; KSircChannel ci(kss.server(), "!no_channel"); new_toplevel(ci, true); // TopList.replace("!default", TopList[ci.channel()]); - running_window = FALSE; // set false so next changes the first name + running_window = false; // set false so next changes the first name // Write default commands, and open default windows. @@ -331,11 +331,11 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) { static time_t last_window_open = 0; static int number_open = 0; - static bool flood_dlg = FALSE; + static bool flood_dlg = false; - if(running_window == FALSE){ // If we're not fully running, reusing + if(!running_window){ // If we're not fully running, reusing // !default window for next chan. - running_window = TRUE; + running_window = true; // insert and remove is done as a side effect of the control_message call // TopList.insert(str, TopList["!no_channel"]); // TopList.remove("!no_channel"); // We're no longer !no_channel @@ -343,12 +343,12 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) } else if(TopList.find(channelInfo.channel()) == 0x0){ // If the window doesn't exist, continue // If AutoCreate windows is on, let's make sure we're not being flooded. - if(ksopts->autoCreateWin == TRUE && safe == false){ + if(ksopts->autoCreateWin && !safe){ time_t current_time = time(NULL); if((channelInfo.channel()[0] != '#' || channelInfo.channel()[0] != '&') && ((current_time - last_window_open) < 5)){ - if(number_open > 4 && flood_dlg == FALSE){ - flood_dlg = TRUE; + if(number_open > 4 && !flood_dlg){ + flood_dlg = true; int res = KMessageBox::warningYesNo(0, i18n("5 Channel windows were opened " "in less than 5 seconds. Someone " @@ -369,7 +369,7 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) if(!safe) number_open++; } - flood_dlg = FALSE; + flood_dlg = false; } else{ last_window_open = current_time; @@ -401,7 +401,7 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) default_window(wm); // Set it to the default window. emit ProcMessage(serverID(), ProcCommand::addTopLevel, channelInfo.channel()); - displayMgr->newTopLevel(wm, TRUE); + displayMgr->newTopLevel(wm, true); displayMgr->setCaption(wm, channelInfo.channel()); // displayMgr->show(wm); wm->lineEdit()->setFocus(); // Give focus back to the linee, someone takes it away on new create @@ -415,7 +415,7 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name) { - if(auto_create_really == TRUE) + if(auto_create_really) turn_on_autocreate(); kdDebug(5008) << "KSP: get close_toplevel: " << name << endl; @@ -455,13 +455,13 @@ void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name) TopList.replace("!default", it.current()); // Let's let em know she's deleted! - if(ksopts->autoCreateWin == TRUE){ + if(ksopts->autoCreateWin){ emit ProcMessage(serverID(), ProcCommand::turnOffAutoCreate, TQString()); TQTimer::singleShot(5000, this, TQ_SLOT(turn_on_autocreate())); - auto_create_really = TRUE; + auto_create_really = true; } else{ - auto_create_really = FALSE; + auto_create_really = false; } delete guardedwm; @@ -473,9 +473,9 @@ void KSircProcess::clean_toplevel(TQObject *clean){ tqWarning("Passed null to cleaner!!"); return; } - bool cont = FALSE; + bool cont = false; do{ - cont = FALSE; + cont = false; TQDictIterator<KSircMessageReceiver> it(TopList); while(it.current() != 0x0){ if((TQObject *)it.current() == clean){ @@ -483,12 +483,12 @@ void KSircProcess::clean_toplevel(TQObject *clean){ while(TopList[key] != 0x0){ TopList.remove(key); } - cont = TRUE; + cont = true; break; } ++it; } - } while(cont == TRUE); + } while(cont); } void KSircProcess::request_quit( const TQCString& command ) @@ -525,7 +525,7 @@ void KSircProcess::default_window(KSircTopLevel *w) // window on focus changes. // - if(w && (default_follow_focus == TRUE)) + if(w && default_follow_focus) TopList.replace("!default", w); } @@ -632,7 +632,7 @@ void KSircProcess::ServMessage(TQString dst_server, int command, TQString args) void KSircProcess::turn_on_autocreate() { emit ProcMessage(serverID(), ProcCommand::turnOnAutoCreate, TQString()); - auto_create_really = FALSE; + auto_create_really = false; } void KSircProcess::setNick(const TQString nick) diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp index 75da1bcb..d22d1d6e 100644 --- a/ksirc/ksopts.cpp +++ b/ksirc/ksopts.cpp @@ -251,7 +251,7 @@ void KSOptions::load( int sections ) /* * do global first */ - if(channel.contains("global") == FALSE){ + if(!channel.contains("global")){ KSOChannel global; ChannelOpMap coMap; channel.insert(TQString("global"), coMap); @@ -315,7 +315,7 @@ void KSOptions::load( int sections ) /* * do global first */ - if(server.contains("global") == FALSE){ + if(!server.contains("global")){ KSOServer global; server.insert(TQString("global"), global); server["global"].server = "global"; @@ -471,7 +471,7 @@ void KSOptions::save( int sections ) for( ser = server.begin(); ser != server.end(); ++ser ){ TQStringList channels; - if(ser.data().globalCopy == true) + if(ser.data().globalCopy) continue; servers << ser.key(); @@ -490,11 +490,11 @@ void KSOptions::save( int sections ) void KSOptions::channelSetup(TQString serv, TQString chan) { - if(channel.contains(serv) == FALSE){ + if(!channel.contains(serv)){ ChannelOpMap coMap; channel.insert(serv, coMap); } - if(channel[serv].contains(chan) == FALSE){ + if(!channel[serv].contains(chan)){ KSOChannel ksoc; ksoc = channel["global"]["global"]; channel[serv].insert(chan, ksoc); @@ -524,7 +524,7 @@ void KSOptions::applyChannelGlobal(void) void KSOptions::serverSetup(TQString serv) { - if(server.contains(serv) == FALSE){ + if(!server.contains(serv)){ KSOServer ksos; ksos = server["global"]; server.insert(serv, ksos); diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp index 3576b554..a491c12d 100644 --- a/ksirc/mditoplevel.cpp +++ b/ksirc/mditoplevel.cpp @@ -83,7 +83,7 @@ void MDITopLevel::addWidget( TQWidget *widget, bool show ) widget->reparent( m_tab, 0, TQPoint( 0, 0 ), show ); - if(show == TRUE){ + if(show){ showWidget(widget); } diff --git a/ksirc/messageReceiver.cpp b/ksirc/messageReceiver.cpp index 3196bb49..13a9f9ec 100644 --- a/ksirc/messageReceiver.cpp +++ b/ksirc/messageReceiver.cpp @@ -9,7 +9,7 @@ KSircMessageReceiver::KSircMessageReceiver( KSircProcess * _proc ) { proc = _proc; - broadcast = TRUE; + broadcast = true; } KSircMessageReceiver::~KSircMessageReceiver() diff --git a/ksirc/objFinder.cpp b/ksirc/objFinder.cpp index 38042963..bf8208fc 100644 --- a/ksirc/objFinder.cpp +++ b/ksirc/objFinder.cpp @@ -57,7 +57,7 @@ TQObject *objFinder::find(const char *name, const char *inherits){ if(len == strlen(it.current()->name()) && strcmp(it.current()->name(), name) == 0) return it.current(); - TQObjectList *qobl = it.current()->queryList(inherits, name, FALSE); + TQObjectList *qobl = it.current()->queryList(inherits, name, false); TQObjectListIt itql( *qobl ); if(itql.current() != 0x0){ found = itql.current(); @@ -72,7 +72,7 @@ TQObject *objFinder::find(const char *name, const char *inherits){ while(itW.current()){ if(len == strlen(itW.current()->name()) && strcmp(itW.current()->name(), name) == 0){ - if(inherits != 0x0 && itW.current()->inherits(inherits) == FALSE){ + if(inherits != 0x0 && !itW.current()->inherits(inherits)){ ++itW; continue; } 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; diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 67736f44..80d22869 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -164,11 +164,11 @@ servercontroller::servercontroller( TQWidget*, const char* name ) join_id = connections->insertItem(i18n("&Join Channel..."), this, TQ_SLOT(new_channel()), Key_F3 ); connections->insertSeparator(); connections->insertItem(i18n("&Do Autoconnect..."), this, TQ_SLOT(start_autoconnect_check())); - connections->setItemEnabled(join_id, FALSE); + connections->setItemEnabled(join_id, false); MenuBar->insertItem(i18n("&Connections"), connections); options = new TQPopupMenu(this, TQCString(name) + "_menu_options"); - options->setCheckable(TRUE); + options->setCheckable(true); options->insertItem(SmallIcon( "filter" ), i18n("&Filter Rule Editor..."), this, TQ_SLOT(filter_rule_editor())); @@ -279,7 +279,7 @@ void servercontroller::new_ksircprocess(KSircServer &kss) ConnectionTree->setCurrentItem(rootItem); // highlight it. } - connections->setItemEnabled(join_id, TRUE); + connections->setItemEnabled(join_id, true); dockWidget->serverOpen(server_id); } @@ -556,7 +556,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args) proc_list.remove(server); // Remove process entry while we are at it if(proc_list.count() == 0){ ConnectionTree->clear(); - connections->setItemEnabled(join_id, FALSE); + connections->setItemEnabled(join_id, false); } break; case ProcCommand::turnOffAutoCreate: @@ -672,10 +672,10 @@ void servercontroller::readGlobalProperties(TDEConfig *ksc) TQRect geom; // ksc->setGroup("ServerController"); -// bool docked = ksc->readBoolEntry("Docked", FALSE); +// bool docked = ksc->readBoolEntry("Docked", false); // if ( !docked ) // show(); - if(ksopts->runDocked == false) + if(!ksopts->runDocked) show(); geom = ksc->readRectEntry("Size"); @@ -881,7 +881,7 @@ void servercontroller::do_autoconnect() ser = servers.begin(); for( ; ser != servers.end(); ser++){ TQStringList channels = conf->readListEntry(*ser); - if(channels.empty() == FALSE){ + if(!channels.empty()){ channels.sort(); TQStringList::ConstIterator chan = channels.begin(); for(; chan != channels.end(); chan++){ @@ -918,7 +918,7 @@ void servercontroller::do_autoconnect() void servercontroller::start_autoconnect() { at = new TQTimer(this); connect(at, TQ_SIGNAL(timeout()), this, TQ_SLOT(do_autoconnect())); - at->start(250, FALSE); + at->start(250, false); } void servercontroller::start_autoconnect_check() { @@ -938,7 +938,7 @@ void servercontroller::start_autoconnect_check() { else { at = new TQTimer(this); connect(at, TQ_SIGNAL(timeout()), this, TQ_SLOT(do_autoconnect())); - at->start(250, FALSE); + at->start(250, false); } } @@ -950,7 +950,7 @@ scInside::scInside ( TQWidget * parent, const char * name, WFlags { ASConn = new TQLabel(i18n("Active server connections:"), this, "servercontroller_label"); TQFont asfont = ASConn->font(); - asfont.setBold(TRUE); + asfont.setBold(true); ASConn->setFont(asfont); ConnectionTree = new TDEListView(this, "connectiontree"); diff --git a/ksirc/ssfeprompt.cpp b/ksirc/ssfeprompt.cpp index 14d759fb..7cc92574 100644 --- a/ksirc/ssfeprompt.cpp +++ b/ksirc/ssfeprompt.cpp @@ -46,7 +46,7 @@ TQString ssfePrompt::text() void ssfePrompt::setPassword(bool pass) { - if(pass == TRUE) + if(pass) SLine->setEchoMode(TQLineEdit::Password); else SLine->setEchoMode(TQLineEdit::Normal); diff --git a/ksirc/ssfepromptdata.cpp b/ksirc/ssfepromptdata.cpp index b9a5acdc..c9e39595 100644 --- a/ksirc/ssfepromptdata.cpp +++ b/ksirc/ssfepromptdata.cpp @@ -24,7 +24,7 @@ ssfepromptdata::ssfepromptdata const char* name ) : - Inherited( parent, name, TRUE, 20480 ) + Inherited( parent, name, true, 20480 ) { prompt = new TQLabel( this, "Label_1" ); prompt->setGeometry( 10, 10, 220, 30 ); @@ -42,7 +42,7 @@ ssfepromptdata::ssfepromptdata SLine->setText( "" ); SLine->setMaxLength( 32767 ); SLine->setEchoMode( TQLineEdit::Normal ); - SLine->setFrame( TRUE ); + SLine->setFrame( true ); TQPushButton* dlgedit_PushButton_1; dlgedit_PushButton_1 = new KPushButton( KStdGuiItem::ok(), this, "PushButton_1" ); @@ -50,8 +50,8 @@ ssfepromptdata::ssfepromptdata dlgedit_PushButton_1->setMinimumSize( 10, 10 ); dlgedit_PushButton_1->setMaximumSize( 32767, 32767 ); connect( dlgedit_PushButton_1, TQ_SIGNAL(clicked()), TQ_SLOT(terminate()) ); - dlgedit_PushButton_1->setAutoRepeat( FALSE ); - dlgedit_PushButton_1->setAutoDefault( TRUE ); + dlgedit_PushButton_1->setAutoRepeat( false ); + dlgedit_PushButton_1->setAutoDefault( true ); resize( 350,90 ); setMinimumSize( 350, 90 ); diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index d1fbb2ef..440976de 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -133,7 +133,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf caption = TQString(); } - Buffer = FALSE; + Buffer = false; have_focus = 0; tab_pressed = -1; // Tab (nick completion not pressed yet) @@ -363,7 +363,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf linee->setFocusPolicy(TQWidget::StrongFocus); linee->setFont(ksopts->defaultFont); - if(ksopts->oneLineEntry == true) { + if(ksopts->oneLineEntry) { linee->setWordWrap(TQTextEdit::NoWrap); } else { @@ -394,9 +394,9 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf * */ - opami = FALSE; - continued_line = FALSE; -// on_root = FALSE; + opami = false; + continued_line = false; +// on_root = false; /* * Load basic pics and images @@ -610,7 +610,7 @@ void KSircTopLevel::setEncoding() void KSircTopLevel::setupCommandMenu() { - if(cmd_menu.empty() == true){ + if(cmd_menu.empty()){ cmd_menu.append(i18n("Help") + "/" + "help"); cmd_menu.append(i18n("Client") + "/" + "alias"); cmd_menu.append(i18n("User") + "/" + "away"); @@ -719,7 +719,7 @@ void KSircTopLevel::TabNickCompletion(int dir) s = linee->text(); tab_saved = s; end = linee->cursorPosition() - 1; - start = s.findRev(" ", end, FALSE); + start = s.findRev(" ", end, false); tab_start = start; tab_end = end; first = true; @@ -756,12 +756,12 @@ void KSircTopLevel::TabNickCompletion(int dir) if (start == -1) { tab_nick = findNick(s.mid(0, end+1), tab_pressed); - if(first && (tab_nick.isNull() == TRUE)){ + if(first && tab_nick.isNull()){ KNotifyClient::beep(); lineeNotTab(); return; } - else if(tab_nick.isNull() == TRUE){ + else if(tab_nick.isNull()){ tab_pressed -= 1; tab_nick = findNick(s.mid(0, end+1), tab_pressed); } @@ -773,12 +773,12 @@ void KSircTopLevel::TabNickCompletion(int dir) } else { tab_nick = findNick(s.mid(start + 1, end - start), tab_pressed); - if(first && (tab_nick.isNull() == TRUE)){ + if(first && tab_nick.isNull()){ KNotifyClient::beep(); lineeNotTab(); return; } - else if(tab_nick.isNull() == TRUE){ + else if(tab_nick.isNull()){ tab_pressed -= 1; tab_nick = findNick(s.mid(start + 1, end - start), tab_pressed); } @@ -853,7 +853,7 @@ void KSircTopLevel::sirc_receive(TQString str, bool broadcast) if ( line.message.find( TQRegExp( "^\\[~b.+~b\\].+$" ) ) == 0 ) addressedLine = true; - if ( addressedLine == true && line.message.startsWith("* " + ksircProcess()->getNick())) + if ( addressedLine && line.message.startsWith("* " + ksircProcess()->getNick())) addressedLine = false; if ( addressedLine ) @@ -1056,7 +1056,7 @@ bool KSircTopLevel::parse_input(const TQString &string, TQString &plainText) } else if (err) { - if(err->err.isEmpty() == FALSE) + if(!err->err.isEmpty()) { kdWarning() << err->err << ": " << string << endl; delete pResult; @@ -1174,8 +1174,8 @@ void KSircTopLevel::UserUpdateMenu() user_controls->insertItem(ucm->title, i); if(ucm->accel) user_controls->setAccel(i, ucm->accel); - if((ucm->op_only == TRUE) && (opami == FALSE)) - user_controls->setItemEnabled(i, FALSE); + if(ucm->op_only && !opami) + user_controls->setItemEnabled(i, false); } } } @@ -1230,7 +1230,7 @@ void KSircTopLevel::focusChange(TQWidget *w) void KSircTopLevel::gotFocus() { - if(isVisible() == TRUE){ + if(isVisible()){ if(have_focus == 0){ if(m_channelInfo.channel()[0] != '!' ){ TQString str = TQString("/join %1").arg(m_channelInfo.channel()); @@ -1245,7 +1245,7 @@ void KSircTopLevel::gotFocus() emit currentWindow(this); } } - if(m_gotMsgWithoutFocus == true){ + if(m_gotMsgWithoutFocus){ m_gotMsgWithoutFocus = false; servercontroller::self()->decreaseNotificationCount(TQString("%1 -> %2 got message").arg(ksircProcess()->serverID()).arg(m_channelInfo.channel())); } @@ -1351,22 +1351,22 @@ void KSircTopLevel::control_message(int command, TQString str) break; } case STOP_UPDATES: - Buffer = TRUE; + Buffer = true; break; case RESUME_UPDATES: - Buffer = FALSE; - if(LineBuffer.isEmpty() == FALSE) + Buffer = false; + if(!LineBuffer.isEmpty()) sirc_receive(TQString()); break; case REREAD_CONFIG: - emit freezeUpdates(TRUE); // Stop the list boxes update + emit freezeUpdates(true); // Stop the list boxes update selector->setFont( ksopts->defaultFont.family() ); mainw->setFont( ksopts->defaultFont ); nicks->setFont( ksopts->defaultFont ); linee->setFont( ksopts->defaultFont ); ksTopic->setFont( ksopts->defaultFont ); UserUpdateMenu(); // Must call to update Popup. - emit freezeUpdates(FALSE); // Stop the list boxes update + emit freezeUpdates(false); // Stop the list boxes update initColors(); ksopts->channelSetup(m_channelInfo.server(), m_channelInfo.channel()); file->setItemChecked(topicitem, ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].topicShow); @@ -1379,7 +1379,7 @@ void KSircTopLevel::control_message(int command, TQString str) setEncoding(); } mainw->enableTimeStamps(ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].timeStamp); - if(ksopts->oneLineEntry == true) { + if(ksopts->oneLineEntry) { linee->setWordWrap(TQTextEdit::NoWrap); } else { @@ -1389,12 +1389,12 @@ void KSircTopLevel::control_message(int command, TQString str) update(); break; case SET_LAG: - if(str.isNull() == FALSE){ - bool ok = TRUE; + if(!str.isNull()){ + bool ok = true; str.truncate(6); double lag = str.toDouble(&ok); - if(ok == TRUE){ + if(ok){ lag -= (lag*100.0 - int(lag*100.0))/100.0; TQString s_lag; s_lag.sprintf("Lag: %.2f", lag); @@ -1585,7 +1585,7 @@ void KSircTopLevel::slotTextDropped( const TQString& _text ) tab_pressed = -1; if(lines > 1){ - linee->setUpdatesEnabled(FALSE); + linee->setUpdatesEnabled(false); TQStringList lines = TQStringList::split( '\n', text, true ); TQStringList::ConstIterator it = lines.begin(); @@ -1618,7 +1618,7 @@ void KSircTopLevel::slotTextDropped( const TQString& _text ) } linee->setText(""); - linee->setUpdatesEnabled(TRUE); + linee->setUpdatesEnabled(true); linee->update(); } else{ @@ -1753,7 +1753,7 @@ void KSircTopLevel::doChange(bool pers, TQString text) } } - if(have_focus == 0 && pers == true && m_gotMsgWithoutFocus == false){ + if(have_focus == 0 && pers && !m_gotMsgWithoutFocus){ m_gotMsgWithoutFocus = true; servercontroller::self()->increaseNotificationCount(TQString("%1 -> %2").arg(ksircProcess()->serverID()).arg(m_channelInfo.channel()), text); } @@ -1797,9 +1797,9 @@ void KSircTopLevel::toggleTicker() else { ticker = new KSTicker(0x0, m_channelInfo.channel().utf8() + "_ticker"); ticker->setCaption(m_channelInfo.channel()); - if(tickerpoint.isNull() == false) + if(!tickerpoint.isNull()) ticker->move(tickerpoint); - if(tickersize.isEmpty() == false) + if(!tickersize.isEmpty()) ticker->resize(tickersize); ticker->show(); displayMgr->hide(this); diff --git a/ksirc/toplevel.h b/ksirc/toplevel.h index 07717038..e1f4a70f 100644 --- a/ksirc/toplevel.h +++ b/ksirc/toplevel.h @@ -274,7 +274,7 @@ protected slots: /** * Makes a beep when a change happens (if the user has this on) - * the bool is TRUE if changed line contained user's nick + * the bool is true if changed line contained user's nick */ void doChange(bool, TQString); diff --git a/ksirc/usercontrolmenu.cpp b/ksirc/usercontrolmenu.cpp index 1387932d..fc1254b6 100644 --- a/ksirc/usercontrolmenu.cpp +++ b/ksirc/usercontrolmenu.cpp @@ -37,7 +37,7 @@ TQPtrList<UserControlMenu> *UserControlMenu::parseTDEConfig() // We found nothing, so let's use some defaults. - UserMenu.setAutoDelete(TRUE); + UserMenu.setAutoDelete(true); UserMenu.append(new UserControlMenu(i18n("&Refresh Nicks"), "refresh", 0, UserControlMenu::Text)); @@ -67,39 +67,39 @@ TQPtrList<UserControlMenu> *UserControlMenu::parseTDEConfig() "/kick $$dest_nick", 0, UserControlMenu::Text, - TRUE)); + true)); UserMenu.append(new UserControlMenu(i18n("&Ban"), "/ban $$dest_nick", 0, UserControlMenu::Text, - TRUE)); + true)); UserMenu.append(new UserControlMenu(i18n("U&nBan"), "/unban $$dest_nick", 0, UserControlMenu::Text, - TRUE)); + true)); UserMenu.append(new UserControlMenu()); UserMenu.append(new UserControlMenu(i18n("&Op"), "/op $$dest_nick", 0, UserControlMenu::Text, - TRUE)); + true)); UserMenu.append(new UserControlMenu(i18n("&Deop"), "/deop $$dest_nick", 0, UserControlMenu::Text, - TRUE)); + true)); UserMenu.append(new UserControlMenu()); UserMenu.append(new UserControlMenu(i18n("&Voice"), "/mode $$dest_chan +v $$dest_nick", 0, UserControlMenu::Text, - TRUE)); + true)); UserMenu.append(new UserControlMenu(i18n("Devo&ice"), "/mode $$dest_chan -v $$dest_nick", 0, UserControlMenu::Text, - TRUE)); + true)); } else{ TQString key, cindex, title, action; diff --git a/ksirc/usercontrolmenu.h b/ksirc/usercontrolmenu.h index 5ffdfbb4..872f5f8a 100644 --- a/ksirc/usercontrolmenu.h +++ b/ksirc/usercontrolmenu.h @@ -15,7 +15,7 @@ class UserControlMenu { const TQString& _action = 0, int _accel = 0, int _type = 0, - bool _op_only = FALSE); + bool _op_only = false); ~UserControlMenu(); |