diff options
62 files changed, 191 insertions, 192 deletions
diff --git a/src/kvilib/ext/kvi_regusersdb.h b/src/kvilib/ext/kvi_regusersdb.h index 6d587ba..8b04fe8 100644 --- a/src/kvilib/ext/kvi_regusersdb.h +++ b/src/kvilib/ext/kvi_regusersdb.h @@ -98,7 +98,7 @@ public: const TQString & getProperty(const TQString &name); // returns 0 if the property is not there bool getProperty(const TQString &name,TQString &value); // returns false if the property is not there - bool getBoolProperty(const TQString &name,bool def=FALSE); // returns true if the property is there and is true + bool getBoolProperty(const TQString &name,bool def=false); // returns true if the property is there and is true // the propertyDict may be 0! KviPointerHashTable<TQString,TQString> * propertyDict(){ return m_pPropertyDict; }; // this is never zero (but may contain no masks) diff --git a/src/kvilib/net/kvi_netutils.cpp b/src/kvilib/net/kvi_netutils.cpp index bf5c00b..1ba4437 100644 --- a/src/kvilib/net/kvi_netutils.cpp +++ b/src/kvilib/net/kvi_netutils.cpp @@ -957,14 +957,14 @@ namespace KviNetUtils #ifndef HAVE_INET_ATON TQString szAddr = szStringIp.simplifyWhiteSpace(); TQ_UINT32 iAddr=0; - TQStringList ipv4 = TQStringList::split(".", szAddr, FALSE); + TQStringList ipv4 = TQStringList::split(".", szAddr, false); if (ipv4.count() == 4) { int i = 0; - bool ok = TRUE; + bool ok = true; while(ok && i < 4) { uint byteValue = ipv4[i].toUInt(&ok); if ( (byteValue > 255) && ok ) - ok = FALSE; + ok = false; if (ok) iAddr = (iAddr << 8) + byteValue; ++i; @@ -975,7 +975,7 @@ namespace KviNetUtils return true; } } - return FALSE; + return false; #else //HAVE_INET_ATON if(szStringIp.isEmpty())return false; return (inet_aton(KviTQString::toUtf8(szStringIp).data(),address) != 0); diff --git a/src/kvilib/tal/kvi_tal_filedialog_kde.h b/src/kvilib/tal/kvi_tal_filedialog_kde.h index d896a5a..82d9d9a 100644 --- a/src/kvilib/tal/kvi_tal_filedialog_kde.h +++ b/src/kvilib/tal/kvi_tal_filedialog_kde.h @@ -31,7 +31,7 @@ class KVILIB_API KviTalFileDialog : public KFileDialog TQ_OBJECT public: - KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE); + KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = false); ~KviTalFileDialog(); public: enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly }; diff --git a/src/kvilib/tal/kvi_tal_filedialog_qt.h b/src/kvilib/tal/kvi_tal_filedialog_qt.h index c881e8a..651be3b 100644 --- a/src/kvilib/tal/kvi_tal_filedialog_qt.h +++ b/src/kvilib/tal/kvi_tal_filedialog_qt.h @@ -30,7 +30,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog TQ_OBJECT public: - KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE); + KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = false); ~KviTalFileDialog(); public: enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly }; diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp index ce54641..dd408ed 100644 --- a/src/kvilib/tal/kvi_tal_listview.cpp +++ b/src/kvilib/tal/kvi_tal_listview.cpp @@ -152,7 +152,7 @@ exclusive( 0 ), currentState( KviTalCheckListItem::Off ), statesDict( 0 ), - tristate( FALSE ) {} + tristate( false ) {} KviTalCheckListItem *exclusive; KviTalCheckListItem::ToggleState currentState; @@ -267,14 +267,14 @@ void KviTalCheckListItem::init() { d = new KviTalCheckListItemPrivate(); - on = FALSE; // ### remove on ver 4 + on = false; // ### remove on ver 4 if ( myType == CheckBoxController || myType == CheckBox ) { d->statesDict = new KviPointerHashTable<void *,ToggleState>(101); - d->statesDict->setAutoDelete( TRUE ); + d->statesDict->setAutoDelete( true ); } - // CheckBoxControllers by default have tristate set to TRUE + // CheckBoxControllers by default have tristate set to true if ( myType == CheckBoxController ) - setTristate( TRUE ); + setTristate( true ); } KviTalCheckListItem::~KviTalCheckListItem() @@ -322,7 +322,7 @@ { if ( myType == CheckBoxController && state() == NoChange ) updateStoredState( (void*) this ); - setState( s, TRUE, TRUE ); + setState( s, true, true ); } void KviTalCheckListItem::setState( ToggleState s, bool update, bool store) @@ -348,7 +348,7 @@ ( ((KviTalCheckListItem*)item)->type() == CheckBox || ((KviTalCheckListItem*)item)->type() == CheckBoxController ) ) { KviTalCheckListItem *checkItem = (KviTalCheckListItem*)item; - checkItem->setState( s, FALSE, FALSE ); + checkItem->setState( s, false, false ); childCount++; } item = item->nextSibling(); @@ -356,7 +356,7 @@ if ( update ) { if ( childCount > 0 ) { ToggleState oldState = internalState(); - updateController( FALSE, FALSE ); + updateController( false, false ); if ( oldState != internalState() && parent() && parent()->rtti() == 1 && ((KviTalCheckListItem*)parent())->type() == CheckBoxController ) @@ -399,9 +399,9 @@ ToggleState old = d->currentState; d->currentState = s; if (d->currentState == On) - on = TRUE; + on = true; else - on = FALSE; + on = false; #if defined(TQT_ACCESSIBILITY_SUPPORT) if ( old != d->currentState && listView() ) @@ -432,7 +432,7 @@ void KviTalCheckListItem::turnOffChild() { if ( myType == RadioButtonController && d->exclusive ) - d->exclusive->setOn( FALSE ); + d->exclusive->setOn( false ); } void KviTalCheckListItem::activate() @@ -445,10 +445,10 @@ TQPoint pos; int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); if ( activatedPos( pos ) ) { - bool parentControl = FALSE; + bool parentControl = false; if ( parent() && parent()->rtti() == 1 && ((KviTalCheckListItem*) parent())->type() == RadioButtonController ) - parentControl = TRUE; + parentControl = true; int x = parentControl ? 0 : 3; int align = lv->columnAlignment( 0 ); @@ -486,7 +486,7 @@ } ignoreDoubleClick(); } else if ( myType == RadioButton ) { - setOn( TRUE ); + setOn( true ); ignoreDoubleClick(); } } @@ -494,9 +494,9 @@ void KviTalCheckListItem::setOn( bool b ) { if ( b ) - setState( On , TRUE, TRUE ); + setState( On , true, true ); else - setState( Off , TRUE, TRUE ); + setState( Off , true, true ); } void KviTalCheckListItem::stateChange( bool ) @@ -531,12 +531,12 @@ } if ( childCount > 0 ) { if ( depth == 0 ) - updateController( TRUE ); + updateController( true ); else - updateController( FALSE ); + updateController( false ); } else { // if there are no children we retrieve the CheckBoxController state directly. - setState( storedState( key ), TRUE, FALSE ); + setState( storedState( key ), true, false ); } } break; @@ -557,7 +557,7 @@ controller = (KviTalCheckListItem*)parent(); ToggleState theState = Off; - bool first = TRUE; + bool first = true; KviTalListViewItem *item = firstChild(); while( item && theState != NoChange ) { if ( item->rtti() == 1 && @@ -566,7 +566,7 @@ KviTalCheckListItem *checkItem = (KviTalCheckListItem*)item; if ( first ) { theState = checkItem->internalState(); - first = FALSE; + first = false; } else { if ( checkItem->internalState() == NoChange || theState != checkItem->internalState() ) @@ -658,10 +658,10 @@ return; } - bool parentControl = FALSE; + bool parentControl = false; if ( parent() && parent()->rtti() == 1 && ((KviTalCheckListItem*) parent())->type() == RadioButtonController ) - parentControl = TRUE; + parentControl = true; TQFontMetrics fm( lv->fontMetrics() ); int boxsize = lv->style().pixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize : @@ -730,7 +730,7 @@ void KviTalCheckListItem::paintFocus( TQPainter *p, const TQColorGroup & cg,const TQRect & r ) { - bool intersect = TRUE; + bool intersect = true; KviTalListView *lv = listView(); if ( lv && lv->header()->mapToActual( 0 ) != 0 ) { int xdepth = lv->treeStepSize() * ( depth() + ( lv->rootIsDecorated() ? 1 : 0) ) + lv->itemMargin(); @@ -738,10 +738,10 @@ xdepth += p; intersect = r.intersects( TQRect( p, r.y(), xdepth - p + 1, r.height() ) ); } - bool parentControl = FALSE; + bool parentControl = false; if ( parent() && parent()->rtti() == 1 && ((KviTalCheckListItem*) parent())->type() == RadioButtonController ) - parentControl = TRUE; + parentControl = true; if ( myType != RadioButtonController && intersect && (lv->rootIsDecorated() || myType == RadioButton || (myType == CheckBox && parentControl) ) ) { diff --git a/src/kvilib/tal/kvi_tal_listview_qt3.h b/src/kvilib/tal/kvi_tal_listview_qt3.h index f5f4a1f..2ef8967 100644 --- a/src/kvilib/tal/kvi_tal_listview_qt3.h +++ b/src/kvilib/tal/kvi_tal_listview_qt3.h @@ -175,7 +175,7 @@ private: ToggleState storedState( void *key ) const; void stateChange( ToggleState s ); void restoreState( void *key, int depth = 0 ); - void updateController( bool update = TRUE , bool store = FALSE ); + void updateController( bool update = true , bool store = false ); void updateStoredState( void *key ); void setState( ToggleState s, bool update, bool store ); void setCurrentState( ToggleState s ); diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 41fba1d..1ec8a89 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -1821,7 +1821,7 @@ void KviApp::buildRecentChannels() if(m_pRecentChannelsDict) delete m_pRecentChannelsDict; m_pRecentChannelsDict = new KviPointerHashTable<const char *,TQStringList>; - m_pRecentChannelsDict->setAutoDelete(TRUE); + m_pRecentChannelsDict->setAutoDelete(true); TQString szChan,szNet; for ( TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).begin(); diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp index c4b15db..ba6ed3e 100644 --- a/src/kvirc/kernel/kvi_ipc.cpp +++ b/src/kvirc/kernel/kvi_ipc.cpp @@ -85,7 +85,7 @@ int format; unsigned long nItems,after; unsigned char * data = 0; - if(XGetWindowProperty(kvi_ipc_get_xdisplay(),win,kvi_atom_ipc_sentinel_window,0,32,FALSE,XA_STRING, + if(XGetWindowProperty(kvi_ipc_get_xdisplay(),win,kvi_atom_ipc_sentinel_window,0,32,False,XA_STRING, &type,&format,&nItems,&after,&data) == Success) { if((type == XA_STRING) && (format == 8)) @@ -238,7 +238,7 @@ unsigned long nItems,after; unsigned char * data = 0; KviStr szData; - if(XGetWindowProperty(kvi_ipc_get_xdisplay(),winId(),kvi_atom_ipc_remote_command,0,1024,FALSE,XA_STRING, + if(XGetWindowProperty(kvi_ipc_get_xdisplay(),winId(),kvi_atom_ipc_remote_command,0,1024,False,XA_STRING, &type,&format,&nItems,&after,&data) == Success) { if((type == XA_STRING) && (format == 8) && (nItems > 0) && data) diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp index a7b8774..8feb7ee 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -355,7 +355,7 @@ namespace KviKvsCoreFunctions It allows an alias to handle switches just like any other KVIrc command. If a switch in the form -<letter> was passed to the current alias then $sw(<letter>) - returns 1 (true). If a switch in the form -<letter>=<value> + returns true. If a switch in the form -<letter>=<value> was passed to the current alias then <value> is returned. If the switch was not present at all then this function returns an empty string (that evaluates to false in an expression). diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp index 09e8644..32a6add 100644 --- a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp @@ -635,7 +635,7 @@ void KviKvsEventManager::saveAppEvents(const TQString &szFileName) KviConfig cfg(szFileName,KviConfig::Write); cfg.clear(); int i; - bool bCompat = FALSE; + bool bCompat = false; for(i=0;i<KVI_KVS_NUM_APP_EVENTS;i++) { @@ -646,7 +646,7 @@ void KviKvsEventManager::saveAppEvents(const TQString &szFileName) if((i == 4) && cfg.hasGroup(szEventName)) { szEventName = "OnIRCConnectionEstabilished"; - bCompat = TRUE; + bCompat = true; } cfg.setGroup(szEventName); int index = 0; diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp index 4b8c8c9..19f9925 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp @@ -2943,7 +2943,7 @@ channel Console @description: Triggered when a [cmd]http.get[/cmd] file download has terminated execution. - If the transfer has been succesfull then $0 will contain the value 1 (true), + If the transfer has been succesfull then $0 will contain the value true, otherwise will contain the value 0. $1 contains the remote url and $2 the local path on disk of the saved file. $3 contains the magic identifier passed to the http.get command by the means of the -i switch. diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 1eda917..9b98621 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -390,7 +390,7 @@ so it inherits the "object" class functions and events and the sayhello function from "helloworld". In addition a setlanguage function is defined that stores in a variable the language name passed as a parameter (after checking its validity). ($0 evaluates to the first parameter passed) - If the language is unknown the setlanguage function will return 0 (false). + If the language is unknown the setlanguage function will return false. Now we want to be able to say "hello world" in italian and english. So we [b]override[/b] the inherited sayhello function. "To override" means "to reimplement" : if you call %object->$sayhello() and %object diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp index 5d511cd..541986d 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp @@ -505,7 +505,7 @@ void KviKvsPopupMenuItemExtMenu::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTop KviKvsPopupMenuTopLevelData::KviKvsPopupMenuTopLevelData(KviKvsVariantList * pParameters,KviWindow * pWindow) { - m_pExtendedRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),TRUE); + m_pExtendedRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),true); m_pParameters = pParameters; m_pWindow = pWindow; m_bTestMode = false; diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp index aa09d88..4657110 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp @@ -39,7 +39,7 @@ KviKvsProcessAsyncOperation::KviKvsProcessAsyncOperation(KviKvsProcessDescriptor { m_pData = d; m_pProcess = 0; - m_pExtendedRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),TRUE); + m_pExtendedRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),true); m_pPingTimer = 0; m_pRunTimeTimer = 0; m_bDeletePending = false; diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.h b/src/kvirc/kvs/kvi_kvs_runtimecontext.h index 373eb39..308ef47 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecontext.h +++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.h @@ -57,30 +57,30 @@ public: m_pAliasSwitchList(0), m_pThisObject(0), m_pScriptFilePath(0), - m_bAutoDelete(FALSE) + m_bAutoDelete(false) {}; - KviKvsExtendedRunTimeData(KviKvsHash * pExtScopeVariables,bool autoDelete=FALSE) + KviKvsExtendedRunTimeData(KviKvsHash * pExtScopeVariables,bool autoDelete=false) : m_pExtendedScopeVariables(pExtScopeVariables), m_pAliasSwitchList(0), m_pThisObject(0), m_pScriptFilePath(0), m_bAutoDelete(autoDelete) {}; - KviKvsExtendedRunTimeData(KviKvsSwitchList * pAliasSwitchList,bool autoDelete=FALSE) + KviKvsExtendedRunTimeData(KviKvsSwitchList * pAliasSwitchList,bool autoDelete=false) : m_pExtendedScopeVariables(0), m_pAliasSwitchList(pAliasSwitchList), m_pThisObject(0), m_pScriptFilePath(0), m_bAutoDelete(autoDelete) {}; - KviKvsExtendedRunTimeData(KviKvsObject * pThisObject,bool autoDelete=FALSE) + KviKvsExtendedRunTimeData(KviKvsObject * pThisObject,bool autoDelete=false) : m_pExtendedScopeVariables(0), m_pAliasSwitchList(0), m_pThisObject(pThisObject), m_pScriptFilePath(0), m_bAutoDelete(autoDelete) {}; - KviKvsExtendedRunTimeData(TQString * pScriptFilePath,bool autoDelete=FALSE) + KviKvsExtendedRunTimeData(TQString * pScriptFilePath,bool autoDelete=false) : m_pExtendedScopeVariables(0), m_pAliasSwitchList(0), m_pThisObject(0), diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp index 239ca57..9d9a2a4 100644 --- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_timermanager.cpp @@ -47,7 +47,7 @@ KviKvsTimer::KviKvsTimer(const TQString &szName,Lifetime l,KviWindow * pWnd,int m_iId = iId; m_pCallback = pCallback; //m_pVariables = new KviKvsHash(); - m_pRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),TRUE); + m_pRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),true); m_pParameterList = pParams; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp index 76d5c54..db91bf3 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp @@ -382,7 +382,6 @@ bool KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::evaluateReadOnly(KviKvsRun #ifdef COMPILE_NEW_KVS KviKvsVariant v; if(!m_pData->evaluateReadOnly(c,&v))return false; -//#warning "FIXME: We could use setNothing() for false and setInteger(1) for true: this would save memory allocations for false conditions" pBuffer->setBoolean(!v.asBoolean()); #endif return true; diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.h b/src/kvirc/kvs/kvi_kvs_variantlist.h index 77b7a46..42f5cbb 100644 --- a/src/kvirc/kvs/kvi_kvs_variantlist.h +++ b/src/kvirc/kvs/kvi_kvs_variantlist.h @@ -69,7 +69,7 @@ public: void append(KviKvsVariant * v){ m_pList->append(v); }; void prepend(KviKvsVariant * v){ m_pList->prepend(v); }; - void setAutoDelete(bool bAutoDelete); // this is TRUE by default + void setAutoDelete(bool bAutoDelete); // this is true by default void allAsString(TQString &szBuffer); // returns true if there was a first parameter at all diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index 37e7992..a224bb4 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -1575,7 +1575,7 @@ bool KviChannel::eventFilter(TQObject * o, TQEvent * e) void KviChannel::preprocessMessage(TQString & szMessage) { - TQStringList strings = TQStringList::split(" ",szMessage, TRUE); + TQStringList strings = TQStringList::split(" ",szMessage, true); for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { if((*it).contains('\r')) continue; TQString tmp = KviMircCntrl::stripControlBytes(*it); diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 3a8d3d6..eab2323 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -190,7 +190,7 @@ KviInputEditor::KviInputEditor(TQWidget * par,KviWindow *wnd,KviUserListView * v m_pUserListView = view; m_pHistory = new KviPointerList<TQString>; m_pHistory->setAutoDelete(true); - m_bReadOnly = FALSE; + m_bReadOnly = false; setInputMethodEnabled(true); @@ -373,8 +373,8 @@ void KviInputEditor::drawContents(TQPainter *p) // TODO Refactor: write a function to combine this with the code determining iIMStart and iIMSelectionStart if(iSelStart < m_iFirstVisibleChar)iSelStart = m_iFirstVisibleChar; - int xLeft = xPositionFromCharIndex(fm,iSelStart,TRUE); - int xRight = xPositionFromCharIndex(fm,m_iSelectionEnd + 1,TRUE); + int xLeft = xPositionFromCharIndex(fm,iSelStart,true); + int xRight = xPositionFromCharIndex(fm,m_iSelectionEnd + 1,true); // pa.setRasterOp(TQt::NotROP); pa.fillRect(xLeft,frameWidth(),xRight - xLeft,widgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); @@ -392,8 +392,8 @@ void KviInputEditor::drawContents(TQPainter *p) // TODO Write a function to combine IM selection drawing code. maybe the preedit area too. int iIMSelectionStart = m_iIMSelectionBegin; if(iIMSelectionStart < m_iFirstVisibleChar) iIMSelectionStart = m_iFirstVisibleChar; - int xIMSelectionLeft = xPositionFromCharIndex(fm,iIMSelectionStart,TRUE); - int xIMSelectionRight = xPositionFromCharIndex(fm,iIMSelectionStart + m_iIMSelectionLength,TRUE); + int xIMSelectionLeft = xPositionFromCharIndex(fm,iIMSelectionStart,true); + int xIMSelectionRight = xPositionFromCharIndex(fm,iIMSelectionStart + m_iIMSelectionLength,true); // pa.setRasterOp(TQt::NotROP); pa.fillRect(xIMSelectionLeft,0,xIMSelectionRight - xIMSelectionLeft, widgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); // pa.setRasterOp(TQt::CopyROP); @@ -401,8 +401,8 @@ void KviInputEditor::drawContents(TQPainter *p) // highlight the IM selection int iIMStart = m_iIMStart; if(m_iIMStart < m_iFirstVisibleChar) m_iIMStart = m_iFirstVisibleChar; - int xIMLeft = xPositionFromCharIndex(fm,iIMStart,TRUE); - int xIMRight = xPositionFromCharIndex(fm,iIMStart + m_iIMLength,TRUE); + int xIMLeft = xPositionFromCharIndex(fm,iIMStart,true); + int xIMRight = xPositionFromCharIndex(fm,iIMStart + m_iIMLength,true); // underline the IM preedit // Maybe should be put in drawTextBlock, similar to drawing underlined text @@ -444,7 +444,7 @@ void KviInputEditor::drawContents(TQPainter *p) if(iSubLen) { - drawTextBlock(&pa,fm,curXPos,textBaseline,iSubStart,iSubLen,FALSE); + drawTextBlock(&pa,fm,curXPos,textBaseline,iSubStart,iSubLen,false); curXPos += m_iBlockWidth; m_iBlockWidth=0; } @@ -456,7 +456,7 @@ void KviInputEditor::drawContents(TQPainter *p) if(iSubLen) { - drawTextBlock(&pa,fm,curXPos,textBaseline,iSubStart,iSubLen,TRUE); + drawTextBlock(&pa,fm,curXPos,textBaseline,iSubStart,iSubLen,true); curXPos += m_iBlockWidth; m_iBlockWidth=0; } @@ -465,7 +465,7 @@ void KviInputEditor::drawContents(TQPainter *p) { iSubStart+=iSubLen; iSubLen=iBlockEnd-iSubStart; - drawTextBlock(&pa,fm,curXPos,textBaseline,iSubStart,iSubLen,FALSE); + drawTextBlock(&pa,fm,curXPos,textBaseline,iSubStart,iSubLen,false); } } else { drawTextBlock(&pa,fm,curXPos,textBaseline,charIdx,m_iBlockLen); @@ -2242,7 +2242,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) m_pHistoryButton = new KviStyledToolButton(m_pButtonContainer,"historybutton"); m_pHistoryButton->setUsesBigPixmap(false); - //m_pHistoryButton->setUpdatesEnabled(TRUE); ??? + //m_pHistoryButton->setUpdatesEnabled(true); ??? TQIconSet is1; if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))//G&N mar 2005 { diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index 45a8fcb..60ee313 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -156,14 +156,14 @@ private: void getWordBeforeCursor(TQString &buffer,bool * bIsFirstWordInLine); void runUpToTheFirstVisibleChar(); void extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int maxXPos); - void drawTextBlock(TQPainter *pa,TQFontMetrics & fm,int curXPos,int textBaseline,int idx,int len,bool bSelected=FALSE); + void drawTextBlock(TQPainter *pa,TQFontMetrics & fm,int curXPos,int textBaseline,int idx,int len,bool bSelected=false); TQChar getSubstituteChar(unsigned short control_code); void moveRightFirstVisibleCharToShowCursor(); void repaintWithCursorOn(); void selectOneChar(int pos); int charIndexFromXPosition(int xPos); - int xPositionFromCharIndex(TQFontMetrics& fm,int chIdx,bool bContentsCoords=FALSE); - int xPositionFromCharIndex(int chIdx,bool bContentsCoords=FALSE); + int xPositionFromCharIndex(TQFontMetrics& fm,int chIdx,bool bContentsCoords=false); + int xPositionFromCharIndex(int chIdx,bool bContentsCoords=false); void killDragTimer(); void handleDragSelection(); void end(); diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp index 70bf7af..4a459e5 100644 --- a/src/kvirc/ui/kvi_listview.cpp +++ b/src/kvirc/ui/kvi_listview.cpp @@ -47,7 +47,7 @@ KviListView::~KviListView() void KviListView::setBackgroundOverlayPixmap(TQPixmap * pix,int iAlignmentFlags) { - setStaticBackground(TRUE); + setStaticBackground(true); viewport()->setBackgroundMode(TQWidget::NoBackground); m_pBackgroundOverlayPixmap=new TQPixmap(*pix); m_iBackgroundOverlayAlignment= TQt::AlignRight | TQt::AlignBottom; diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index dfccd5b..7f8df43 100644 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -123,10 +123,10 @@ bool KviModeWidget::eventFilter( TQObject *obj, TQEvent *ev ) case TQt::Key_Return: case TQt::Key_Enter: editorReturnPressed(); - return TRUE; + return true; case TQt::Key_Escape: reset(); - return TRUE; + return true; } } return TQFrame::eventFilter( obj, ev ); diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 3b55255..334530c 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -105,7 +105,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick) if(KVI_OPTION_BOOL(KviOption_boolAutoLogQueries)) m_pIrcView->startLogging(); // FIXME: #warning "Maybe tell the user all that we know about the remote end(s)....channels..." - m_pIrcView->enableDnd(TRUE); + m_pIrcView->enableDnd(true); connect(m_pIrcView,TQ_SIGNAL(fileDropped(const char *)),this,TQ_SLOT(slotDndEvents(const char *))); updateCaption(); diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index 1655880..16037a8 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -764,7 +764,7 @@ KviCahnnelListSelector::KviCahnnelListSelector(TQWidget * par,const TQString & t } m_pListView->setSelectionMode(KviTalListView::Extended); - m_pListView->setAllColumnsShowFocus(TRUE); + m_pListView->setAllColumnsShowFocus(true); connect(m_pListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged())); setSpacing(4); setStretchFactor(m_pListView,1); @@ -824,7 +824,7 @@ void KviCahnnelListSelector::removeClicked() lst.append((KviTalListViewItem *)it.current() ); ++it; } - lst.setAutoDelete(TRUE); + lst.setAutoDelete(true); lst.clear(); } diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index 3a9de7d..286b3ff 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -60,7 +60,7 @@ bool KviStyledControlInternal::eventFilter( TQObject *obj, TQEvent *ev ) } else if(ev->type()==TQEvent::Leave) { m_pControl->leaveEvent(ev); } - return FALSE; + return false; } void KviStyledControlInternal::paintTimerShot () diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index a0a73e7..64a857a 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -374,7 +374,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter) cRect.setWidth(cRect.width() + 10); pPainter->drawText(cRect,TQt::AlignLeft | TQt::AlignTop,szText,-1); } - pPainter->setClipping(FALSE); + pPainter->setClipping(false); painter->drawPixmap(0,0,*pMemBuffer,distRect.x(),distRect.y(),iWidth,iHeight); } @@ -1032,7 +1032,7 @@ KviTreeTaskBarListView::KviTreeTaskBarListView(TQWidget * par) setShowSortIndicator(true); setItemMargin(2); setFrameShape(NoFrame); - viewport()->setMouseTracking(TRUE); + viewport()->setMouseTracking(true); m_pPrevItem=0; setHScrollBarMode(KviTalListView::AlwaysOff); } @@ -1083,12 +1083,12 @@ void KviTreeTaskBarListView::contentsMousePressEvent(TQMouseEvent *e) void KviTreeTaskBarListView::sort() { - setSorting(0,TRUE); + setSorting(0,true); } void KviTreeTaskBarListView::reverseSort() { - setSorting(0,FALSE); + setSorting(0,false); } void KviTreeTaskBarListView::resizeEvent(TQResizeEvent *e) diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 61f13e7..76ba21f 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -167,7 +167,7 @@ TQString convertToHtml(const TQString &text) if(len > 0) { - bool bOpened = FALSE; + bool bOpened = false; TQString szText = text.mid(start,len); if(curBold) result.append("<b>"); @@ -178,7 +178,7 @@ TQString convertToHtml(const TQString &text) result.append("<font color=\""); result.append(KVI_OPTION_MIRCCOLOR(curFore).name()); result.append('"'); - bOpened = TRUE; + bOpened = true; } /* if(curBack != KVI_LABEL_DEF_BACK) @@ -539,7 +539,7 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) int maxlen=-1; TQObject * w = parent(); TQString szModes; - bool bCanEdit = TRUE; + bool bCanEdit = true; while(w) { if(w->inherits("KviChannel")) @@ -622,14 +622,14 @@ void KviTopicWidget::copy() bool KviTopicWidget::eventFilter(TQObject *object,TQEvent *e) { if ( !e ) - return TRUE; + return true; if(object==m_pCompletionBox) { switch( e->type() ) { case TQEvent::MouseButtonPress: if ( m_pCompletionBox->rect().contains( ((TQMouseEvent*)e)->pos() ) ) { complete(m_pCompletionBox->index(m_pCompletionBox->itemAt(((TQMouseEvent*)e)->pos()))); - return TRUE; + return true; } break; case TQEvent::MouseButtonRelease: @@ -638,7 +638,7 @@ bool KviTopicWidget::eventFilter(TQObject *object,TQEvent *e) ((TQMouseEvent*)e)->pos(), ((TQMouseEvent*)e)->button(), ((TQMouseEvent*)e)->state() ) ; // will hide popup TQApplication::sendEvent( object, &tmp ); - return TRUE; + return true; } else { if ( m_pCompletionBox->isVisible() ) popDownListBox(); @@ -654,7 +654,7 @@ bool KviTopicWidget::eventFilter(TQObject *object,TQEvent *e) case TQt::Key_Escape: if ( m_pCompletionBox->isVisible() ) { popDownListBox(); - return TRUE; + return true; } break; default: diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 5e066ee..013e521 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -1383,7 +1383,7 @@ void KviWindow::unhighlight() void KviWindow::preprocessMessage(TQString & szMessage) { // slow - TQStringList strings = TQStringList::split(" ",szMessage, TRUE); + TQStringList strings = TQStringList::split(" ",szMessage, true); for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { TQString tmp(*it); if(tmp.contains('\r')) continue; diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index 8ebd9f2..30353a5 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -677,7 +677,7 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles) g_pAliasEditorModule->unlock(); return; } - m_szDir=TQFileInfo(szFile).dirPath(TRUE); + m_szDir=TQFileInfo(szFile).dirPath(true); g_pAliasEditorModule->unlock(); if(!KviFileUtils::writeFile(szFile,out)) diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 70e928e..d012a05 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1259,8 +1259,8 @@ TQWidget * KviVariantTableItem::createEditor() const case TQVariant::Bool: { TQComboBox * b = new TQComboBox(false,table()->viewport()); - b->insertItem("FALSE"); - b->insertItem("TRUE"); + b->insertItem("false"); + b->insertItem("true"); b->setCurrentItem(m_property.toBool() ? 1 : 0); return b; } @@ -1370,7 +1370,7 @@ void KviVariantTableItem::paint(TQPainter *p,const TQColorGroup &cg,const TQRect sz = m_property.toString(); break; case TQVariant::Bool: - sz = m_property.toBool() ? "TRUE" : "FALSE"; + sz = m_property.toBool() ? "true" : "false"; break; case TQVariant::Font: sz.setNum(m_property.toFont().pointSize()); diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 6ae4740..68a70d3 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -785,7 +785,7 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS } } - bool i=TRUE; + bool i=true; TQString szFind=((KviScriptEditorWidget *)textEdit())->m_szFind; if (!szFind.isEmpty()) { @@ -1123,7 +1123,7 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co replacebutton = new TQPushButton( this, "replacebutton" ); replacebutton->setText(tr("&Replace")); - replacebutton->setEnabled( FALSE ); + replacebutton->setEnabled( false ); layout->addWidget( replacebutton, 5, 0 ); checkReplaceAll = new KviStyledCheckBox( this, "replaceAll" ); @@ -1157,8 +1157,8 @@ KviScriptEditorReplaceDialog::~KviScriptEditorReplaceDialog() void KviScriptEditorReplaceDialog::textChanged(const TQString &txt) { - if (!txt.isEmpty()) replacebutton->setEnabled(TRUE); - else replacebutton->setEnabled(FALSE); + if (!txt.isEmpty()) replacebutton->setEnabled(true); + else replacebutton->setEnabled(false); } void KviScriptEditorReplaceDialog::slotReplace() diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index a032dc6..2b29e00 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -1161,7 +1161,7 @@ static bool file_kvs_fnc_extractpath(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("filepath",KVS_PT_NONEMPTYSTRING,0,szName) KVSM_PARAMETERS_END(c) - c->returnValue()->setString(TQFileInfo(szName).dirPath(TRUE)); + c->returnValue()->setString(TQFileInfo(szName).dirPath(true)); return true; } diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 7d78098..4561321 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -208,7 +208,7 @@ bool KviFileTransferWindow::eventFilter( TQObject *obj, TQEvent *ev ) if(m_pListView->currentItem()) { delete m_pListView->currentItem(); - return TRUE; + return true; } break; } @@ -589,7 +589,7 @@ void KviFileTransferWindow::openLocalFileFolder() if(!t)return; TQString tmp = t->localFileName(); if(tmp.isEmpty())return; - tmp=TQFileInfo(tmp).dirPath(TRUE); + tmp=TQFileInfo(tmp).dirPath(true); tmp.replace('/','\\'); tmp.prepend("explorer.exe "); WinExec(tmp.local8Bit().data(), SW_MAXIMIZE); diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 56f8663..1911e65 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -46,7 +46,7 @@ extern Index * g_pDocIndex; extern KviPointerList<KviHelpWindow> * g_pHelpWindowList; extern KviPointerList<KviHelpWidget> * g_pHelpWidgetList; -bool g_bIndexingDone = FALSE; +bool g_bIndexingDone = false; KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) : KviWindow(KVI_WINDOW_TYPE_HELP,lpFrm,name) { @@ -68,7 +68,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) g_pDocIndex->writeDocumentList(); delete pProgressDialog; } - g_bIndexingDone=TRUE; + g_bIndexingDone=true; } g_pHelpWindowList->append(this); @@ -150,7 +150,7 @@ void KviHelpWindow::refreshIndex() g_pDocIndex->writeDict(); g_pDocIndex->writeDocumentList(); delete pProgressDialog; - g_bIndexingDone=TRUE; + g_bIndexingDone=true; TQStringList docList=g_pDocIndex->titlesList(); m_pIndexListBox->insertStringList(docList); m_pIndexListBox->sort(); @@ -210,7 +210,7 @@ void KviHelpWindow::startSearch() m_pResultBox->insertItem( g_pDocIndex->getDocumentTitle( *it ) ); m_terms.clear(); - bool isPhrase = FALSE; + bool isPhrase = false; TQString s = ""; for ( int i = 0; i < (int)buf.length(); ++i ) { if ( buf[i] == '\"' ) { diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index 1596d4e..82c5f57 100644 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -37,8 +37,8 @@ Index::Index( const TQString &dp, const TQString &hp ) : TQObject( 0, 0 ), dict( 8999 ), docPath( dp ) { - alreadyHaveDocList = FALSE; - lastWindowClosed = FALSE; + alreadyHaveDocList = false; + lastWindowClosed = false; connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), this, TQ_SLOT( setLastWinClosed() ) ); } @@ -51,8 +51,8 @@ Index::Index( const TQStringList &dl, const TQString &hp ) { docList = dl; - alreadyHaveDocList = TRUE; - lastWindowClosed = FALSE; + alreadyHaveDocList = true; + lastWindowClosed = false; connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), this, TQ_SLOT( setLastWinClosed() ) ); } @@ -63,7 +63,7 @@ void Index::setLastWinClosed() { - lastWindowClosed = TRUE; + lastWindowClosed = true; } @@ -163,7 +163,7 @@ void Index::parseDocument( const TQString &filename, int docNum ) TQString text = s.read(); if (text.isNull()) return; - bool valid = TRUE; + bool valid = true; const TQChar *buf = text.unicode(); TQChar str[64]; TQChar c = buf[0]; @@ -171,7 +171,7 @@ void Index::parseDocument( const TQString &filename, int docNum ) int i = 0; while ( (uint)j < text.length() ) { if ( c == '<' || c == '&' ) { - valid = FALSE; + valid = false; if ( i > 1 ) insertInDict( TQString(str,i), docNum ); i = 0; @@ -179,7 +179,7 @@ void Index::parseDocument( const TQString &filename, int docNum ) continue; } if ( ( c == '>' || c == ';' ) && !valid ) { - valid = TRUE; + valid = true; c = buf[++j]; continue; } @@ -379,7 +379,7 @@ TQStringList Index::query( const TQStringList &terms, const TQStringList &termSe while ( C != minDocs.end() ) { - bool found = FALSE; + bool found = false; for ( It = docs.begin(); It != docs.end(); ++It ) { @@ -387,7 +387,7 @@ TQStringList Index::query( const TQStringList &terms, const TQStringList &termSe (*C).frequency += (*It).frequency; - found = TRUE; + found = true; break; @@ -462,9 +462,9 @@ TQString Index::getDocumentTitle( const TQString &fileName ) - int start = text.find( "<title>", 0, FALSE ) + 7; + int start = text.find( "<title>", 0, false ) + 7; - int end = text.find( "</title>", 0, FALSE ); + int end = text.find( "</title>", 0, false ); @@ -493,7 +493,7 @@ TQStringList Index::getWildcardTerms( const TQString &term ) int index = 0; - bool found = FALSE; + bool found = false; TQString text( it.currentKey() ); @@ -501,7 +501,7 @@ TQStringList Index::getWildcardTerms( const TQString &term ) if ( *iter == "*" ) { - found = TRUE; + found = true; continue; @@ -509,7 +509,7 @@ TQStringList Index::getWildcardTerms( const TQString &term ) if ( iter == terms.begin() && (*iter)[0] != text[0] ) { - found = FALSE; + found = false; break; @@ -523,7 +523,7 @@ TQStringList Index::getWildcardTerms( const TQString &term ) if ( index != (int)text.length() - (int)(*iter).length() ) { - found = FALSE; + found = false; break; @@ -533,7 +533,7 @@ TQStringList Index::getWildcardTerms( const TQString &term ) if ( index != -1 ) { - found = TRUE; + found = true; index += (*iter).length(); @@ -541,7 +541,7 @@ TQStringList Index::getWildcardTerms( const TQString &term ) } else { - found = FALSE; + found = false; break; @@ -697,7 +697,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & tqWarning( "cannot open file %s", fileName.ascii() ); - return FALSE; + return false; } @@ -719,7 +719,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & TQString text = s.read(); - bool valid = TRUE; + bool valid = true; const TQChar *buf = text.unicode(); @@ -735,7 +735,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & if ( c == '<' || c == '&' ) { - valid = FALSE; + valid = false; if ( i > 1 ) @@ -751,7 +751,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & if ( ( c == '>' || c == ';' ) && !valid ) { - valid = TRUE; + valid = true; c = buf[++j]; @@ -837,9 +837,9 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & if ( a.count() ) - return TRUE; + return true; - return FALSE; + return false; } diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index b43eef2..b75f855 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -210,7 +210,7 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole) m_pListView->addColumn(__tr2qs("Channel")); m_pListView->addColumn(__tr2qs("Users")); m_pListView->addColumn(__tr2qs("Topic")); - m_pListView->setAllColumnsShowFocus(TRUE); + m_pListView->setAllColumnsShowFocus(true); m_pListView->setColumnWidthMode(2,KviTalListView::Maximum); m_pListView->setColumnWidthMode(3,KviTalListView::Maximum); m_pListView->setSorting(100); diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index 2b15ac1..1f4a7f7 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -240,7 +240,7 @@ void KviLogViewMDIWindow::setupItemList() TQString textBuffer; TQProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"), __tr2qs_ctx("Abort filtering","logview"), m_logList.count(), - this, "progress", TRUE ); + this, "progress", true ); int i=0; diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index f96b3c0..5f24409 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -68,13 +68,13 @@ const int align_cod[] = { !fn: <string> $title() Returns the group box title text. !fn: $setFlat(<bflag:boolean>) - Sets whether the group box is painted flat. Valid Values are 1 or 0. + Sets whether the group box is painted flat. Valid Values are true or false. !fn: <boolean> $isFlat() - Returns 1 (TRUE) if the group box is painted flat; otherwise returns 0 (FALSE). + Returns true if the group box is painted flat; otherwise returns false. !fn: <boolean> $isCheckable() - Returns 1 (TRUE) if the group box has a checkbox in its title; otherwise returns 0 (FALSE). + Returns true if the group box has a checkbox in its title; otherwise returns false. !fn: $setCheckable(<bflag:boolean>) - Sets whether the group box has a checkbox in its title: Valid values are 1 or 0. + Sets whether the group box has a checkbox in its title: Valid values are true or false. !fn: $setInsideMargin(<margin:uint>) Sets the the width of the inside margin to m pixels. !fn: <integer> $insideMargin() diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index 79ddea0..88c665f 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -58,12 +58,12 @@ !fn: $setNumDigits(<number:integer>) Sets the lcd number value. !fn: <boolean> $checkOverflow() - Returns TRUE if num is too big to be displayed in its entirety; - otherwise returns FALSE. + Returns true if num is too big to be displayed in its entirety; + otherwise returns false. !fn: $setSmallDecimalPoint(<bflag:boolean>) Sets the the decimal point style, valid bool values are 1 or 0. !fn: <boolean> $checkOverflow(<number:integer>) - Returns 1 (TRUE) if num is too big to be displayed in its entirety; otherwise returns 0 (FALSE). + Returns true if num is too big to be displayed in its entirety; otherwise returns false. */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_lcd,"lcdnumber","widget") diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index c23abd5..34a66b5 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -66,7 +66,7 @@ Adds a width pixels wide column with the column header label to the list view. !fn: $setSorting(<column:integer>,<bAscending:boolean>) - Sets the list view to be sorted by column column in ascending order if ascending is 1 or descending order if it is FALSE. + Sets the list view to be sorted by column column in ascending order if ascending is 1 or descending order if it is false. If column is -1, sorting is disabled and the user cannot sort columns by clicking on the column headers !fn: $hideListViewHeader() @@ -510,7 +510,7 @@ KviKvsMdmListView::KviKvsMdmListView(TQWidget * par,const char * name,KviKvsObje { m_pParentScript=parent; setAcceptDrops(true); - viewport()->setAcceptDrops( TRUE ); + viewport()->setAcceptDrops( true ); } KviKvsMdmListView::~KviKvsMdmListView() diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp index 605fcee..a4dba4c 100644 --- a/src/modules/objects/class_listviewitem.cpp +++ b/src/modules/objects/class_listviewitem.cpp @@ -62,7 +62,7 @@ Pixmap can be a Kvirc imageid, an image file or a [class]pixmap[/class] object. !fn: $setRenameEnabled(<col:integer>,<bEnabled:boolean>) - If b is TRUE (1), this item can be in-place renamed in the column col by the user; otherwise it cannot be renamed in-place. + If b is true, this item can be in-place renamed in the column col by the user; otherwise it cannot be renamed in-place. !fn: $setEnabled(<bEnabled:boolean>) Enables or disables the item diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp index 674575e..bd0dd25 100644 --- a/src/modules/objects/class_mainwindow.cpp +++ b/src/modules/objects/class_mainwindow.cpp @@ -93,7 +93,7 @@ bool KviKvsObject_mainwindow::functionsetCentralWidget(KviKvsObjectFunctionCall if(!pObject->object()->inherits("KviKvsObject_widget")) { c->warning(__tr2qs("Widget object required")); - return TRUE; + return true; } if(widget()) ((KviTalMainWindow *)widget())->setCentralWidget(((TQWidget *)(pObject->object()))); return true; diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index 9ee232b..ac8ce39 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -106,9 +106,9 @@ static int mod_cod[] = { Sets the editor to be read-only if bReadOnly is 1 or removes the read-only status is ReadOnly is 0 !fn: <boolean> $atBeginning() - Returns 1(TRUE) if the cursor is placed at the beginning of the text; otherwise returns 0(FALSE). + Returns true if the cursor is placed at the beginning of the text; otherwise returns false. !fn: <boolean> $atEnd() - Returns 1(TRUE) if the cursor is placed at the end of the text; otherwise returns 0(FALSE). + Returns true if the cursor is placed at the end of the text; otherwise returns false. !fn: $setWordWrap(<wrap_mode:string>) Sets the word wrap mode to mode. Valid Values are:[br] - NoWrap - Do not wrap the text.[br] @@ -144,11 +144,11 @@ static int mod_cod[] = { !fn: $setUnderline(<bUnderline:boolean>) If the bool value is 1 sets the current format to underline; otherwise, if it's 0 sets the current format to no-underline. !fn: <boolean> $italic() - Returns 1(TRUE) if the current format is italic; otherwise returns 0(FALSE). + Returns true if the current format is italic; otherwise returns false. !fn: <boolean> $bold() - Returns 1(TRUE) if the current format is bold; otherwise returns 0(FALSE). + Returns true if the current format is bold; otherwise returns false. !fn: <boolean> $underline() - Returns 1(TRUE) if the current format is underline; otherwise returns 0(FALSE). + Returns true if the current format is underline; otherwise returns false. !fn: $zoomIn(<zoom_range:integer>) Zooms in on the text by making the base font size range points larger. !fn: $zoomOut(<zoom_range:integer>) @@ -166,7 +166,7 @@ static int mod_cod[] = { !fn: $setUndoDepth(<undo_depth:integer>) Sets the depth of the undo history to x. !fn: <boolean> $isUndoRedoEnabled() - Returns 1 (TRUE) if undo/redo is enabled; otherwise returns 0 (FALSE). + Returns true if undo/redo is enabled; otherwise returns false. !fn: <integer> $undoDepth() Returns the depth of the undo history. !fn: $indent() @@ -188,7 +188,7 @@ static int mod_cod[] = { - array(red:integer,green:integer,blue:integer) - red:integer,green:integer,blue:integer. !fn: $setModified(<bModified:boolean>) - Sets whether the document has been modified by the user. Valid Values are 1(TRUE) or 0(FALSE) + Sets whether the document has been modified by the user. Valid Values are true or false !fn: $insertParagraph(<text:string>,<paragraph:integer>) Inserts text as a new paragraph at position <paragraph>. !fn: $removeParagraph(<paragraph:integer>) @@ -210,9 +210,9 @@ static int mod_cod[] = { !fn: $loadFile(<path:string>) Load the file specified in the <path>, also html files. !fn: <boolean> $isUndoAvailable () - Returns 1(TRUE) if undo is available; otherwise returns 0(FALSE). + Returns true if undo is available; otherwise returns false. !fn: <boolean> $isRedoAvailable () - Returns 1(TRUE) if redo is available; otherwise returns 0(FALSE). + Returns true if redo is available; otherwise returns false. !fn: $setAlignment(<alignment:string>) Sets the alignment of the current paragraph to <alignment>. Valid values are:[br] - AlignAuto - Aligns according to the language.[br] diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 3627b9e..b2f76a6 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -500,12 +500,12 @@ bool KviKvsObject_painter::functionSetFont(KviKvsObjectFunctionCall *c) TQFont font=m_pPainter->font(); font.setFamily(szFamily); font.setPointSize(uSize); - if(KviTQString::equalCI(szStyle,"italic")) font.setItalic(TRUE); - if(KviTQString::equalCI(szStyle,"bold")) font.setBold(TRUE); - if(KviTQString::equalCI(szStyle,"underline"))font.setUnderline(TRUE); - if(KviTQString::equalCI(szStyle,"overline")) font.setOverline(TRUE); - if(KviTQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(TRUE); - if(KviTQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(TRUE); + if(KviTQString::equalCI(szStyle,"italic")) font.setItalic(true); + if(KviTQString::equalCI(szStyle,"bold")) font.setBold(true); + if(KviTQString::equalCI(szStyle,"underline"))font.setUnderline(true); + if(KviTQString::equalCI(szStyle,"overline")) font.setOverline(true); + if(KviTQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(true); + if(KviTQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(true); m_pPainter->setFont(font); return true; } diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 3c4cc75..3216300 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -233,7 +233,7 @@ bool KviKvsObject_popupmenu::functioninsertWidget(KviKvsObjectFunctionCall *c) if(!pObject->object()->isWidgetType()) { c->warning(__tr2qs("Can't add a non-widget object")); - return TRUE; + return true; } if (widget()) ((KviTalPopupMenu *)widget())->insertItem(((KviTalPopupMenu *)(pObject->object()))); return true; @@ -252,7 +252,7 @@ bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c) if(!ob->object()->inherits("KviKvsObject_popupmenu")) { c->warning(__tr2qs("Can't add a non - popupmenu object")); - return TRUE; + return true; } if(!widget())return true; TQPixmap *pix = 0; diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index 256c821..2ffdadb 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -141,7 +141,7 @@ !fn: <boolean> $isRunning() Return 1 if the process is running, else return 0. !fn: <boolean> $normalExit() - Returns TRUE if the process has exited normally; otherwise returns FALSE. + Returns true if the process has exited normally; otherwise returns false. !fn: $readyReadStdoutEvent() This function is invoched by the process when there are new datas.[br] The default implementation emits the [classfnc]$readyReadStdout[/classfnc]() signal. diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index 85bc9ec..b068b38 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -45,7 +45,7 @@ !fn: $settext(<text:string>) Sets the text that will appear in the radiobutton. !fn: <boolean> $isChecked() - Returns 1 (TRUE) if the radio button is checked; otherwise returns 0 (FALSE). + Returns true if the radio button is checked; otherwise returns false. !fn: $setChecked(<bChecked:boolean>) Sets whether the radio button is checked to check. !fn: $setPixmap(<image_id>) diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index 385c184..d40edf6 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -137,7 +137,7 @@ bool KviKvsObject_toolbar::functionsetStretchableWidget(KviKvsObjectFunctionCall if(!ob->object()->inherits("KviKvsObject_widget")) { c->warning(__tr2qs("Widget object required")); - return TRUE; + return true; } if(widget()) ((KviTalToolBar *)widget())->setStretchableWidget(((TQWidget *)(ob->object()))); return true; diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index f7fc1f4..8ff37ea 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -55,7 +55,7 @@ !fn:$usesTextLabel() Return 1 if the setUsesTextLabel is enabled, otherwise return 0. !fn:$setTextLabel(<text:String>,[tooltip:string]) - Sets the label of this button to <text> and automatically sets it as a tool tip if <tip> is TRUE. + Sets the label of this button to <text> and automatically sets it as a tool tip if <tip> is true. !fn:<string> $textLabel() Returns the label of tthe button. !fn:$setAutoRaise(<bAutoraise:boolean>) @@ -265,7 +265,7 @@ bool KviKvsObject_toolbutton::functionsetPopup(KviKvsObjectFunctionCall *c) if(!ob->object()->inherits("KviKvsObject_popupmenu")) { c->warning(__tr2qs("Can't add a non - popupmenu object")); - return TRUE; + return true; } if(widget()) ((TQToolButton *)widget())->setPopup(((KviTalPopupMenu *)(ob->object()))); diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index a5da660..f3b11d2 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -110,7 +110,7 @@ const int widgettypes_cod[] = { See also [classfnc]$show[/classfnc]() and [classfnc]$isVisible[/classfnc]. !fn: $repaint(<bool erase>) Repaints the widget directly by calling [classfnc]$paintEvent[/classfnc]() immediately.[br] - If erase is TRUE, erases the widget before the $paintEvent() call. + If erase is true, erases the widget before the $paintEvent() call. !fn: $x() Returns the x coordinate of the upper-left corner of this widget relative to the parent widget, @@ -1514,12 +1514,12 @@ bool KviKvsObject_widget::function_setFont(KviKvsObjectFunctionCall *c) TQFont font=widget()->font(); font.setFamily(szFamily); font.setPointSize(uSize); - if(KviTQString::equalCI(szStyle,"italic")) font.setItalic(TRUE); - else if(KviTQString::equalCI(szStyle,"bold")) font.setBold(TRUE); - else if(KviTQString::equalCI(szStyle,"underline"))font.setUnderline(TRUE); - else if(KviTQString::equalCI(szStyle,"overline")) font.setOverline(TRUE); - else if(KviTQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(TRUE); - else if(KviTQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(TRUE); + if(KviTQString::equalCI(szStyle,"italic")) font.setItalic(true); + else if(KviTQString::equalCI(szStyle,"bold")) font.setBold(true); + else if(KviTQString::equalCI(szStyle,"underline"))font.setUnderline(true); + else if(KviTQString::equalCI(szStyle,"overline")) font.setOverline(true); + else if(KviTQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(true); + else if(KviTQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(true); else c->warning(__tr2qs("Unknown style '%Q'"),&szStyle); widget()->setFont(font); return true; diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp index 98f0a2f..38ad499 100644 --- a/src/modules/objects/class_workspace.cpp +++ b/src/modules/objects/class_workspace.cpp @@ -51,7 +51,7 @@ !fn: <object> $activeWindow() Returns the active window, or 0 if no window is active. !fn: <boolean> $scrollBarsEnabled() - Returns TRUE if the workspace provides scrollbars; otherwise returns FALSE. + Returns true if the workspace provides scrollbars; otherwise returns false. !fn: $setscrollBarsEnabled(<bEnabled:boolean>) Sets whether the workspace provides scrollbars to enable. (bEnabled 1 or 0) !fn: $cascade() diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index ea27a76..bdca209 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -226,7 +226,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c) // a trick for the dialog covering the splash screen before the time (this is prolly a WM or TQt bug) if(g_pSplashScreen) { - if(g_pSplashScreen->isVisible()) // another bug: this ALWAYS RETURNS TRUE, even if the splash was hidden by a mouse click... + if(g_pSplashScreen->isVisible()) // another bug: this always returns true, even if the splash was hidden by a mouse click... { TQObject::connect(g_pSplashScreen,TQ_SIGNAL(destroyed()),wc,TQ_SLOT(show())); return true; diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h index 611ecf1..8c8a706 100644 --- a/src/modules/perlcore/ppport.h +++ b/src/modules/perlcore/ppport.h @@ -192,7 +192,7 @@ __DATA__ #endif /* PERL_REVISION != 5 */ #ifndef ERRSV -# define ERRSV perl_get_sv("@",FALSE) +# define ERRSV perl_get_sv("@",false) #endif #if (PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION <= 5)) @@ -376,7 +376,7 @@ SV *sv; start_subparse(0), # else /* 5.003_23 onwards */ - start_subparse(FALSE, 0), + start_subparse(false, 0), # endif #endif @@ -426,11 +426,11 @@ SV *sv; #if (PERL_VERSION < 4 || (PERL_VERSION == 4 && PERL_SUBVERSION < 68 )) /* Fetches the SV that keeps the per-interpreter data. */ #define dMY_CXT_SV \ - SV *my_cxt_sv = perl_get_sv(MY_CXT_KEY, FALSE) + SV *my_cxt_sv = perl_get_sv(MY_CXT_KEY, false) #else /* >= perl5.004_68 */ #define dMY_CXT_SV \ SV *my_cxt_sv = *hv_fetch(PL_modglobal, MY_CXT_KEY, \ - sizeof(MY_CXT_KEY)-1, TRUE) + sizeof(MY_CXT_KEY)-1, true) #endif /* < perl5.004_68 */ /* This declaration should be used within all functions that use the diff --git a/src/modules/perlcore/typemap b/src/modules/perlcore/typemap index 1124eb6..8d2c796 100644 --- a/src/modules/perlcore/typemap +++ b/src/modules/perlcore/typemap @@ -282,7 +282,7 @@ T_STDIO { GV *gv = newGVgen("$Package"); PerlIO *fp = PerlIO_importFILE($var,0); - if ( fp && do_open(gv, "+<&", 3, FALSE, 0, 0, fp) ) + if ( fp && do_open(gv, "+<&", 3, false, 0, 0, fp) ) sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1))); else $arg = &PL_sv_undef; @@ -290,7 +290,7 @@ T_STDIO T_IN { GV *gv = newGVgen("$Package"); - if ( do_open(gv, "<&", 2, FALSE, 0, 0, $var) ) + if ( do_open(gv, "<&", 2, false, 0, 0, $var) ) sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1))); else $arg = &PL_sv_undef; @@ -298,7 +298,7 @@ T_IN T_INOUT { GV *gv = newGVgen("$Package"); - if ( do_open(gv, "+<&", 3, FALSE, 0, 0, $var) ) + if ( do_open(gv, "+<&", 3, false, 0, 0, $var) ) sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1))); else $arg = &PL_sv_undef; @@ -306,7 +306,7 @@ T_INOUT T_OUT { GV *gv = newGVgen("$Package"); - if ( do_open(gv, "+>&", 3, FALSE, 0, 0, $var) ) + if ( do_open(gv, "+>&", 3, false, 0, 0, $var) ) sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1))); else $arg = &PL_sv_undef; diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index d0eee4a..876740d 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -178,7 +178,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par) m_pListView->setAllColumnsShowFocus(true); m_pListView->setSelectionMode(KviTalListView::Extended); - m_pListView->setRootIsDecorated(TRUE); + m_pListView->setRootIsDecorated(true); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pListView,__tr2qs("<center>This is the list of registered users. " \ @@ -463,7 +463,7 @@ void KviRegisteredUsersDialog::fillList() { KviRegisteredUsersGroupItem* pCur = new KviRegisteredUsersGroupItem(m_pListView,g); groupItems.insert(g->name(),pCur); - pCur->setOpen(TRUE); + pCur->setOpen(true); } KviPointerHashTable<TQString,KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict(); diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index f77a435..fa453b0 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -75,7 +75,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere setCaption(__tr2qs("User Registration Wizard - KVIrc")); setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINUX))); - setSizeGripEnabled( TRUE ); + setSizeGripEnabled( true ); m_pPage1 = new TQWidget(this); m_pPage1Layout = new TQGridLayout(m_pPage1); diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp index 0fc0495..33184cc 100644 --- a/src/modules/setup/libkvisetup.cpp +++ b/src/modules/setup/libkvisetup.cpp @@ -118,14 +118,14 @@ KVIMODULEEXPORTFUNC void setup_finish() pParams->append(szUrl); KviKvsScript::run("openurl $0",g_pActiveWindow,pParams); delete pParams; - KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = TRUE; + KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = true; } else if(!szHost.isEmpty()) { KviKvsVariantList * pParams = new KviKvsVariantList(); pParams->append(szHost); pParams->append((kvs_int_t)uPort); KviKvsScript::run("server $0 $1",g_pActiveWindow,pParams); delete pParams; - KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = TRUE; + KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = true; } } } diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 207704c..b08de95 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -300,7 +300,7 @@ KviSetupWizard::KviSetupWizard() #endif // Pragma: Unused, takes only space. //m_pDirRestore = new TQRadioButton(__tr2qs("Restore from backup archive"),m_pDirButtonGroup); - //m_pDirRestore->setEnabled(FALSE); + //m_pDirRestore->setEnabled(false); //l = new TQLabel(m_pDirectory->m_pVBox,"<b> </b>"); @@ -538,9 +538,9 @@ KviSetupWizard::KviSetupWizard() */ /* m_pServersLoadConfig = new TQRadioButton(__tr2qs("Use server config"),m_pServersButtonGroup); - m_pServersLoadConfig->setEnabled(FALSE); + m_pServersLoadConfig->setEnabled(false); m_pServerConfigSelector = new KviFileSelector(m_pServersButtonGroup,__tr2qs("Config file:"),&m_szServerConfigFile,true); - m_pServerConfigSelector->setEnabled(FALSE); + m_pServerConfigSelector->setEnabled(false); */ /* m_pServersChooseFromList->toggle(); @@ -557,7 +557,7 @@ KviSetupWizard::KviSetupWizard() { KviConfig cfg(szTmp,KviConfig::Read); cfg.setGroup("Setup"); - if(cfg.readBoolEntry("hideServerList",FALSE)) + if(cfg.readBoolEntry("hideServerList",false)) { //setPageEnabled(m_pServers,false); //setFinishEnabled(m_pIdentity,true); @@ -1095,12 +1095,12 @@ void KviSetupWizard::accept() if(m_pServersSpecifyManually->isOn()) { - KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = FALSE; + KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = false; szHost = m_szServerHost; uPort=m_uServerPort; } else if(m_pServersOpenIrcUrl->isOn()) { - KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = FALSE; + KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = false; szUrl=m_szServerUrl; } */ diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 255e5dd..d508ed3 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -629,7 +629,7 @@ static bool snd_kvs_cmd_mute(KviKvsModuleCommandCall * c) { KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_END(c) - g_pSoundPlayer->setMuted(TRUE); + g_pSoundPlayer->setMuted(true); return true; } @@ -651,7 +651,7 @@ static bool snd_kvs_cmd_unmute(KviKvsModuleCommandCall * c) { KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_END(c) - g_pSoundPlayer->setMuted(FALSE); + g_pSoundPlayer->setMuted(false); return true; } diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp index 1ffd120..4d5c72d 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -114,7 +114,7 @@ KviKTorrentDCOPInterface::KviKTorrentDCOPInterface() TQTimer *timer = new TQTimer(this); connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimer())); - timer->start(250, FALSE); + timer->start(250, false); // make sure we have a list of files, // otherwise functions dealing would diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp index 79ae46d..88e84c5 100644 --- a/src/modules/torrent/tc_statusbarapplet.cpp +++ b/src/modules/torrent/tc_statusbarapplet.cpp @@ -9,7 +9,7 @@ KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *parent, KviSt { TQTimer *timer = new TQTimer(this); connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(update())); - timer->start(250, FALSE); + timer->start(250, false); // updateDisplay(); // setText("torrent client"); |