diff options
105 files changed, 405 insertions, 405 deletions
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 7e7c18b0..a52c2e52 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -112,7 +112,7 @@ static bool availForMod( const TQLineEdit * le ) { * name 'name' and widget flags set to 'f' * * The wizard will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal wizard. + * true to construct a modal wizard. */ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* name, bool modal, WFlags fl ) : CertificateWizard( parent, name, modal, fl ) diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h index 844f39ed..d5430005 100644 --- a/certmanager/certificatewizardimpl.h +++ b/certmanager/certificatewizardimpl.h @@ -52,7 +52,7 @@ class CertificateWizardImpl : public CertificateWizard public: - CertificateWizardImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CertificateWizardImpl( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CertificateWizardImpl(); bool sendToCA() const; diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h index 82cab607..9b281101 100644 --- a/certmanager/lib/cryptplug.h +++ b/certmanager/lib/cryptplug.h @@ -418,12 +418,12 @@ bool hasFeature( ::Feature ); and/or encrypted content (or to build a text frame around your flat non-MIME message body, resp.) - <b>If</b> value returned in \c makeMimeObject is <b>TRUE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>true</b> the text strings returned in \c contentTypeMain and \c contentDispMain and \c contentTEncMain (and, if required, \c content[..]Version and \c bodyTextVersion and \c content[..]Sig) should be used to compose a respective MIME object.<br> - If <b>FALSE</b> the texts returned in \c flatTextPrefix and + If <b>false</b> the texts returned in \c flatTextPrefix and \c flatTextSeparator and \c flatTextPostfix are to be used instead.<br> Allways <b>either</b> the \c content[..] and \c bodyTextVersion parameters <b>or</b> the \c flatText[..] parameters are holding @@ -451,16 +451,16 @@ bool hasFeature( ::Feature ); you could report the missing MIME header information to the address returned by the \c bugURL() function. - If \c makeMultiMime returns FALSE the \c contentTypeMain returned must + If \c makeMultiMime returns false the \c contentTypeMain returned must not be altered but used to specify a single part mime object holding the code bloc, e.g. this is used for 'enveloped-data' single part MIME objects. In this case you should ignore both the \c content[..]Version and \c content[..]Code parameters. - If \c makeMultiMime returns TRUE also the following rules apply: - \li If \c includeCleartext is TRUE you should include the cleartext - as first part of our multipart MIME object, typically this is TRUE - when signing mails but FALSE when encrypting. + If \c makeMultiMime returns true also the following rules apply: + \li If \c includeCleartext is true you should include the cleartext + as first part of our multipart MIME object, typically this is true + when signing mails but false when encrypting. \li The \c contentTypeMain returned typically starts with "multipart/" while providing a "protocol" and a "micalg" parameter: just add an appropriate \c "; boundary=[your \c boundary \c string]" to get @@ -486,16 +486,16 @@ bool hasFeature( ::Feature ); unaltered value to specify the Content-Transfer-Encoding header of the respective MIME part. - <b>If</b> value returned in \c makeMimeObject is <b>FALSE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>false</b> the text strings returned in \c flatTextPrefix and \c flatTextPostfix should be used to build a frame around the cleartext and the code bloc holding the signature (or - in case of encrypting - the encoded data bloc, resp.).<br> - If \c includeCleartext is TRUE this frame should also include the + If \c includeCleartext is true this frame should also include the cleartext as first bloc, this bloc should be divided from the code bloc by the contents of \c flatTextSeparator - typically this is used for signing but not when encrypting.<br> - If \c includeCleartext is FALSE you should ignore both the cleartext + If \c includeCleartext is false you should ignore both the cleartext and the \c flatTextSeparator parameter. <b>How to use StructuringInfo data in your program:</b> @@ -624,48 +624,48 @@ struct StructuringInfo { MIME object (or - for non-MIME messages - as flat text to be set before the ciphertext, resp.), typically this - is TRUE when signing mails but FALSE + is true when signing mails but false when encrypting<br> (this parameter is relevant no matter - whether \c makeMimeObject is TRUE or - FALSE) */ + whether \c makeMimeObject is true or + false) */ bool makeMimeObject; /*!< specifies whether we should create a MIME object or a flat text message body */ /* the following are used for MIME messages only */ bool makeMultiMime; /*!< specifies whether we should create a 'Multipart' MIME object or a single part - object, if FALSE only \c contentTypeMain, + object, if false only \c contentTypeMain, \c contentDispMain and \c contentTEncMain may be used and all other parameters have to be ignored<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentTypeMain; /*!< value of the main 'Content-Type' header<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentDispMain; /*!< value of the main 'Content-Disposition' header<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentTEncMain; /*!< value of the main 'Content-TransferEncoding' header<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentTypeVersion; /*!< 'Content-Type' of the additional version part that might preceed the code part - if NULL or zero length no version part must be created<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE) */ + is false) */ char* contentDispVersion; /*!< 'Content-Disposition' of the additional preceeding the code part (only valid if \c contentTypeVersion holds a non-zero-length string)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeVersion does + is false or if \c contentTypeVersion does not return a non-zero-length string) */ char* contentTEncVersion; /*!< 'Content-Transfer-Encoding' of the additional version part (only valid if @@ -673,47 +673,47 @@ struct StructuringInfo { non-zero-length string)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeVersion does + is false or if \c contentTypeVersion does not return a non-zero-length string) */ char* bodyTextVersion; /*!< body text of the additional version part (only valid if \c contentTypeVersion holds a non-zero-length string)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeVersion does + is false or if \c contentTypeVersion does not return a non-zero-length string) */ char* contentTypeCode; /*!< 'Content-Type' of the code part holding the signature code (or the encrypted data, resp.)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE) */ + is false) */ char* contentDispCode; /*!< 'Content-Disposition' of the code part<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeCode does + is false or if \c contentTypeCode does not return a non-zero-length string) */ char* contentTEncCode; /*!< 'Content-Type' of the code part<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeCode does + is false or if \c contentTypeCode does not return a non-zero-length string) */ /* the following are used for flat non-MIME messages only */ char* flatTextPrefix; /*!< text to preceed the main text (or the code bloc containing the encrypted main text, resp.)<br> (ignore this parameter if - \c makeMimeObject is TRUE) */ + \c makeMimeObject is true) */ char* flatTextSeparator; /*!< text to be put between the main text and the signature code bloc (not used when encrypting)<br> (ignore this parameter if - \c makeMimeObject is TRUE or if - \c includeCleartext is FALSE) */ + \c makeMimeObject is true or if + \c includeCleartext is false) */ char* flatTextPostfix; /*!< text to follow the signature code bloc (or the encrypted data bloc, resp.)<br> (ignore this parameter if - \c makeMimeObject is TRUE) */ + \c makeMimeObject is true) */ }; diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index 7397e423..41a9fc2b 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -240,12 +240,12 @@ class CryptPlugWrapper; any of it's members - just ignore the advise given in the cryptplug.h documentation! - <b>If</b> value returned in \c makeMimeObject is <b>TRUE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>true</b> the text strings returned in \c contentTypeMain and \c contentDispMain and \c contentTEncMain (and, if required, \c content[..]Version and \c bodyTextVersion and \c content[..]Sig) should be used to compose a respective MIME object.<br> - If <b>FALSE</b> the texts returned in \c flatTextPrefix and + If <b>false</b> the texts returned in \c flatTextPrefix and \c flatTextSeparator and \c flatTextPostfix are to be used instead.<br> Always <b>either</b> the \c content[..] and \c bodyTextVersion parameters <b>or</b> the \c flatText[..] parameters are holding @@ -273,16 +273,16 @@ class CryptPlugWrapper; you could report the missing MIME header information to the address returned by the \c bugURL() function. - If \c makeMultiMime returns FALSE the \c contentTypeMain returned must + If \c makeMultiMime returns false the \c contentTypeMain returned must not be altered but used to specify a single part mime object holding the code bloc, e.g. this is used for 'enveloped-data' single part MIME objects. In this case you should ignore both the \c content[..]Version and \c content[..]Code parameters. - If \c makeMultiMime returns TRUE also the following rules apply: - \li If \c includeCleartext is TRUE you should include the cleartext - as first part of our multipart MIME object, typically this is TRUE - when signing mails but FALSE when encrypting. + If \c makeMultiMime returns true also the following rules apply: + \li If \c includeCleartext is true you should include the cleartext + as first part of our multipart MIME object, typically this is true + when signing mails but false when encrypting. \li The \c contentTypeMain returned typically starts with "multipart/" while providing a "protocol" and a "micalg" parameter: just add an appropriate \c "; boundary=[your \c boundary \c string]" to get @@ -308,16 +308,16 @@ class CryptPlugWrapper; unaltered value to specify the Content-Transfer-Encoding header of the respective MIME part. - <b>If</b> value returned in \c makeMimeObject is <b>FALSE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>false</b> the text strings returned in \c flatTextPrefix and \c flatTextPostfix should be used to build a frame around the cleartext and the code bloc holding the signature (or - in case of encrypting - the encoded data bloc, resp.).<br> - If \c includeCleartext is TRUE this frame should also include the + If \c includeCleartext is true this frame should also include the cleartext as first bloc, this bloc should be divided from the code bloc by the contents of \c flatTextSeparator - typically this is used for signing but not when encrypting.<br> - If \c includeCleartext is FALSE you should ignore both the cleartext + If \c includeCleartext is false you should ignore both the cleartext and the \c flatTextSeparator parameter. <b>How to use StructuringInfoWrapper data in your program:</b> diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp index c969e875..ed1a3317 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp @@ -44,7 +44,7 @@ * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddDirectoryServiceDialog( parent, name, modal, fl ) diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h index c422c3a4..bc6af010 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h @@ -40,7 +40,7 @@ class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog public: - AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddDirectoryServiceDialogImpl(); }; diff --git a/kandy/src/cmdpropertiesdialog.cpp b/kandy/src/cmdpropertiesdialog.cpp index 9d605fda..7b4b2c71 100644 --- a/kandy/src/cmdpropertiesdialog.cpp +++ b/kandy/src/cmdpropertiesdialog.cpp @@ -60,7 +60,7 @@ class ParameterItem : public TQCheckListItem { * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ CmdPropertiesDialog::CmdPropertiesDialog(ATCommand *cmd, TQWidget* parent, const char* name, bool modal, diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp index 3816ab41..1ba89cdd 100644 --- a/kandy/src/mobilegui.cpp +++ b/kandy/src/mobilegui.cpp @@ -180,7 +180,7 @@ class PhoneBookItem : public TQCheckListItem * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ MobileGui::MobileGui( CommandScheduler *scheduler, KandyPrefs *kprefs, TQWidget* parent, const char* name, WFlags fl ) : diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 3a9ed1a0..ad1b252c 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -295,7 +295,7 @@ public: class TQSplitterData { public: - TQSplitterData() : opaque( FALSE ), firstShow( TRUE ) {} + TQSplitterData() : opaque( false ), firstShow( true ) {} TQPtrList<TQSplitterLayoutStruct> list; bool opaque; @@ -340,7 +340,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i that a widget should keep its size when the splitter is resized. Although KDGanttMinimizeSplitter normally resizes the children only - at the end of a resize operation, if you call setOpaqueResize( TRUE + at the end of a resize operation, if you call setOpaqueResize( true ) the widgets are resized as often as possible. The initial distribution of size between the widgets is determined @@ -404,7 +404,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQt::Orientation o, TQWidget * */ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter() { - data->list.setAutoDelete( TRUE ); + data->list.setAutoDelete( true ); delete data; } @@ -458,11 +458,11 @@ void KDGanttMinimizeSplitter::resizeEvent( TQResizeEvent * ) /* Inserts the widget \a w at the end (or at the beginning if \a first - is TRUE) of the splitter's list of widgets. + is true) of the splitter's list of widgets. It is the responsibility of the caller of this function to make sure that \a w is not already in the splitter and to call recalcId if - needed. (If \a first is TRUE, then recalcId is very probably + needed. (If \a first is true, then recalcId is very probably needed.) */ TQSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool first ) @@ -477,7 +477,7 @@ TQSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fi newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() ); s->wid = newHandle; newHandle->setId(data->list.count()); - s->isSplitter = TRUE; + s->isSplitter = true; s->sizer = pick( newHandle->sizeHint() ); if ( first ) data->list.insert( 0, s ); @@ -491,7 +491,7 @@ TQSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fi s->sizer = pick( w->sizeHint() ); else s->sizer = pick( w->size() ); - s->isSplitter = FALSE; + s->isSplitter = false; if ( first ) data->list.insert( 0, s ); else @@ -585,7 +585,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e ) if ( e->type() == TQEvent::LayoutHint || ( e->type() == TQEvent::Show && data->firstShow ) ) { recalc( isVisible() ); if ( e->type() == TQEvent::Show ) - data->firstShow = FALSE; + data->firstShow = false; } return TQWidget::event( e ); } @@ -615,12 +615,12 @@ void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const { TQSplitterLayoutStruct *s = data->list.first(); - bool seen_w = FALSE; + bool seen_w = false; while ( s ) { if ( s->isSplitter && seen_w ) return data->list.at(); if ( !s->isSplitter && s->wid == w ) - seen_w = TRUE; + seen_w = true; s = data->list.next(); } return 0; @@ -696,11 +696,11 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) pos1 = pos2 + 1; } if ( upLeft ) { - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); moveBefore( pos2, id-1, upLeft ); } else { moveBefore( pos2, id-1, upLeft ); - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); } } else { int dd, newLeft, nextPos; @@ -715,7 +715,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) newLeft = pos-dd+1; nextPos = newLeft - 1; } - setG( w, newLeft, dd, TRUE ); + setG( w, newLeft, dd, true ); moveBefore( nextPos, id-1, upLeft ); } } @@ -749,11 +749,11 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) pos2 = pos + dd; } if ( upLeft ) { - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); moveAfter( pos2, id+1, upLeft ); } else { moveAfter( pos2, id+1, upLeft ); - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); } } else { int left = pick( w->pos() ); @@ -771,7 +771,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) newLeft = pos; nextPos = newLeft + dd; } - setG( w, newLeft, dd, TRUE ); + setG( w, newLeft, dd, true ); /*if( right != newRight )*/ moveAfter( nextPos, id+1, upLeft ); } @@ -884,23 +884,23 @@ void KDGanttMinimizeSplitter::doResize() } else if ( s->isSplitter ) { a[i].stretch = 0; a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer; - a[i].empty = FALSE; + a[i].empty = false; } else if ( s->mode == KeepSize ) { a[i].stretch = 0; a[i].minimumSize = pick( minSize(s->wid) ); a[i].sizeHint = s->sizer; a[i].maximumSize = pick( s->wid->maximumSize() ); - a[i].empty = FALSE; + a[i].empty = false; } else if ( s->mode == FollowSizeHint ) { a[i].stretch = 0; a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() ); a[i].maximumSize = pick( s->wid->maximumSize() ); - a[i].empty = FALSE; + a[i].empty = false; } else { //proportional a[i].stretch = s->sizer; a[i].maximumSize = pick( s->wid->maximumSize() ); a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) ); - a[i].empty = FALSE; + a[i].empty = false; } } @@ -922,7 +922,7 @@ void KDGanttMinimizeSplitter::recalc( bool update ) int maxt = TQWIDGETSIZE_MAX; int mint = fi; int n = data->list.count(); - bool first = TRUE; + bool first = true; /* The splitter before a hidden widget is always hidden. The splitter before the first visible widget is hidden. @@ -938,15 +938,15 @@ void KDGanttMinimizeSplitter::recalc( bool update ) else p->wid->show(); //may trigger new recalc if ( !s->wid->isHidden() ) - first = FALSE; + first = false; } } - bool empty=TRUE; + bool empty=true; for ( int j = 0; j< n; j++ ) { TQSplitterLayoutStruct *s = data->list.at(j); if ( !s->wid->isHidden() ) { - empty = FALSE; + empty = false; if ( s->isSplitter ) { minl += s->sizer; maxl += s->sizer; @@ -1003,13 +1003,13 @@ void KDGanttMinimizeSplitter::setResizeMode( TQWidget *w, ResizeMode mode ) } s = data->list.next(); } - s = addWidget( w, TRUE ); + s = addWidget( w, true ); s->mode = mode; } /*! - Returns TRUE if opaque resize is on; otherwise returns FALSE. + Returns true if opaque resize is on; otherwise returns false. \sa setOpaqueResize() */ @@ -1021,7 +1021,7 @@ bool KDGanttMinimizeSplitter::opaqueResize() const /*! - If \a on is TRUE then opaque resizing is turned on; otherwise + If \a on is true then opaque resizing is turned on; otherwise opaque resizing is turned off. Opaque resizing is initially turned off. @@ -1041,11 +1041,11 @@ void KDGanttMinimizeSplitter::setOpaqueResize( bool on ) void KDGanttMinimizeSplitter::moveToFirst( TQWidget *w ) { processChildEvents(); - bool found = FALSE; + bool found = false; TQSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->wid == w ) { - found = TRUE; + found = true; TQSplitterLayoutStruct *p = data->list.prev(); if ( p ) { // not already at first place data->list.take(); //take p @@ -1058,7 +1058,7 @@ void KDGanttMinimizeSplitter::moveToFirst( TQWidget *w ) s = data->list.next(); } if ( !found ) - addWidget( w, TRUE ); + addWidget( w, true ); recalcId(); } @@ -1070,11 +1070,11 @@ void KDGanttMinimizeSplitter::moveToFirst( TQWidget *w ) void KDGanttMinimizeSplitter::moveToLast( TQWidget *w ) { processChildEvents(); - bool found = FALSE; + bool found = false; TQSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->wid == w ) { - found = TRUE; + found = true; data->list.take(); // take s TQSplitterLayoutStruct *p = data->list.current(); if ( p ) { // the splitter handle after s @@ -1179,7 +1179,7 @@ void KDGanttMinimizeSplitter::storeSizes() #if 0 // ### remove this code ASAP /*! - Hides \a w if \a hide is TRUE and updates the splitter. + Hides \a w if \a hide is true and updates the splitter. \warning Due to a limitation in the current implementation, calling TQWidget::hide() will not work. @@ -1201,7 +1201,7 @@ void KDGanttMinimizeSplitter::setHidden( TQWidget *w, bool hide ) w->hide(); else w->show(); - recalc( TRUE ); + recalc( true ); } @@ -1219,7 +1219,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const else tqWarning( "KDGanttMinimizeSplitter::isHidden(), unknown widget" ); #endif - return FALSE; + return false; } #endif @@ -1358,12 +1358,12 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int sumStretch = 0; int spacerCount = 0; - bool wannaGrow = FALSE; // anyone who really wants to grow? - // bool canShrink = FALSE; // anyone who could be persuaded to shrink? + bool wannaGrow = false; // anyone who really wants to grow? + // bool canShrink = false; // anyone who could be persuaded to shrink? int i; for ( i = start; i < start + count; i++ ) { - chain[i].done = FALSE; + chain[i].done = false; cHint += chain[i].sizeHint; cMin += chain[i].minimumSize; cMax += chain[i].maximumSize; @@ -1380,7 +1380,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i // tqDebug("not enough space"); for ( i = start; i < start+count; i++ ) { chain[i].size = chain[i].minimumSize; - chain[i].done = TRUE; + chain[i].done = true; } } else if ( space < cHint + spacerCount*spacer ) { // Less space than sizeHint, but more than minimum. @@ -1393,7 +1393,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i for ( i = start; i < start+count; i++ ) { if ( !chain[i].done && chain[i].minimumSize >= chain[i].sizeHint) { chain[i].size = chain[i].sizeHint; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].sizeHint; // sumStretch -= chain[i].stretch; n--; @@ -1401,7 +1401,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i } bool finished = n == 0; while ( !finished ) { - finished = TRUE; + finished = true; fixed fp_over = toFixed( overdraft ); fixed fp_w = 0; @@ -1416,9 +1416,9 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i chain[i].size = chain[i].sizeHint - w; fp_w -= toFixed( w ); //give the difference to the next if ( chain[i].size < chain[i].minimumSize ) { - chain[i].done = TRUE; + chain[i].done = true; chain[i].size = chain[i].minimumSize; - finished = FALSE; + finished = false; overdraft -= chain[i].sizeHint - chain[i].minimumSize; // sumStretch -= chain[i].stretch; n--; @@ -1434,7 +1434,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i if ( !chain[i].done && (chain[i].maximumSize <= chain[i].sizeHint || wannaGrow && !chain[i].expansive) ) { chain[i].size = chain[i].sizeHint; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; @@ -1479,7 +1479,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i if ( !chain[i].done && chain[i].size < chain[i].sizeHint ) { chain[i].size = chain[i].sizeHint; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; @@ -1492,7 +1492,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i if ( !chain[i].done && chain[i].size > chain[i].maximumSize ) { chain[i].size = chain[i].maximumSize; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].maximumSize; sumStretch -= chain[i].stretch; n--; diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index 3dfa659a..628a9c6f 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -63,13 +63,13 @@ public: Direction minimizeDirection() const; virtual void setResizeMode( TQWidget *w, ResizeMode ); - virtual void setOpaqueResize( bool = TRUE ); + virtual void setOpaqueResize( bool = true ); bool opaqueResize() const; void moveToFirst( TQWidget * ); void moveToLast( TQWidget * ); - void refresh() { recalc( TRUE ); } + void refresh() { recalc( true ); } virtual TQSize sizeHint() const; virtual TQSize minimumSizeHint() const; @@ -95,15 +95,15 @@ protected: private: void init(); - void recalc( bool update = FALSE ); + void recalc( bool update = false ); void doResize(); void storeSizes(); void processChildEvents(); - TQSplitterLayoutStruct *addWidget( TQWidget*, bool first = FALSE ); + TQSplitterLayoutStruct *addWidget( TQWidget*, bool first = false ); void recalcId(); void moveBefore( int pos, int id, bool upLeft ); void moveAfter( int pos, int id, bool upLeft ); - void setG( TQWidget *w, int p, int s, bool isSplitter = FALSE ); + void setG( TQWidget *w, int p, int s, bool isSplitter = false ); TQCOORD pick( const TQPoint &p ) const { return orient == TQt::Horizontal ? p.x() : p.y(); } diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h index cd659d69..4e46984b 100644 --- a/kdgantt/qlayoutengine_p.h +++ b/kdgantt/qlayoutengine_p.h @@ -63,7 +63,7 @@ struct QLayoutStruct { void initParameters() { minimumSize = sizeHint = 0; - maximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; } + maximumSize = TQWIDGETSIZE_MAX; expansive = false; empty = true; } void init() { stretch = 0; initParameters(); } //permanent storage: int stretch; diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h index 31519117..edffac54 100644 --- a/kmail/accountmanager.h +++ b/kmail/accountmanager.h @@ -68,7 +68,7 @@ public: KMAccount* find( const uint id ) const; /** Physically remove account. Also deletes the given account object ! - Returns FALSE and does nothing if the account cannot be removed. */ + Returns false and does nothing if the account cannot be removed. */ bool remove( KMAccount* ); /** First account of the list */ diff --git a/kmail/callback.cpp b/kmail/callback.cpp index 66bcd12f..70020037 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -76,7 +76,7 @@ TQString Callback::askForTransport( bool nullIdentity ) const "Please select the transport which should be used to send your reply.</qt>"); bool ok; const TQString transport = KInputDialog::getItem( i18n( "Select Transport" ), text, - transports, defaultIndex, FALSE, &ok, kmkernel->mainWin() ); + transports, defaultIndex, false, &ok, kmkernel->mainWin() ); if ( !ok ) return TQString(); @@ -232,7 +232,7 @@ TQString Callback::receiver() const mReceiver = KInputDialog::getItem( i18n( "Select Address" ), selectMessage, - addrs+ccaddrs, defaultIndex, FALSE, &ok, kmkernel->mainWin() ); + addrs+ccaddrs, defaultIndex, false, &ok, kmkernel->mainWin() ); if( !ok ) mReceiver = TQString(); } diff --git a/kmail/composer.h b/kmail/composer.h index b02a2418..ba2ab035 100644 --- a/kmail/composer.h +++ b/kmail/composer.h @@ -83,7 +83,7 @@ namespace KMail { public: // kmkernel, callback /** * If this flag is set the message of the composer is deleted when - * the composer is closed and the message was not sent. Default: FALSE + * the composer is closed and the message was not sent. Default: false */ virtual void setAutoDelete( bool f ) = 0; diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index 13f2ba0f..87d63d00 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -208,7 +208,7 @@ public: Emits msgAdded signals */ void emitMsgAddedSignals(int idx); - /** Returns FALSE, if the message has to be retrieved from an IMAP account + /** Returns false, if the message has to be retrieved from an IMAP account * first. In this case this function does this and cares for the rest */ virtual bool canAddMsgNow(KMMessage* aMsg, int* aIndex_ret); @@ -310,14 +310,14 @@ public: on failure. */ virtual int rename(const TQString& newName, KMFolderDir *aParent = 0); - /** Returns TRUE if a table of contents file is automatically created. */ + /** Returns true if a table of contents file is automatically created. */ bool autoCreateIndex() const { return mAutoCreateIndex; } /** Allow/disallow automatic creation of a table of contents file. - Default is TRUE. */ + Default is true. */ virtual void setAutoCreateIndex(bool); - /** Returns TRUE if the table of contents is dirty. This happens when + /** Returns true if the table of contents is dirty. This happens when a message is deleted from the folder. The toc will then be re-created when the folder is closed. */ bool dirty() const { return mDirty; } @@ -325,7 +325,7 @@ public: /** Change the dirty flag. */ void setDirty(bool f); - /** Returns TRUE if the folder contains deleted messages */ + /** Returns true if the folder contains deleted messages */ bool needsCompacting() const { return needsCompact; } virtual void setNeedsCompacting(bool f) { needsCompact = f; } @@ -618,7 +618,7 @@ friend class KMMsgDict; bool mExportsSernums :1; /** if the index is dirty it will be recreated upon close() */ bool mDirty :1; - /** TRUE if the files of the folder are locked (writable) */ + /** true if the files of the folder are locked (writable) */ bool mFilesLocked :1; /** number of unread messages, -1 if not yet set */ diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index 3c97567f..8bb5f097 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -187,7 +187,7 @@ namespace KMail { void removeJob( TDEIO::Job* job ); /** - * Subscribe (@p subscribe = TRUE) / Unsubscribe the folder + * Subscribe (@p subscribe = true) / Unsubscribe the folder * identified by @p imapPath. * Emits subscriptionChanged signal on success. * Emits subscriptionChangeFailed signal when it fails. @@ -202,7 +202,7 @@ namespace KMail { bool locallySubscribedTo( const TQString& imapPath ); /** - * Locally subscribe (@p subscribe = TRUE) / Unsubscribe the folder + * Locally subscribe (@p subscribe = true) / Unsubscribe the folder * identified by @p imapPath. */ void changeLocalSubscription( const TQString& imapPath, bool subscribe ); diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index ce83bcb0..89d33dcc 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -132,7 +132,7 @@ public: virtual void setTrash(const TQString& aTrash) { mTrash = aTrash; } /** - * Process new mail for this account if one arrived. Returns TRUE if new + * Process new mail for this account if one arrived. Returns true if new * mail has been found. Whether the mail is automatically loaded to * an associated folder or not depends on the type of the account. */ diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index 6ee04967..72f7c183 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -161,7 +161,7 @@ void KMAcctImap::killAllJobs( bool disconnectSlave ) fld->quiet(false); fld->setContentState(KMFolderImap::imapNoInformation); fld->setSubfolderState(KMFolderImap::imapNoInformation); - fld->sendFolderComplete(FALSE); + fld->sendFolderComplete(false); fld->removeJobs(); } if ( (*it).progressItem ) @@ -264,7 +264,7 @@ void KMAcctImap::cancelMailCheck() // KMAccount::checkingMail() to be reset, in case we restart checking mail later. for( TQValueList<KMFolderImap*>::Iterator it = folderList.begin(); it != folderList.end(); ++it ) { KMFolderImap *fld = *it; - fld->sendFolderComplete(FALSE); + fld->sendFolderComplete(false); } } diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 4c873800..54d4bf14 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -762,7 +762,7 @@ private: /** Returns a popupmenu containing a hierarchy of folder names. Each item in the popupmenu is connected to a slot, if - move is TRUE this slot will cause all selected messages to + move is true this slot will cause all selected messages to be moved into the given folder, otherwise messages will be copied. Am empty KMMenuToFolder must be passed in. */ diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 942fc001..76f46060 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -157,8 +157,8 @@ public: // kmkernel, kmcommands, callback * Set the message the composer shall work with. This discards * previous messages without calling applyChanges() on them before. */ - void setMsg(KMMessage* newMsg, bool mayAutoSign=TRUE, - bool allowDecryption=FALSE, bool isModified=FALSE); + void setMsg(KMMessage* newMsg, bool mayAutoSign=true, + bool allowDecryption=false, bool isModified=false); void disableWordWrap(); @@ -215,7 +215,7 @@ private: public: // kmkernel, callback /** * If this flag is set the message of the composer is deleted when - * the composer is closed and the message was not sent. Default: FALSE + * the composer is closed and the message was not sent. Default: false */ inline void setAutoDelete(bool f) { mAutoDeleteMsg = f; } @@ -235,7 +235,7 @@ public: // kmkernel, kmcommand, mailserviceimpl /** * Recode to the specified charset */ - void setCharset(const TQCString& aCharset, bool forceDefault = FALSE); + void setCharset(const TQCString& aCharset, bool forceDefault = false); public: // kmcommand /** @@ -527,7 +527,7 @@ signals: private: /** * Applies the user changes to the message object of the composer - * and signs/encrypts the message if activated. Returns FALSE in + * and signs/encrypts the message if activated. Returns false in * case of an error (e.g. if PGP encryption fails). * Disables the controls of the composer window unless @dontDisable * is true. diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h index f0705b58..1242a1b3 100644 --- a/kmail/kmfilteraction.h +++ b/kmail/kmfilteraction.h @@ -107,7 +107,7 @@ public: quick test. Eg., actions that have a mail address as parameter shouldn't try real address validation, but only check if the string representation is empty. */ - virtual bool isEmpty() const { return FALSE; } + virtual bool isEmpty() const { return false; } /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ @@ -138,7 +138,7 @@ public: /** Called from the filter when a folder is removed. Tests if the folder @p aFolder is used and changes to @p aNewFolder in this - case. Returns TRUE if a change was made. */ + case. Returns true if a change was made. */ virtual bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder); /** Static function that creates a filter action of this type. */ @@ -431,7 +431,7 @@ public: /** Called from the filter when a folder is removed. Tests if the folder @p aFolder is used and changes to @p aNewFolder in this - case. Returns TRUE if a change was made. */ + case. Returns true if a change was made. */ virtual bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder); protected: diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h index 70288a3a..a6805172 100644 --- a/kmail/kmfiltermgr.h +++ b/kmail/kmfiltermgr.h @@ -50,7 +50,7 @@ public: void readConfig(void); /** Store filter rules in config file. */ - void writeConfig(bool withSync=TRUE); + void writeConfig(bool withSync=true); /** Open an edit dialog. If checkForEmptyFilterList is true, an empty filter is created to improve the visibility of the dialog in case no filter @@ -157,7 +157,7 @@ public: /** Called from the folder manager when a folder is removed. Tests if the folder aFolder is used in any action. Changes - to aNewFolder folder in this case. Returns TRUE if a change + to aNewFolder folder in this case. Returns true if a change occurred. */ bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder); diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index d6160880..e1178ee0 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -124,7 +124,7 @@ public: void setAcctList( AccountList* list ) { mAcctList = list; } AccountList* acctList() { return mAcctList; } - /** Returns TRUE if accounts are associated with this folder. */ + /** Returns true if accounts are associated with this folder. */ bool hasAccounts() const { return (mAcctList != 0); } /** This is used by the storage to read the folder specific configuration */ diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index 3b7bcc0a..f7acebf6 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -2695,7 +2695,7 @@ void KMFolderCachedImap::updateAnnotationFolderType() if ( ( newType != oldType || newSubType != oldSubType ) && changingTypeAllowed ) { mAnnotationFolderType = newType + ( newSubType.isEmpty() ? TQString() : "."+newSubType ); mAnnotationFolderTypeChanged = true; // force a "set annotation" on next sync - kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: '" << mAnnotationFolderType << "', was (" << oldType << " " << oldSubType << ") => mAnnotationFolderTypeChanged set to TRUE" << endl; + kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: '" << mAnnotationFolderType << "', was (" << oldType << " " << oldSubType << ") => mAnnotationFolderTypeChanged set to true" << endl; } // Ensure that further readConfig()s don't lose mAnnotationFolderType writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig(); diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 0ddcc5a5..ac008ee1 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -88,7 +88,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, const TQString& aName): KDialogBase( KDialogBase::Tabbed, aCap, KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, aParent, "KMFolderDialog", TRUE ), + KDialogBase::Ok, aParent, "KMFolderDialog", true ), mFolder( aFolder ), mFolderDir( aFolderDir ), mParentFolder( 0 ), diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index 541a8499..19baf48f 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -204,11 +204,11 @@ bool KMFolderDir::reload(void) dir.setFilter(TQDir::Files | TQDir::Dirs | TQDir::Hidden); dir.setNameFilter("*"); - if (!dir.cd(fldPath, TRUE)) + if (!dir.cd(fldPath, true)) { TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").arg(fldPath); KMessageBox::information(0, msg); - return FALSE; + return false; } TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList(); @@ -216,7 +216,7 @@ bool KMFolderDir::reload(void) { TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath); KMessageBox::information(0, msg); - return FALSE; + return false; } for (fileInfo=fiList->first(); fileInfo; fileInfo=fiList->next()) @@ -335,7 +335,7 @@ bool KMFolderDir::reload(void) addDirToParent( *it, folder ); } } - return TRUE; + return true; } diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index 30bd529c..18f1cbc5 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -42,7 +42,7 @@ public: /** URL of the node for visualization purposes. */ virtual TQString prettyURL() const; - /** Create a mail folder in this directory with given name. If sysFldr==TRUE + /** Create a mail folder in this directory with given name. If sysFldr==true the folder is marked as a (KMail) system folder. Returns Folder on success. */ virtual KMFolder* createFolder( const TQString& folderName, diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index 8ca73c29..12f2928e 100644 --- a/kmail/kmfolderimap.h +++ b/kmail/kmfolderimap.h @@ -125,8 +125,8 @@ public: KMAcctImap* account() const; /** Remove (first occurrence of) given message from the folder. */ - virtual void removeMsg(int i, bool quiet = FALSE); - virtual void removeMsg(const TQPtrList<KMMessage>& msgList, bool quiet = FALSE); + virtual void removeMsg(int i, bool quiet = false); + virtual void removeMsg(const TQPtrList<KMMessage>& msgList, bool quiet = false); virtual int rename( const TQString& newName, KMFolderDir *aParent = 0 ); @@ -152,12 +152,12 @@ public: /** * Retrieve all mails in a folder */ - void getFolder(bool force = FALSE); + void getFolder(bool force = false); /** * same as above but also checks for new mails */ - void getAndCheckFolder(bool force = FALSE); + void getAndCheckFolder(bool force = false); /** * Get the whole message @@ -380,7 +380,7 @@ public slots: * Convert IMAP flags to a message status * @param newMsg specifies whether unseen messages are new or unread */ - static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 ); + static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = true, int supportedFalgs = 31 ); /** * Convert IMAP seen flag to a message status. diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index 194d5c97..1f4fb1b5 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -108,7 +108,7 @@ protected: failure. */ virtual int createIndexFromContents() = 0; - bool updateIndexStreamPtr(bool just_close=FALSE); + bool updateIndexStreamPtr(bool just_close=false); /** Inserts messages into the message dictionary by iterating over the * message list. The messages will get new serial numbers. This is only diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h index 85109490..83aced18 100644 --- a/kmail/kmfoldermaildir.h +++ b/kmail/kmfoldermaildir.h @@ -52,8 +52,8 @@ public: virtual int addMsg(KMMessage* msg, int* index_return = 0); /** Remove (first occurrence of) given message from the folder. */ - virtual void removeMsg(int i, bool imapQuiet = FALSE); - virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE) + virtual void removeMsg(int i, bool imapQuiet = false); + virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = false) { return KMFolderIndex::removeMsg(msgList, imapQuiet); } // Called by KMMsgBase::setStatus when status of a message has changed @@ -74,7 +74,7 @@ public: /** fsync buffers to disk */ virtual void sync(); - /** Close folder. If force is TRUE the files are closed even if + /** Close folder. If force is true the files are closed even if others still use it (e.g. other mail reader windows). */ virtual void reallyDoClose(const char *owner); diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h index 517d5f19..38348a15 100644 --- a/kmail/kmfoldermbox.h +++ b/kmail/kmfoldermbox.h @@ -149,7 +149,7 @@ protected: private: FILE *mStream; - bool mFilesLocked; // TRUE if the files of the folder are locked (writable) + bool mFilesLocked; // true if the files of the folder are locked (writable) bool mReadOnly; // true if locking failed LockType mLockType; TQString mProcmailLockFileName; diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index a0c4ee2c..3ff8f48b 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -44,7 +44,7 @@ KMFolderMgr::KMFolderMgr(const TQString& aBasePath, KMFolderDirType dirType): if ( dirType == KMStandardDir ) mDir.setBaseURL( I18N_NOOP("Local Folders") ); mQuiet = 0; - mChanged = FALSE; + mChanged = false; setBasePath(aBasePath); mRemoveOrig = 0; } @@ -439,7 +439,7 @@ KMFolderRootDir& KMFolderMgr::dir(void) //----------------------------------------------------------------------------- void KMFolderMgr::contentsChanged(void) { - if (mQuiet) mChanged = TRUE; + if (mQuiet) mChanged = true; else emit changed(); } @@ -535,7 +535,7 @@ void KMFolderMgr::quiet(bool beQuiet) { mQuiet = 0; if (mChanged) emit changed(); - mChanged = FALSE; + mChanged = false; } } } diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h index cfafc916..02304ba2 100644 --- a/kmail/kmfoldermgr.h +++ b/kmail/kmfoldermgr.h @@ -32,8 +32,8 @@ public: KMFolderRootDir& dir(); /** Searches folder and returns it. Skips directories - (objects of type KMFolderDir) if foldersOnly is TRUE. */ - virtual KMFolder* find(const TQString& folderName, bool foldersOnly=TRUE); + (objects of type KMFolderDir) if foldersOnly is true. */ + virtual KMFolder* find(const TQString& folderName, bool foldersOnly=true); /** Searches for a folder with the given id, recurses into directories */ virtual KMFolder* findIdString(const TQString& folderId, @@ -43,7 +43,7 @@ public: * created. Directories are skipped. * If an id is passed this searches for it */ - virtual KMFolder* findOrCreate(const TQString& folderName, bool sysFldr=TRUE, + virtual KMFolder* findOrCreate(const TQString& folderName, bool sysFldr=true, const uint id = 0); /** Searches folder by id and returns it. Skips directories @@ -59,7 +59,7 @@ public: /** Create a mail folder in the root folder directory dir() with given name. Returns Folder on success. */ - virtual KMFolder* createFolder(const TQString& fName, bool sysFldr=FALSE, + virtual KMFolder* createFolder(const TQString& fName, bool sysFldr=false, KMFolderType aFolderType=KMFolderTypeMbox, KMFolderDir *aFolderDir = 0); @@ -83,7 +83,7 @@ public: TQValueList<TQGuardedPtr<KMFolder> > *folders, KMFolderDir *adir, const TQString& prefix, - bool i18nized=FALSE ); + bool i18nized=false ); /** Create a list of formatted formatted folder labels and corresponding folders. The system folder names are translated */ diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index 29c0c8ab..d5306b76 100644 --- a/kmail/kmfoldersearch.cpp +++ b/kmail/kmfoldersearch.cpp @@ -381,7 +381,7 @@ KMFolderSearch::~KMFolderSearch() delete mSearch; mSearch = 0; if (mOpenCount > 0) - close("~foldersearch", TRUE); + close("~foldersearch", true); } void KMFolderSearch::setSearch(KMSearch *search) @@ -566,7 +566,7 @@ void KMFolderSearch::reallyDoClose(const char* owner) } mFolders.clear(); - clearIndex(TRUE); + clearIndex(true); if (mIdsStream) fclose(mIdsStream); @@ -779,8 +779,8 @@ int KMFolderSearch::writeIndex( bool ) if (fclose(tmpIndexStream) != 0) return errno; ::rename(TQFile::encodeName(tempName), TQFile::encodeName(indexLocation())); - mDirty = FALSE; - mUnlinked = FALSE; + mDirty = false; + mUnlinked = false; return 0; } diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index cc148f0f..ea3610bb 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -285,7 +285,7 @@ public: const KURL &messageFile, const KURL::List &attach, const QCStringList &customHeaders); void byteArrayToRemoteFile(const TQByteArray&, const KURL&, - bool overwrite = FALSE); + bool overwrite = false); bool folderIsDraftOrOutbox( const KMFolder * ); bool folderIsDrafts( const KMFolder * ); bool folderIsTemplates( const KMFolder * ); diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index dfe96116..a96470df 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -114,7 +114,7 @@ public: KMMsgBase & toMsgBase() { return *this; } const KMMsgBase & toMsgBase() const { return *this; } - /** Returns TRUE if object is a real message (not KMMsgInfo or KMMsgBase) */ + /** Returns true if object is a real message (not KMMsgInfo or KMMsgBase) */ bool isMessage() const; /** @return whether the priority: or x-priority headers indicate @@ -130,7 +130,7 @@ public: */ void setUnencryptedMsg( KMMessage* unencrypted ); - /** Returns TRUE if the message contains an unencrypted copy of itself. */ + /** Returns true if the message contains an unencrypted copy of itself. */ bool hasUnencryptedMsg() const { return 0 != mUnencryptedMsg; } /** Returns an unencrypted copy of this message or 0 if none exists. */ @@ -713,7 +713,7 @@ public: bool removeLineBreaks = false ); /** Converts the email address(es) to (a) nice HTML mailto: anchor(s). - * If stripped is TRUE then the visible part of the anchor contains + * If stripped is true then the visible part of the anchor contains * only the name part and not the given emailAddr. */ static TQString emailAddrAsAnchor(const TQString& emailAddr, diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index 1137bb6e..9ed08445 100644 --- a/kmail/kmmsgbase.h +++ b/kmail/kmmsgbase.h @@ -163,55 +163,55 @@ public: /** Convert the given message status to a string. */ TQString statusToSortRank(); - /** Returns TRUE if object is a real message (not KMMsgInfo or KMMsgBase) */ + /** Returns true if object is a real message (not KMMsgInfo or KMMsgBase) */ virtual bool isMessage(void) const; - /** Returns TRUE if status unread. Note that new messages are not unread.*/ + /** Returns true if status unread. Note that new messages are not unread.*/ virtual bool isUnread(void) const; - /** Returns TRUE if status is new. */ + /** Returns true if status is new. */ virtual bool isNew(void) const; - /** Returns TRUE if status is unknown. */ + /** Returns true if status is unknown. */ virtual bool isOfUnknownStatus(void) const; - /** Returns TRUE if status is old. */ + /** Returns true if status is old. */ virtual bool isOld(void) const; - /** Returns TRUE if status is read. */ + /** Returns true if status is read. */ virtual bool isRead(void) const; - /** Returns TRUE if status is deleted. */ + /** Returns true if status is deleted. */ virtual bool isDeleted(void) const; - /** Returns TRUE if status is replied. */ + /** Returns true if status is replied. */ virtual bool isReplied(void) const; - /** Returns TRUE if status is forwarded. */ + /** Returns true if status is forwarded. */ virtual bool isForwarded(void) const; - /** Returns TRUE if status is queued. */ + /** Returns true if status is queued. */ virtual bool isQueued(void) const; - /** Returns TRUE if status is todo flaged. */ + /** Returns true if status is todo flaged. */ virtual bool isTodo(void) const; - /** Returns TRUE if status is sent. */ + /** Returns true if status is sent. */ virtual bool isSent(void) const; - /** Returns TRUE if status is important. */ + /** Returns true if status is important. */ virtual bool isImportant(void) const; - /** Returns TRUE if status is watched. */ + /** Returns true if status is watched. */ virtual bool isWatched(void) const; - /** Returns TRUE if status is ignored. */ + /** Returns true if status is ignored. */ virtual bool isIgnored(void) const; - /** Returns TRUE if status is spam. */ + /** Returns true if status is spam. */ virtual bool isSpam(void) const; - /** Returns TRUE if status is not spam. */ + /** Returns true if status is not spam. */ virtual bool isHam(void) const; @@ -275,7 +275,7 @@ public: virtual void setDate(const TQCString &aStrDate); virtual void setDate(time_t aUnixTime) = 0; - /** Returns TRUE if changed since last folder-sync. */ + /** Returns true if changed since last folder-sync. */ virtual bool dirty(void) const { return mDirty; } /** Change dirty flag. */ @@ -321,8 +321,8 @@ public: /** Skip leading keyword if keyword has given character at it's end * (e.g. ':' or ',') and skip the then following blanks (if any) too. - * If keywordFound is specified it will be TRUE if a keyword was skipped - * and FALSE otherwise. */ + * If keywordFound is specified it will be true if a keyword was skipped + * and false otherwise. */ static TQString skipKeyword(const TQString& str, TQChar sepChar=':', bool* keywordFound=0); diff --git a/kmail/kmmsgdict.h b/kmail/kmmsgdict.h index 60fabf6c..5598489c 100644 --- a/kmail/kmmsgdict.h +++ b/kmail/kmmsgdict.h @@ -115,7 +115,7 @@ private: /** Returns the name of the .folder.index.ids file. */ static TQString getFolderIdsLocation( const FolderStorage &folder ); - /** Returns TRUE if the .folder.index.ids file should not be read. */ + /** Returns true if the .folder.index.ids file should not be read. */ bool isFolderIdsOutdated( const FolderStorage &folder ); /** Reads the .folder.index.ids file. Returns 0 on success. */ diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h index 8f557f25..2a4a54fb 100644 --- a/kmail/kmmsginfo.h +++ b/kmail/kmmsginfo.h @@ -36,7 +36,7 @@ public: void compat_fromOldIndexString(const TQCString& str, bool toUtf8); - /** Initialize with given values and set dirty flag to FALSE. */ + /** Initialize with given values and set dirty flag to false. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, KMMsgStatus status, const TQCString& xmark, @@ -50,7 +50,7 @@ public: off_t folderOffset=0, size_t msgSize=0, size_t msgSizeServer = 0, ulong UID = 0); - /** Initialize with given values and set dirty flag to FALSE. */ + /** Initialize with given values and set dirty flag to false. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, KMMsgStatus status, const TQCString& xmark, diff --git a/kmail/kmmsglist.cpp b/kmail/kmmsglist.cpp index 9689467b..c7781148 100644 --- a/kmail/kmmsglist.cpp +++ b/kmail/kmmsglist.cpp @@ -24,7 +24,7 @@ KMMsgList::KMMsgList(int initSize) //----------------------------------------------------------------------------- KMMsgList::~KMMsgList() { - clear(TRUE); + clear(true); } @@ -69,22 +69,22 @@ bool KMMsgList::resize(unsigned int aSize) } // do the resizing - if (!TQMemArray<KMMsgBase*>::resize(aSize)) return FALSE; + if (!TQMemArray<KMMsgBase*>::resize(aSize)) return false; // initialize new elements for (i=oldSize; i<aSize; i++) at(i) = 0; - return TRUE; + return true; } //----------------------------------------------------------------------------- bool KMMsgList::reset(unsigned int aSize) { - if (!resize(aSize)) return FALSE; + if (!resize(aSize)) return false; clear(); - return TRUE; + return true; } diff --git a/kmail/kmmsglist.h b/kmail/kmmsglist.h index 83d9e8db..04ff3176 100644 --- a/kmail/kmmsglist.h +++ b/kmail/kmmsglist.h @@ -64,13 +64,13 @@ public: /** Clear messages. If autoDelete is set (default) the messages are deleted. The array is not resized. If @p syncDict, also updates the message dictionary. */ - void clear(bool autoDelete=TRUE, bool syncDict = false); + void clear(bool autoDelete=true, bool syncDict = false); /** Resize array and initialize new elements if any. Returns - FALSE if memory cannot be allocated. */ + false if memory cannot be allocated. */ bool resize(unsigned int size); - /** Clear the array and resize it to given size. Returns FALSE + /** Clear the array and resize it to given size. Returns false if memory cannot be allocated. */ bool reset(unsigned int size); diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index 452114d4..34939e51 100644 --- a/kmail/kmmsgpart.h +++ b/kmail/kmmsgpart.h @@ -137,9 +137,9 @@ public: void setContentId( const TQCString & aStr ) { mContentId = aStr; } /** Set the 'Content-Type' by mime-magic from the contents of the body. - If autoDecode is TRUE the decoded body will be used for mime type + If autoDecode is true the decoded body will be used for mime type determination (this does not change the body itself). */ - void magicSetType(bool autoDecode=TRUE); + void magicSetType(bool autoDecode=true); /** Get or set a custom content type parameter, consisting of an attribute name and a corresponding value. */ diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h index 2cb9b114..29ccd318 100644 --- a/kmail/kmmsgpartdlg.h +++ b/kmail/kmmsgpartdlg.h @@ -142,7 +142,7 @@ class KMMsgPartDialogCompat : public KMMsgPartDialog { TQ_OBJECT public: - KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE ); + KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=false ); virtual ~KMMsgPartDialogCompat(); /** Display information about this message part. */ diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index fca9c3af..df4d8845 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -101,7 +101,7 @@ public: /** Read settings from app's config file. */ void readConfig(); - /** Write settings to app's config file. Calls sync() if withSync is TRUE. */ + /** Write settings to app's config file. Calls sync() if withSync is true. */ void writeConfig( bool withSync=true ) const; const KMail::HeaderStyle * headerStyle() const { diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index 9d517fdf..62058936 100644 --- a/kmail/kmsearchpattern.h +++ b/kmail/kmsearchpattern.h @@ -74,14 +74,14 @@ public: virtual ~KMSearchRule() {}; /** Tries to match the rule against the given KMMessage. - @return TRUE if the rule matched, FALSE otherwise. Must be + @return true if the rule matched, false otherwise. Must be implemented by subclasses. */ virtual bool matches( const KMMessage * msg ) const = 0; /** Optimized version tries to match the rule against the given @see DwString. - @return TRUE if the rule matched, FALSE otherwise. + @return true if the rule matched, false otherwise. */ virtual bool matches( const DwString & str, KMMessage & msg, const DwBoyerMoore * headerField=0, @@ -170,7 +170,7 @@ public: virtual bool matches( const KMMessage * msg ) const; /** Optimized version tries to match the rule against the given DwString. - @return TRUE if the rule matched, FALSE otherwise. + @return true if the rule matched, false otherwise. */ virtual bool matches( const DwString & str, KMMessage & msg, const DwBoyerMoore * headerField=0, @@ -334,7 +334,7 @@ public: own result or else most functionality is lacking, or has to be reimplemented, since the rules are private to this class. - @return TRUE if the match was successful, FALSE otherwise. + @return true if the match was successful, false otherwise. */ bool matches( const KMMessage * msg, bool ignoreBody = false ) const; bool matches( const DwString & str, bool ignoreBody = false ) const; diff --git a/kmail/kmsender.h b/kmail/kmsender.h index 955bab91..7e2cbf4e 100644 --- a/kmail/kmsender.h +++ b/kmail/kmsender.h @@ -66,10 +66,10 @@ protected: /** Send given message. The message is either queued or sent immediately. The default behaviour, as selected with setSendImmediate(), can be overwritten with the parameter - sendNow (by specifying TRUE or FALSE). + sendNow (by specifying true or false). The sender takes ownership of the given message on success, so DO NOT DELETE OR MODIFY the message further. - Returns TRUE on success. */ + Returns true on success. */ bool doSend(KMMessage* msg, short sendNow); /** Send queued messages, using the specified transport or the @@ -78,11 +78,11 @@ protected: bool doSendQueued( const TQString& transport ); private: - /** Returns TRUE if sending is in progress. */ + /** Returns true if sending is in progress. */ bool sending() const { return mSendInProgress; } public: - /** Shall messages be sent immediately (TRUE), or shall they be + /** Shall messages be sent immediately (true), or shall they be queued and sent later upon call of sendQueued() ? */ bool sendImmediate() const { return mSendImmediate; } void setSendImmediate(bool); @@ -139,8 +139,8 @@ private: void cleanup(); /** Test if all required settings are set. - Reports problems to user via dialogs and returns FALSE. - Returns TRUE if everything is Ok. */ + Reports problems to user via dialogs and returns false. + Returns true if everything is Ok. */ bool settingsOk() const; /** Parse protocol '://' (host port? | mailer) string and diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h index f3214eff..da2a2cbd 100644 --- a/kmail/kmsender_p.h +++ b/kmail/kmsender_p.h @@ -43,8 +43,8 @@ public: /** Abort sending the current message. Sets mSending to false */ virtual void abort() = 0; - /** Returns TRUE if send was successful, and FALSE otherwise. - Returns FALSE if sending is still in progress. */ + /** Returns true if send was successful, and false otherwise. + Returns false if sending is still in progress. */ bool sendOk() const { return mSendOk; } /** Returns error message of last call of failed(). */ @@ -61,7 +61,7 @@ signals: protected: /** Called to signal a transmission error. The sender then calls finish() and terminates sending of messages. - Sets mSending to FALSE. */ + Sets mSending to false. */ void failed(const TQString &msg); /** Informs the user about what is going on. */ diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp index 9173d69c..1ef59a3f 100644 --- a/kmail/kmservertest.cpp +++ b/kmail/kmservertest.cpp @@ -63,7 +63,7 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in //----------------------------------------------------------------------------- KMServerTest::~KMServerTest() { - if (mJob) mJob->kill(TRUE); + if (mJob) mJob->kill(true); } diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h index e6c05160..5f0efdee 100644 --- a/kmail/kmtransport.h +++ b/kmail/kmtransport.h @@ -67,7 +67,7 @@ class KMTransportSelDlg : public KDialogBase public: - KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE ); + KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true ); int selected() const; private slots: @@ -84,7 +84,7 @@ class KMTransportDialog : public KDialogBase public: KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo, - TQWidget *parent=0, const char *name=0, bool modal=TRUE ); + TQWidget *parent=0, const char *name=0, bool modal=true ); virtual ~KMTransportDialog(); private slots: diff --git a/kmail/mailserviceimpl.cpp b/kmail/mailserviceimpl.cpp index 79af5eaf..cfd5a4a9 100644 --- a/kmail/mailserviceimpl.cpp +++ b/kmail/mailserviceimpl.cpp @@ -73,7 +73,7 @@ bool MailServiceImpl::sendMessage( const TQString& from, const TQString& to, if ( !body.isEmpty() ) msg->setBody( body.utf8() ); KMail::Composer * cWin = KMail::makeComposer( msg ); - cWin->setCharset("", TRUE); + cWin->setCharset("", true); cWin->addAttachmentsAndSend(attachments, "", 1);//send now return true; @@ -116,7 +116,7 @@ bool MailServiceImpl::sendMessage( const TQString& from, const TQString& to, msg->addBodyPart( part ); KMail::Composer * cWin = KMail::makeComposer( msg ); - cWin->setCharset("", TRUE); + cWin->setCharset("", true); return true; } diff --git a/kmail/main.cpp b/kmail/main.cpp index 1f2d33ee..24de19cd 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -60,7 +60,7 @@ int KMailApplication::newInstance() if (!kmkernel->firstInstance() || !tdeApp->isRestored()) kmkernel->handleCommandLine( true ); - kmkernel->setFirstInstance(FALSE); + kmkernel->setFirstInstance(false); return 0; } diff --git a/kmail/messagecomposer.h b/kmail/messagecomposer.h index 924b5bf4..24123759 100644 --- a/kmail/messagecomposer.h +++ b/kmail/messagecomposer.h @@ -77,7 +77,7 @@ public: /** * Applies the user changes to the message object of the composer - * and signs/encrypts the message if activated. Returns FALSE in + * and signs/encrypts the message if activated. Returns false in * case of an error (e.g. if PGP encryption fails). * If backgroundMode is true then no functions which might require * user interaction (like signing/encrypting) are performed diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index a93c89c9..de0faee2 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -609,7 +609,7 @@ namespace KMail { if ( key.numUserIDs() > 0 && key.userID( 0 ).id() ) messagePart.signer = Kleo::DN( key.userID( 0 ).id() ).prettyDN(); for ( uint iMail = 0; iMail < key.numUserIDs(); ++iMail ) { - // The following if /should/ always result in TRUE but we + // The following if /should/ always result in true but we // won't trust implicitely the plugin that gave us these data. if ( key.userID( iMail ).email() ) { TQString email = TQString::fromUtf8( key.userID( iMail ).email() ); @@ -2982,7 +2982,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) TQString line; /* search next occurrence of '\n' */ - pos = s.find('\n', beg, FALSE); + pos = s.find('\n', beg, false); if (pos == (unsigned int)(-1)) pos = length; diff --git a/kmail/popaccount.h b/kmail/popaccount.h index ef329982..cb68ab38 100644 --- a/kmail/popaccount.h +++ b/kmail/popaccount.h @@ -47,8 +47,8 @@ public: virtual void setUsePipelining(bool); /** - * Shall messages be left on the server upon retreival (TRUE) - * or deleted (FALSE). + * Shall messages be left on the server upon retreival (true) + * or deleted (false). */ bool leaveOnServer(void) const { return mLeaveOnServer; } virtual void setLeaveOnServer(bool); @@ -72,8 +72,8 @@ public: virtual void setLeaveOnServerSize(int); /** - * Shall messages be filter on the server (TRUE) - * or not (FALSE). + * Shall messages be filter on the server (true) + * or not (false). */ bool filterOnServer(void) const { return mFilterOnServer; } virtual void setFilterOnServer(bool); diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 088b39c8..7e1df3b7 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -30,7 +30,7 @@ * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl ) : SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac ) diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h index 3717cc86..8ae34df4 100644 --- a/kmail/snippetdlg.h +++ b/kmail/snippetdlg.h @@ -22,7 +22,7 @@ class SnippetDlg : public SnippetDlgBase public: - SnippetDlg( TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SnippetDlg( TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~SnippetDlg(); void setShowShortcut( bool show ); diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index c0851121..406632b6 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -49,7 +49,7 @@ SnippetWidget::SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollecti mEditor( editor ), mActionCollection( actionCollection ) { // init the TQPtrList - _list.setAutoDelete(TRUE); + _list.setAutoDelete(true); // init the TDEListView setSorting( -1 ); @@ -263,7 +263,7 @@ void SnippetWidget::slotEdit( TQListViewItem* item ) pSnippet->resetParent(); } - setSelected(item, TRUE); + setSelected(item, true); } } @@ -286,7 +286,7 @@ void SnippetWidget::slotEditGroup() dlg.snippetName->setText(pGroup->getName()); dlg.snippetText->setText(pGroup->getText()); dlg.btnAdd->setText(i18n("&Apply")); - dlg.snippetText->setEnabled(FALSE); + dlg.snippetText->setEnabled(false); dlg.setCaption(i18n("Edit Group")); dlg.cbGroup->insertItem(i18n("All")); @@ -295,7 +295,7 @@ void SnippetWidget::slotEditGroup() item->setText( 0, dlg.snippetName->text() ); pGroup->setName( dlg.snippetName->text() ); - setSelected(item, TRUE); + setSelected(item, true); } } @@ -683,7 +683,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ continue; cb = new TQCheckBox( &dlg, "cbVar" ); - cb->setChecked( FALSE ); + cb->setChecked( false ); cb->setText(it.key()); layoutVar->addWidget( cb, i ,0, TQt::AlignTop ); @@ -691,7 +691,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ layoutVar->addWidget( te, i, 1, TQt::AlignTop ); if ((*mapSave)[it.key()].length() > 0) { - cb->setChecked( TRUE ); + cb->setChecked( true ); te->setText((*mapSave)[it.key()]); } @@ -713,7 +713,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); - btn2->setDefault( TRUE ); + btn2->setDefault( true ); btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn2->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn2, 0, 1 ); @@ -804,14 +804,14 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri cb = new TQCheckBox( &dlg, "cbVar" ); - cb->setChecked( FALSE ); + cb->setChecked( false ); cb->setText(i18n( "Make value &default" )); te = new KTextEdit( &dlg, "teVar" ); layoutVar->addWidget( te, 0, 1, TQt::AlignTop); layoutVar->addWidget( cb, 1, 1, TQt::AlignTop); if ((*mapSave)[var].length() > 0) { - cb->setChecked( TRUE ); + cb->setChecked( true ); te->setText((*mapSave)[var]); } @@ -826,7 +826,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); - btn2->setDefault( TRUE ); + btn2->setDefault( true ); layoutBtn->addWidget( btn2, 0, 1 ); layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); @@ -882,18 +882,18 @@ bool SnippetWidget::acceptDrag (TQDropEvent *event) const if (item && TQString(event->format()).startsWith("text/plain") && static_cast<SnippetWidget *>(event->source()) != this) { - ///kdDebug(5006) << "returning TRUE " << endl; - return TRUE; + ///kdDebug(5006) << "returning true " << endl; + return true; } else if(item && TQString(event->format()).startsWith("x-kmailsnippet") && static_cast<SnippetWidget *>(event->source()) != this) { - //kdDebug(5006) << "returning TRUE " << endl; - return TRUE; + //kdDebug(5006) << "returning true " << endl; + return true; } else { - //kdDebug(5006) << "returning FALSE" << endl; - event->acceptAction(FALSE); - return FALSE; + //kdDebug(5006) << "returning false" << endl; + event->acceptAction(false); + return false; } } diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index 97d43b5d..f9b88c82 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -86,7 +86,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint &p if (!lvi) return; setCurrentItem( lvi ); - setSelected( lvi, TRUE ); + setSelected( lvi, true ); const KMFolder * folder = dynamic_cast<TreeItemBase*>( lvi )->folder(); if ( !folder || folder->noContent() || folder->noChildren() ) diff --git a/kmailcvt/filter_evolution_v2.cpp b/kmailcvt/filter_evolution_v2.cpp index a4c6203c..e0eb6d31 100644 --- a/kmailcvt/filter_evolution_v2.cpp +++ b/kmailcvt/filter_evolution_v2.cpp @@ -208,7 +208,7 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName, if(!targetDir.isNull()) { if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); - destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE); // mboxName; + destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(true); // mboxName; } else { destFolder = "Evolution-Import/" + rootDir; if(destFolder.contains(".sbd")) diff --git a/kmailcvt/filter_kmail_maildir.cpp b/kmailcvt/filter_kmail_maildir.cpp index f24ef7af..df432925 100644 --- a/kmailcvt/filter_kmail_maildir.cpp +++ b/kmailcvt/filter_kmail_maildir.cpp @@ -176,8 +176,8 @@ void FilterKMail_maildir::importFiles( FilterInfo *info, const TQString& dirName if(!generatedPath) { _path = "KMail-Import"; TQString _tmp = dir.filePath(*mailFile); - _tmp = _tmp.remove( mailDir ,TRUE); - TQStringList subFList = TQStringList::split("/",_tmp,FALSE); + _tmp = _tmp.remove( mailDir ,true); + TQStringList subFList = TQStringList::split("/",_tmp,false); for ( TQStringList::Iterator it = subFList.begin(); it != subFList.end(); ++it ) { TQString _cat = *it; if(!(_cat == *mailFile)) { diff --git a/kmailcvt/filter_lnotes.cpp b/kmailcvt/filter_lnotes.cpp index 7733c1c1..7c50f4c1 100644 --- a/kmailcvt/filter_lnotes.cpp +++ b/kmailcvt/filter_lnotes.cpp @@ -95,7 +95,7 @@ void FilterLNotes::ImportLNotes(const TQString& file) { // Get folder name TQFileInfo filenameInfo( file ); - TQString folder("LNotes-Import/" + filenameInfo.baseName(TRUE)); + TQString folder("LNotes-Import/" + filenameInfo.baseName(true)); inf->setTo(folder); // State machine to read the data in. The fgetc usage is probably terribly slow ... diff --git a/kmailcvt/filter_mbox.cpp b/kmailcvt/filter_mbox.cpp index c5f87e51..feb62a51 100644 --- a/kmailcvt/filter_mbox.cpp +++ b/kmailcvt/filter_mbox.cpp @@ -54,7 +54,7 @@ void FilterMBox::import(FilterInfo *info) info->alert( i18n("Unable to open %1, skipping").arg( *filename ) ); } else { TQFileInfo filenameInfo( *filename ); - TQString folderName( "MBOX-" + filenameInfo.baseName(TRUE) ); + TQString folderName( "MBOX-" + filenameInfo.baseName(true) ); info->setCurrent(0); info->addLog( i18n("Importing emails from %1...").arg( *filename ) ); diff --git a/kmailcvt/filter_oe.cpp b/kmailcvt/filter_oe.cpp index 47002d96..476b09d2 100644 --- a/kmailcvt/filter_oe.cpp +++ b/kmailcvt/filter_oe.cpp @@ -126,7 +126,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) TQ_UINT32 sig_block1, sig_block2; mailbox >> sig_block1 >> sig_block2; if (sig_block1 == OE4_SIG_1 && sig_block2 == OE4_SIG_2) { - folderName = "OE-Import/" + mailfileinfo.baseName(TRUE); + folderName = "OE-Import/" + mailfileinfo.baseName(true); info->addLog(i18n("Importing OE4 Mailbox %1").arg( "../" + _nameOfFile)); info->setTo(folderName); mbxImport(info, mailbox); @@ -136,7 +136,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) mailbox >> sig_block3 >> sig_block4; if (sig_block1 == OE5_SIG_1 && sig_block3 == OE5_SIG_3 && sig_block4 == OE5_SIG_4) { if (sig_block2 == OE5_EMAIL_SIG_2) { - folderName = "OE-Import/" + mailfileinfo.baseName(TRUE); + folderName = "OE-Import/" + mailfileinfo.baseName(true); if(parsedFolder) { TQString _tmpFolder = getFolderName(_nameOfFile); if(!_tmpFolder.isEmpty()) folderName = "OE-Import/" + _tmpFolder; diff --git a/kmailcvt/filter_sylpheed.cpp b/kmailcvt/filter_sylpheed.cpp index bf8427c2..9d8570e3 100644 --- a/kmailcvt/filter_sylpheed.cpp +++ b/kmailcvt/filter_sylpheed.cpp @@ -135,7 +135,7 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) _path = "Sylpheed-Import/"; TQString _tmp = dir.filePath(*mailFile); _tmp = _tmp.remove(_tmp.length() - _mfile.length() -1, _mfile.length()+1); - _path += _tmp.remove( mailDir ,TRUE); + _path += _tmp.remove( mailDir ,true); TQString _info = _path; info->addLog(i18n("Import folder %1...").arg(_info.remove(0,15))); diff --git a/kmailcvt/filter_thebat.cpp b/kmailcvt/filter_thebat.cpp index a255f352..6a9642a1 100644 --- a/kmailcvt/filter_thebat.cpp +++ b/kmailcvt/filter_thebat.cpp @@ -194,7 +194,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) TQString _path = "TheBat-Import/"; TQString _tmp = FileName; _tmp = _tmp.remove(_tmp.length() - 13, 13); - _path += _tmp.remove( mailDir ,TRUE); + _path += _tmp.remove( mailDir ,true); TQString _info = _path; info->addLog(i18n("Import folder %1...").arg(_info.remove(0,14))); info->setTo(_path); diff --git a/kmailcvt/filter_thunderbird.cpp b/kmailcvt/filter_thunderbird.cpp index e5f21d14..69aacca4 100644 --- a/kmailcvt/filter_thunderbird.cpp +++ b/kmailcvt/filter_thunderbird.cpp @@ -209,7 +209,7 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c if(!targetDir.isNull()) { if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); - destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE);// mboxName; + destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(true);// mboxName; } else { destFolder = "Thunderbird-Import/" + rootDir; if(destFolder.contains(".sbd")) diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index 732f6719..f121ff77 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -42,7 +42,7 @@ KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilterPageDlg(parent,name) { mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png")); - mFilterList.setAutoDelete( TRUE ); + mFilterList.setAutoDelete( true ); connect(mFilterCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(filterSelected(int))); // Add new filters below. If this annoys you, please rewrite the stuff to use a factory. diff --git a/kmobile/devices/gnokii/gnokiiconfig.h b/kmobile/devices/gnokii/gnokiiconfig.h index a3f3b04b..be76188b 100644 --- a/kmobile/devices/gnokii/gnokiiconfig.h +++ b/kmobile/devices/gnokii/gnokiiconfig.h @@ -28,7 +28,7 @@ class GnokiiConfig : public GnokiiConfigUI TQ_OBJECT public: - GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~GnokiiConfig(); void setValues(const TQString &model, const TQString &connection, const TQString &port, const TQString &baud); diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 14f212a6..00c43ee9 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -381,7 +381,7 @@ signals: * * @param info See @ref AuthInfo. * @param errorMsg Error message to show - * @return @p TRUE if user clicks on "OK", @p FALSE otherwsie. + * @return @p true if user clicks on "OK", @p false otherwsie. * @since 3.1 */ bool openPassDlg( TDEIO::AuthInfo& info, const TQString &errorMsg ); diff --git a/knotes/main.cpp b/knotes/main.cpp index 833e5695..5f045a38 100644 --- a/knotes/main.cpp +++ b/knotes/main.cpp @@ -48,7 +48,7 @@ void remove_sm_from_client_leader() TQWidget w; KXErrorHandler handler; // ignore X errors status = XGetWindowProperty( tqt_xdisplay(), w.winId(), atoms[ 0 ], 0, 10000, - FALSE, XA_WINDOW, &type, &format, + false, XA_WINDOW, &type, &format, &nitems, &extra, &data ); if (status == Success && !handler.error( false )) diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 669fd636..6bf22137 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -562,7 +562,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) TQMap<TQString,TQString> metadata; if ( KURLDrag::decode( source, urls, metadata ) ) { probablyWeHaveUris = true; - labels = TQStringList::split( ':', metadata["labels"], FALSE ); + labels = TQStringList::split( ':', metadata["labels"], false ); for ( TQStringList::Iterator it = labels.begin(); it != labels.end(); ++it ) { *it = KURL::decode_string( (*it).latin1() ); } @@ -571,7 +571,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) } else if ( TQTextDrag::canDecode( source ) ) { TQString text; TQTextDrag::decode( source, text ); - TQStringList lst = TQStringList::split( '\n', text, FALSE ); + TQStringList lst = TQStringList::split( '\n', text, false ); for ( TQStringList::ConstIterator it = lst.constBegin(); it != lst.constEnd(); ++it ) { urls.append( *it ); labels.append( TQString() ); diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index c094ad84..4aff9a46 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -1742,7 +1742,7 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd, p.drawLine(300, lineSpacing * 1, width, lineSpacing * 1); p.setPen( oldPen ); - p.setFont(TQFont("Times", 20, TQFont::Bold, TRUE)); + p.setFont(TQFont("Times", 20, TQFont::Bold, true)); int newlineSpacing = p.fontMetrics().lineSpacing(); title += TQString::number(fd.year()); p.drawText( 0, lineSpacing * 1 + 4, width, newlineSpacing, diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp index 71db3da3..d8a1b653 100644 --- a/korn/maildlg.cpp +++ b/korn/maildlg.cpp @@ -36,7 +36,7 @@ void KornMailDlg::showFullMessage() _loadMailCanceled = false; // create progress dialog - _progress = new TQProgressDialog(this, "bla", TRUE); + _progress = new TQProgressDialog(this, "bla", true); _progress->setMinimumDuration(0); _progress->setLabelText(i18n("Loading full mail. Please wait...")); diff --git a/korn/maildrop.h b/korn/maildrop.h index 3a885e6c..71bd111d 100644 --- a/korn/maildrop.h +++ b/korn/maildrop.h @@ -85,7 +85,7 @@ class KMailDrop : public TQObject virtual ~KMailDrop(); /** - * @return TRUE if the mailbox and its configuration are valid. + * @return true if the mailbox and its configuration are valid. */ virtual bool valid() = 0; diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h index 19d08e7f..abde8e05 100644 --- a/libemailfunctions/email.h +++ b/libemailfunctions/email.h @@ -190,7 +190,7 @@ TDE_EXPORT TQString getFirstEmailAddress( const TQString & addresses ); * "Stefan Taferner <taferner@example.org>" returns "taferner@example.org" * and "Stefan Taferner". "joe@example.com" returns "joe@example.com" * and "". Note that this only returns the first address. - * Also note that the return value is TRUE if both the name and the + * Also note that the return value is true if both the name and the * mail are not empty: this does NOT tell you if mail contains a * valid email address or just some rubbish. */ diff --git a/libkcal/calformat.h b/libkcal/calformat.h index b3b7160d..39bd98bf 100644 --- a/libkcal/calformat.h +++ b/libkcal/calformat.h @@ -50,7 +50,7 @@ class LIBKCAL_EXPORT CalFormat /** loads a calendar on disk into the calendar associated with this format. - Returns TRUE if successful,else returns FALSE. + Returns true if successful,else returns false. @param fileName the name of the calendar on disk. */ virtual bool load(Calendar *, const TQString &fileName) = 0; diff --git a/libkcal/tests/fbrecurring.cpp b/libkcal/tests/fbrecurring.cpp index be70a7c8..e4678a54 100644 --- a/libkcal/tests/fbrecurring.cpp +++ b/libkcal/tests/fbrecurring.cpp @@ -20,7 +20,7 @@ int main() event1->setDtStart( TQDateTime(TQDate(2006,1,1), TQTime(12,0,0)) ); //event1->setDuration(60*60); event1->setDtEnd( TQDateTime(TQDate(2006,1,1), TQTime(13,0,0)) ); - event1->setFloats(FALSE); + event1->setFloats(false); event1->recurrence()->setDaily( 1 ); //event1->recurrence()->setDuration( 2 ); event1->recurrence()->setEndDateTime( TQDateTime(TQDate(2006,1,3), TQTime(13,0,0)) ); @@ -32,7 +32,7 @@ int main() event2->setDtStart( TQDateTime(TQDate(2006,1,1), TQTime(13,0,0)) ); //event2->setDuration(60*60); event2->setDtEnd( TQDateTime(TQDate(2006,1,1), TQTime(14,0,0)) ); - event2->setFloats(FALSE); + event2->setFloats(false); event2->recurrence()->setDaily( 1 ); //event2->recurrence()->setDuration( 3 ); event2->recurrence()->setEndDateTime( TQDateTime(TQDate(2006,1,4), TQTime(13,0,0)) ); diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index f78ad2a3..539921fa 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -71,7 +71,7 @@ bool VCalFormat::load(Calendar *calendar, const TQString &fileName) if (!vcal) { setException(new ErrorFormat(ErrorFormat::CalVersionUnknown)); - return FALSE; + return false; } // any other top-level calendar stuff should be added/initialized here @@ -503,7 +503,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) } else if (recur->duration() == -1) { tmpStr += "#0"; // defined as repeat forever } else { - tmpStr += qDateTimeToISO(recur->endDateTime(), FALSE); + tmpStr += qDateTimeToISO(recur->endDateTime(), false); } // Only write out the rrule if we have a valid recurrence (i.e. a known // type in thee switch above) @@ -948,11 +948,11 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // "take up" any time. /*if ((isAPropertyOf(vevent, VCDTstartProp) == 0) || (isAPropertyOf(vevent, VCDTendProp) == 0)) { - anEvent->setFloats(TRUE); + anEvent->setFloats(true); } else { }*/ - anEvent->setFloats(FALSE); + anEvent->setFloats(false); // start time if ((vo = isAPropertyOf(vevent, VCDTstartProp)) != 0) { @@ -960,7 +960,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // kdDebug(5800) << "s is " << // s << ", ISO is " << ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl; deleteStr(s); if (anEvent->dtStart().time().isNull()) - anEvent->setFloats(TRUE); + anEvent->setFloats(true); } // stop time @@ -968,7 +968,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) anEvent->setDtEnd(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); if (anEvent->dtEnd().time().isNull()) - anEvent->setFloats(TRUE); + anEvent->setFloats(true); } // at this point, there should be at least a start or end time. @@ -1071,7 +1071,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) } anEvent->recurrence()->addMonthlyPos( tmpPos, qba ); qba.detach(); - qba.fill(FALSE); // clear out + qba.fill(false); // clear out } // while != "#" } break;} diff --git a/libkcal/vcalformat.h b/libkcal/vcalformat.h index facda241..60151ff9 100644 --- a/libkcal/vcalformat.h +++ b/libkcal/vcalformat.h @@ -86,7 +86,7 @@ class LIBKCAL_EXPORT VCalFormat : public CalFormat /** takes a TQDate and returns a string in the format YYYYMMDDTHHMMSS */ TQString qDateToISO(const TQDate &); /** takes a TQDateTime and returns a string in format YYYYMMDDTHHMMSS */ - TQString qDateTimeToISO(const TQDateTime &, bool zulu=TRUE); + TQString qDateTimeToISO(const TQDateTime &, bool zulu=true); /** takes a string in the format YYYYMMDDTHHMMSS and returns a * valid TQDateTime. */ TQDateTime ISOToTQDateTime(const TQString & dtStr); diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index d93c4990..1df85e61 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -149,20 +149,20 @@ TQString decodeRFC2047String(const TQCString &src, const char **usedCS, } beg = pos+2; end = beg; - valid = TRUE; + valid = true; // parse charset name declaredCS=""; for (i=2,pos+=2; i<maxLen && (*pos!='?'&&(ispunct(*pos)||isalnum(*pos))); i++) { declaredCS+=(*pos); pos++; } - if (*pos!='?' || i<4 || i>=maxLen) valid = FALSE; + if (*pos!='?' || i<4 || i>=maxLen) valid = false; else { // get encoding and check delimiting question marks encoding = toupper(pos[1]); if (pos[2]!='?' || (encoding!='Q' && encoding!='B')) - valid = FALSE; + valid = false; pos+=3; i+=3; } @@ -176,7 +176,7 @@ TQString decodeRFC2047String(const TQCString &src, const char **usedCS, pos++; } end = pos+2;//end now points to the first char after the encoded string - if (i>=maxLen || !*pos) valid = FALSE; + if (i>=maxLen || !*pos) valid = false; } if (valid) { diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp index bd4193bf..e535abe3 100644 --- a/libkpgp/kpgp.cpp +++ b/libkpgp/kpgp.cpp @@ -73,7 +73,7 @@ Module::~Module() writeAddressData(); if (kpgpObject == this) kpgpObject = kpgpod.setObject( Module::kpgpObject, 0, false ); - clear(TRUE); + clear(true); delete config; delete pgp; } @@ -268,7 +268,7 @@ Module::decrypt( Block& block ) // loop as long as the user enters a wrong passphrase and doesn't abort // everything ready if( prepare( true, &block ) != 1 ) - return FALSE; + return false; // ok now try to decrypt the message. retval = pgp->decrypt( block, passphrase ); // loop on bad passphrase @@ -678,7 +678,7 @@ Module::signKey(const KeyID& keyId) if (0 == pgp) assignPGPBase(); if( prepare( true ) != 1 ) - return FALSE; + return false; if(pgp->signKey(keyId, passphrase) & ERROR) { errMsg = pgp->lastErrorMessage(); @@ -855,7 +855,7 @@ Module::changePassPhrase() { //FIXME... KMessageBox::information(0,i18n("This feature is\nstill missing")); - return FALSE; + return false; } void @@ -1310,7 +1310,7 @@ Module::checkForPGP(void) int index = 0; int lastindex = -1; - havePgp=FALSE; + havePgp=false; path = getenv("PATH"); while((index = path.find(":",lastindex+1)) != -1) @@ -1323,7 +1323,7 @@ Module::checkForPGP(void) TQStrListIterator it(pSearchPaths); - haveGpg=FALSE; + haveGpg=false; // lets try gpg for ( it.toFirst() ; it.current() ; ++it ) @@ -1333,14 +1333,14 @@ Module::checkForPGP(void) if ( !access( path, X_OK ) ) { kdDebug(5100) << "Kpgp: gpg found" << endl; - havePgp=TRUE; - haveGpg=TRUE; + havePgp=true; + haveGpg=true; break; } } // search for pgp5.0 - havePGP5=FALSE; + havePGP5=false; for ( it.toFirst() ; it.current() ; ++it ) { path = (*it); @@ -1348,8 +1348,8 @@ Module::checkForPGP(void) if ( !access( path, X_OK ) ) { kdDebug(5100) << "Kpgp: pgp 5 found" << endl; - havePgp=TRUE; - havePGP5=TRUE; + havePgp=true; + havePGP5=true; break; } } @@ -1363,7 +1363,7 @@ Module::checkForPGP(void) if ( !access( path, X_OK ) ) { kdDebug(5100) << "Kpgp: pgp 2 or 6 found" << endl; - havePgp=TRUE; + havePgp=true; break; } } diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h index bb4cc6fa..26f56cc8 100644 --- a/libkpgp/kpgp.h +++ b/libkpgp/kpgp.h @@ -198,8 +198,8 @@ public: */ Validity keyTrust( const TQString& userID ); - /** Returns TRUE if the given key is at least trusted marginally. Otherwise - FALSE is returned. + /** Returns true if the given key is at least trusted marginally. Otherwise + false is returned. */ bool isTrusted( const KeyID& keyID ); @@ -231,7 +231,7 @@ public: bool storePassPhrase(void) const; /** clears everything from memory */ - void clear(const bool erasePassPhrase = FALSE); + void clear(const bool erasePassPhrase = false); /** returns the last error that occurred */ const TQString lastErrorMsg(void) const; @@ -308,8 +308,8 @@ public: /** Parses the given message and splits it into OpenPGP blocks and Non-OpenPGP blocks. - Returns TRUE if the message contains at least one OpenPGP block and - FALSE otherwise. + Returns true if the message contains at least one OpenPGP block and + false otherwise. The format is then: <pre> 1st Non-OpenPGP block @@ -340,7 +340,7 @@ private: 0 (together with some warning message) if something is missing -1 if the passphrase dialog was canceled */ - int prepare(bool needPassPhrase=FALSE, Block* block = 0 ); + int prepare(bool needPassPhrase=false, Block* block = 0 ); /** cleanup passphrase if it should not be stored. */ void cleanupPass() { if (!storePass) wipePassPhrase(); } diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index be30f9f4..7299762e 100644 --- a/libkpgp/kpgpbase2.cpp +++ b/libkpgp/kpgpbase2.cpp @@ -115,7 +115,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, if(!recipients.isEmpty()) { int index = 0; - bool bad = FALSE; + bool bad = false; unsigned int num = 0; TQCString badkeys = ""; if (error.find("Cannot find the public key") != -1) @@ -125,7 +125,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, while((index = error.find("Cannot find the public key",index)) != -1) { - bad = TRUE; + bad = true; index = error.find('\'',index); int index2 = error.find('\'',index+1); if (num++) @@ -156,7 +156,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, while((index = error.find("skipping userid",index)) != -1) { - bad = TRUE; + bad = true; int index2 = error.find('\n',index+16); if (num++) badkeys += ", "; diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index 304b24bd..c4aa0ac1 100644 --- a/libkpgp/kpgpbaseG.cpp +++ b/libkpgp/kpgpbaseG.cpp @@ -128,7 +128,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, if(!recipients.isEmpty()) { int index = 0; - bool bad = FALSE; + bool bad = false; unsigned int num = 0; TQCString badkeys = ""; // Examples: @@ -140,7 +140,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, // (untrusted key, 23456789 is the key Id of the encryption sub key) while((index = error.find("skipped: ",index)) != -1) { - bad = TRUE; + bad = true; index = error.find('\'',index); int index2 = error.find('\'',index+1); badkeys += error.mid(index, index2-index+1) + ", "; diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index fc8bf60a..6979bcc5 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/libkpimexchange/core/exchangeaccount.cpp @@ -313,10 +313,10 @@ TQString ExchangeAccount::tryMailbox( const TQString &_url, const TQString &user TQString result; while ( !stream.eof() ) { line = stream.readLine(); // line of text excluding '\n' - int pos = line.find( "<BASE href=\"", 0, FALSE ); + int pos = line.find( "<BASE href=\"", 0, false ); if ( pos < 0 ) continue; - int end = line.find( "\"", pos+12, FALSE ); + int end = line.find( "\"", pos+12, false ); if ( pos < 0 ) { kdWarning() << "Strange, found no closing quote in " << line << endl; continue; diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c b/libtdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c index 8ee9c748..354baecf 100644 --- a/libtdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c +++ b/libtdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c @@ -613,7 +613,7 @@ create_inheritable_pipe (int filedes[2], int for_write) memset (&sec_attr, 0, sizeof sec_attr ); sec_attr.nLength = sizeof sec_attr; - sec_attr.bInheritHandle = FALSE; + sec_attr.bInheritHandle = false; if (!CreatePipe (&r, &w, &sec_attr, 0)) { @@ -623,7 +623,7 @@ create_inheritable_pipe (int filedes[2], int for_write) if (!DuplicateHandle (GetCurrentProcess(), for_write? r : w, GetCurrentProcess(), &h, 0, - TRUE, DUPLICATE_SAME_ACCESS )) + true, DUPLICATE_SAME_ACCESS )) { _assuan_log_printf ("DuplicateHandle failed: %s\n", w32_strerror (-1)); CloseHandle (r); @@ -730,7 +730,7 @@ pipe_connect_w32 (assuan_context_t *ctx, /* Start the process. */ memset (&sec_attr, 0, sizeof sec_attr ); sec_attr.nLength = sizeof sec_attr; - sec_attr.bInheritHandle = FALSE; + sec_attr.bInheritHandle = false; memset (&si, 0, sizeof si); si.cb = sizeof (si); @@ -778,7 +778,7 @@ pipe_connect_w32 (assuan_context_t *ctx, cmdline, /* Command line arguments. */ &sec_attr, /* Process security attributes. */ &sec_attr, /* Thread security attributes. */ - TRUE, /* Inherit handles. */ + true, /* Inherit handles. */ (CREATE_DEFAULT_ERROR_MODE | GetPriorityClass (GetCurrentProcess ()) | CREATE_SUSPENDED), /* Creation flags. */ diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index 9cfe8f00..6c9e09a0 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -223,7 +223,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TDEPopupMenu *popup = createPopupMenu( ); popup->exec( mev->globalPos() ); delete popup; - return TRUE; + return true; }; TQCursor cursor; @@ -242,7 +242,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) m_tempFirstClick=mev->pos(); - return TRUE; + return true; } if ( ev->type() == TQEvent::MouseMove ) @@ -281,7 +281,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) m_selectedRegion.moveBy(0,m_originalPixmap.height()-m_selectedRegion.height()-m_selectedRegion.y()); mouseOutside=true; } - if (mouseOutside) { updatePixmap(); return TRUE; }; + if (mouseOutside) { updatePixmap(); return true; }; m_selectedRegion.moveBy( mev->x()-m_tempFirstClick.x(), mev->y()-m_tempFirstClick.y() ); @@ -300,7 +300,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) m_tempFirstClick=mev->pos(); updatePixmap(); } - return TRUE; + return true; } if ( ev->type() == TQEvent::MouseButtonRelease ) @@ -313,11 +313,11 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) m_state=None; TQApplication::restoreOverrideCursor(); - return TRUE; + return true; } TQWidget::eventFilter(obj, ev); - return FALSE; + return false; } TQRect KPixmapRegionSelectorWidget::calcSelectionRectangle( const TQPoint & startPoint, const TQPoint & _endPoint ) diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h index 1bb3ac21..85c94d77 100644 --- a/libtdepim/kregexp3.h +++ b/libtdepim/kregexp3.h @@ -82,8 +82,8 @@ public: KRegExp3() : TQRegExp() {} KRegExp3( const TQString & pattern, - bool caseSensitive = TRUE, - bool wildcard = FALSE ) + bool caseSensitive = true, + bool wildcard = false ) : TQRegExp( pattern, caseSensitive, wildcard ) {} KRegExp3( const TQRegExp & rx ) : TQRegExp( rx ) {} @@ -99,13 +99,13 @@ public: @param start Start position for the search. If @p start is negative, starts @p -(start) positions from the end of @p str. - @param global If @p TRUE, requests to replace all occurrences - of the regexp with @p replacementStr; if @p FALSE, + @param global If @p true, requests to replace all occurrences + of the regexp with @p replacementStr; if @p false, only the first occurrence will be replaced. Equivalent to the /g switch to perl's s/// operator. @return The modified string. */ TQString replace( const TQString & str, const TQString & replacementStr, - int start=0, bool global=TRUE ); + int start=0, bool global=true ); }; diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp index 0ad66de7..5ece6d4e 100644 --- a/libtdepim/kwidgetlister.cpp +++ b/libtdepim/kwidgetlister.cpp @@ -46,7 +46,7 @@ KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, const char* name ) : TQWidget( parent, name ) { - mWidgetList.setAutoDelete(TRUE); + mWidgetList.setAutoDelete(true); mMinWidgets = TQMAX( minWidgets, 1 ); mMaxWidgets = TQMAX( maxWidgets, mMinWidgets + 1 ); diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index 920b5a35..57f38862 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -62,7 +62,7 @@ static TQString join( const KPIM::LdapAttrValue& lst, const TQString& sep ) for ( KPIM::LdapAttrValue::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { if ( alredy ) res += sep; - alredy = TRUE; + alredy = true; res += asUtf8( *it ); } return res; diff --git a/libtdepim/maillistdrag.cpp b/libtdepim/maillistdrag.cpp index adc7962a..f8932d12 100644 --- a/libtdepim/maillistdrag.cpp +++ b/libtdepim/maillistdrag.cpp @@ -155,9 +155,9 @@ bool MailListDrag::decode( TQDropEvent* e, MailList& mailList ) if ( payload.size() ) { e->accept(); buffer >> mailList; - return TRUE; + return true; } - return FALSE; + return false; } bool MailListDrag::decode( TQByteArray& payload, MailList& mailList ) @@ -165,9 +165,9 @@ bool MailListDrag::decode( TQByteArray& payload, MailList& mailList ) TQDataStream stream( payload, IO_ReadOnly ); if ( payload.size() ) { stream >> mailList; - return TRUE; + return true; } - return FALSE; + return false; } bool MailListDrag::decode( TQDropEvent* e, TQByteArray &a ) @@ -183,9 +183,9 @@ bool MailListDrag::decode( TQDropEvent* e, TQByteArray &a ) stream << mailDrag.serialNumber(); } buffer.close(); - return TRUE; + return true; } - return FALSE; + return false; } void MailListDrag::setMailList( MailList mailList ) diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h index 1e9e9681..496d6fb7 100644 --- a/libtdepim/maillistdrag.h +++ b/libtdepim/maillistdrag.h @@ -111,20 +111,20 @@ public: /* The format for this drag - "x-kmail-drag/message-list" */ static const char* format(); - /* Returns TRUE if the information in e can be decoded into a TQString; - otherwsie returns FALSE */ + /* Returns true if the information in e can be decoded into a TQString; + otherwsie returns false */ static bool canDecode( TQMimeSource* e ); /* Attempts to decode the dropped information; - Returns TRUE if successful; otherwise return false */ + Returns true if successful; otherwise return false */ static bool decode( TQDropEvent* e, MailList& s ); /* Attempts to decode the serialNumbers of the dropped information; - Returns TRUE if successful; otherwise return false */ + Returns true if successful; otherwise return false */ static bool decode( TQDropEvent* e, TQByteArray& a ); /* Attempts to decode the encoded MailList; - Returns TRUE if successful; otherwise return false */ + Returns true if successful; otherwise return false */ static bool decode( TQByteArray& a, MailList& s ); private: diff --git a/libtdepim/qutf7codec.cpp b/libtdepim/qutf7codec.cpp index 78d709df..8624f2a1 100644 --- a/libtdepim/qutf7codec.cpp +++ b/libtdepim/qutf7codec.cpp @@ -48,11 +48,11 @@ const char* TQUtf7Codec::mimeName() const { } bool TQUtf7Codec::canEncode( TQChar ) const { - return TRUE; + return true; } bool TQUtf7Codec::canEncode( const TQString & ) const { - return TRUE; + return true; } static uchar base64Set[] = { @@ -91,9 +91,9 @@ int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const { int stepNo = 0; int i; - bool shifted = FALSE; - bool rightAfterEscape = FALSE; - bool onlyNullBitsSinceLastBoundary = TRUE; + bool shifted = false; + bool rightAfterEscape = false; + bool onlyNullBitsSinceLastBoundary = true; for ( i = 0; i < len ; i++ ) { if ((unsigned char)chars[i] >= 128) // 8bit chars not allowed. break; @@ -101,7 +101,7 @@ int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const if ( isOfSet(chars[i],base64Set) ) { switch (stepNo) { case 0: - onlyNullBitsSinceLastBoundary = TRUE; + onlyNullBitsSinceLastBoundary = true; break; case 3: onlyNullBitsSinceLastBoundary @@ -117,19 +117,19 @@ int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const = onlyNullBitsSinceLastBoundary && (chars[i] == 'A'); } stepNo = (stepNo + 1) % 8; - rightAfterEscape = FALSE; + rightAfterEscape = false; } else { if (rightAfterEscape && chars[i] != '-') break; // a '+' must be followed by '-' or a base64 char if (!onlyNullBitsSinceLastBoundary) break; // non-zero bits in the tail of the base64 encoding - shifted = FALSE; + shifted = false; stepNo = 0; } } else { if (chars[i] == '+') { - shifted = TRUE; - rightAfterEscape = TRUE; + shifted = true; + rightAfterEscape = true; } } } @@ -156,7 +156,7 @@ class TQUtf7Decoder : public TQTextDecoder { // of a shifted-sequence. bool rightAfterEscape; public: - TQUtf7Decoder() : uc(0), stepNo(0), shifted(FALSE), rightAfterEscape(FALSE) + TQUtf7Decoder() : uc(0), stepNo(0), shifted(false), rightAfterEscape(false) { } @@ -165,8 +165,8 @@ private: { uc = 0; stepNo = 0; - shifted = FALSE; - rightAfterEscape = FALSE; + shifted = false; + rightAfterEscape = false; } public: @@ -279,7 +279,7 @@ public: // increase the step counter stepNo++; stepNo %= 8; - rightAfterEscape = FALSE; + rightAfterEscape = false; // and look at the next char. continue; } // fi (still) shifted @@ -295,11 +295,11 @@ public: if ( ch == '+' ) { // '+' is the escape char for entering a // shifted sequence: - shifted = TRUE; + shifted = true; stepNo = 0; // also, we're right at the beginning where // special rules apply: - rightAfterEscape = TRUE; + rightAfterEscape = true; } else { // US-ASCII values are directly used result += TQChar(ch); @@ -327,7 +327,7 @@ class TQUtf7Encoder : public TQTextEncoder { public: TQUtf7Encoder(bool encOpt, bool encLwsp) : outbits(0), stepNo(0), - shifted(FALSE), mayContinueShiftedSequence(FALSE) + shifted(false), mayContinueShiftedSequence(false) { for ( int i = 0; i < 16 ; i++) { dontNeedEncodingSet[i] = directSet[i]; @@ -429,13 +429,13 @@ private: } else if (mayContinueShiftedSequence) { // if mayContinue is set, this means the // shifted-sequence needs a lead-out. - mayContinueShiftedSequence = FALSE; + mayContinueShiftedSequence = false; if (isOfSet(ch,base64Set) || ch == '-' ) { *t++ = '-'; } } *t++ = (uchar)ch; - shifted = FALSE; + shifted = false; stepNo = 0; } @@ -494,8 +494,8 @@ public: // 24bits ("-+-") + some from ending the shifted-sequence // with 21,33 bits addToShiftedSequence(t,ch); - mayContinueShiftedSequence = FALSE; - shifted = TRUE; + mayContinueShiftedSequence = false; + shifted = true; } else { // shortcut encoding of '+': *t++ = '+'; @@ -512,15 +512,15 @@ public: stepNo = 0; } addToShiftedSequence(t,ch); - shifted = TRUE; - mayContinueShiftedSequence = FALSE; + shifted = true; + mayContinueShiftedSequence = false; } if ( shifted ) { endShiftedSequence(t); - mayContinueShiftedSequence = TRUE; + mayContinueShiftedSequence = true; }; - shifted = FALSE; + shifted = false; } *t = '\0'; diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp index ce2e8068..7e423dc0 100644 --- a/libtdepim/tdefileio.cpp +++ b/libtdepim/tdefileio.cpp @@ -183,7 +183,7 @@ TDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, //assert(aFileName!=0); if(aFileName.isEmpty()) - return FALSE; + return false; if (file.exists()) { @@ -194,7 +194,7 @@ TDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, .arg(aFileName); rc = KMessageBox::warningContinueCancel(0, str, i18n("Save to File"), i18n("&Replace")); - if (rc != KMessageBox::Continue) return FALSE; + if (rc != KMessageBox::Continue) return false; } if (aBackup) { @@ -206,12 +206,12 @@ TDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, if( !TQDir::current().rename(aFileName, bakName) ) { // failed to rename file - if (!aVerbose) return FALSE; + if (!aVerbose) return false; rc = KMessageBox::warningContinueCancel(0, i18n("Failed to make a backup copy of %1.\nContinue anyway?") .arg(aFileName), i18n("Save to File"), KStdGuiItem::save() ); - if (rc != KMessageBox::Continue) return FALSE; + if (rc != KMessageBox::Continue) return false; } } } @@ -230,7 +230,7 @@ TDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, default: msgDialog(i18n("Error while writing file:\n%1").arg(aFileName)); } - return FALSE; + return false; } writeLen = file.writeBlock(aBuffer, len); @@ -239,7 +239,7 @@ TDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, { if (aVerbose) msgDialog(i18n("Could not write to file:\n%1").arg(aFileName)); - return FALSE; + return false; } else if (writeLen < len) { @@ -247,10 +247,10 @@ TDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, .arg(writeLen).arg(len); if (aVerbose) msgDialog(msg); - return FALSE; + return false; } - return TRUE; + return true; } TDE_EXPORT bool kCStringToFile(const TQCString& aBuffer, const TQString &aFileName, diff --git a/libtdepim/tdefileio.h b/libtdepim/tdefileio.h index baadf027..02a6f49f 100644 --- a/libtdepim/tdefileio.h +++ b/libtdepim/tdefileio.h @@ -19,11 +19,11 @@ namespace KPIM { /** Load a file. Returns a pointer to the memory-block that contains * the loaded file. Returns a null string if the file could not be loaded. - * If withDialogs is FALSE no warning dialogs are opened if there are + * If withDialogs is false no warning dialogs are opened if there are * problems. * The string returned is always zero-terminated and therefore one * byte longer than the file itself. - * If ensureNewline is TRUE the string will always have a trailing newline. + * If ensureNewline is true the string will always have a trailing newline. */ TQCString kFileToString(const TQString &fileName, bool ensureNewline=true, bool withDialogs=true) TDE_EXPORT; @@ -32,10 +32,10 @@ TQCString kFileToString(const TQString &fileName, bool ensureNewline=true, //TQByteArray kFileToBytes(const TQString &fileName, bool withDialogs=true); -/** Save a file. If withDialogs is FALSE no warning dialogs are opened if - * there are problems. Returns TRUE on success and FALSE on failure. - * Replaces existing files without warning if askIfExists==FALSE. - * Makes a copy if the file exists to filename~ if createBackup==TRUE. +/** Save a file. If withDialogs is false no warning dialogs are opened if + * there are problems. Returns true on success and false on failure. + * Replaces existing files without warning if askIfExists==false. + * Makes a copy if the file exists to filename~ if createBackup==true. */ bool kBytesToFile(const char* aBuffer, int len, const TQString &aFileName, diff --git a/libtdepim/tests/testutf7encoder.cpp b/libtdepim/tests/testutf7encoder.cpp index 46fbd4d8..6c67afb2 100644 --- a/libtdepim/tests/testutf7encoder.cpp +++ b/libtdepim/tests/testutf7encoder.cpp @@ -16,8 +16,8 @@ void main( int argc, char * argv[] ) { << "\"" << argv[1] << "\"\n" << endl; cout << "Encode optional direct set and whitespace:\n" << endl; - codec->setEncodeWhitespace(TRUE); - codec->setEncodeOptionalDirect(TRUE); + codec->setEncodeWhitespace(true); + codec->setEncodeOptionalDirect(true); enc = codec->makeEncoder(); len = arg.length(); @@ -40,8 +40,8 @@ void main( int argc, char * argv[] ) { delete enc; cout << "Encode optional direct set and not whitespace:\n" << endl; - codec->setEncodeWhitespace(FALSE); - codec->setEncodeOptionalDirect(TRUE); + codec->setEncodeWhitespace(false); + codec->setEncodeOptionalDirect(true); enc = codec->makeEncoder(); len = arg.length(); @@ -52,8 +52,8 @@ void main( int argc, char * argv[] ) { cout << "Don't encode optional direct set, but whitespace:\n" << endl; - codec->setEncodeWhitespace(TRUE); - codec->setEncodeOptionalDirect(FALSE); + codec->setEncodeWhitespace(true); + codec->setEncodeOptionalDirect(false); enc = codec->makeEncoder(); len = arg.length(); @@ -64,8 +64,8 @@ void main( int argc, char * argv[] ) { cout << "Encode neither optional direct set, nor whitespace:\n" << endl; - codec->setEncodeWhitespace(FALSE); - codec->setEncodeOptionalDirect(FALSE); + codec->setEncodeWhitespace(false); + codec->setEncodeOptionalDirect(false); enc = codec->makeEncoder(); len = arg.length(); diff --git a/tdeioslave/imap4/imap4.cpp b/tdeioslave/imap4/imap4.cpp index 7d02a489..0e325ff9 100644 --- a/tdeioslave/imap4/imap4.cpp +++ b/tdeioslave/imap4/imap4.cpp @@ -689,7 +689,7 @@ bool IMAP4Protocol::parseRead(TQByteArray & buffer, ulong len, ulong relay) error (ERR_CONNECTION_BROKEN, myHost); setState(ISTATE_CONNECT); closeConnection(); - return FALSE; + return false; } if (relay > buffer.size()) { @@ -714,7 +714,7 @@ bool IMAP4Protocol::parseRead(TQByteArray & buffer, ulong len, ulong relay) bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay) { - if (myHost.isEmpty()) return FALSE; + if (myHost.isEmpty()) return false; while (true) { ssize_t copyLen = 0; @@ -747,7 +747,7 @@ bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay) readBufferLen -= copyLen; if (readBufferLen) memmove(readBuffer, &readBuffer[copyLen], readBufferLen); - if (buffer[buffer.size() - 1] == '\n') return TRUE; + if (buffer[buffer.size() - 1] == '\n') return true; } if (!isConnectionValid()) { @@ -755,14 +755,14 @@ bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay) error (ERR_CONNECTION_BROKEN, myHost); setState(ISTATE_CONNECT); closeConnection(); - return FALSE; + return false; } if (!waitForResponse( responseTimeout() )) { error(ERR_SERVER_TIMEOUT, myHost); setState(ISTATE_CONNECT); closeConnection(); - return FALSE; + return false; } readBufferLen = read(readBuffer, IMAP_BUFFER - 1); if (readBufferLen == 0) @@ -771,7 +771,7 @@ bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay) error (ERR_CONNECTION_BROKEN, myHost); setState(ISTATE_CONNECT); closeConnection(); - return FALSE; + return false; } } } @@ -1238,7 +1238,7 @@ IMAP4Protocol::special (const TQByteArray & aData) KURL src; KURL dest; stream >> src >> dest; - copy(src, dest, 0, FALSE); + copy(src, dest, 0, false); break; } case 'c': @@ -2068,7 +2068,7 @@ bool IMAP4Protocol::makeLogin () return false; } - if (metaData("nologin") == "on") return TRUE; + if (metaData("nologin") == "on") return true; if (myTLS == "on" && !hasCapability(TQString("STARTTLS"))) { diff --git a/tdeioslave/imap4/imap4.h b/tdeioslave/imap4/imap4.h index d264cce9..e57300e4 100644 --- a/tdeioslave/imap4/imap4.h +++ b/tdeioslave/imap4/imap4.h @@ -156,7 +156,7 @@ protected: outputLine (_str.latin1 (), _str.length()); } void doListEntry (const KURL & _url, int stretch, imapCache * cache = NULL, - bool withFlags = FALSE, bool withSubject = FALSE); + bool withFlags = false, bool withSubject = false); /** * Send a list entry (folder) to the application @@ -184,7 +184,7 @@ private: // This method behaves like the above method but takes an already encoded url, // so you don't have to call KURL::url() for every mail. void doListEntry (const TQString & encodedUrl, int stretch, imapCache * cache = NULL, - bool withFlags = FALSE, bool withSubject = FALSE); + bool withFlags = false, bool withSubject = false); TQString myHost, myUser, myPass, myAuth, myTLS; int myPort; diff --git a/tdeioslave/imap4/imapparser.cpp b/tdeioslave/imap4/imapparser.cpp index bffe88d0..bdb733f3 100644 --- a/tdeioslave/imap4/imapparser.cpp +++ b/tdeioslave/imap4/imapparser.cpp @@ -540,7 +540,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest, if (rest[0] == '[') { rest.pos++; - TQCString option = parseOneWordC(rest, TRUE); + TQCString option = parseOneWordC(rest, true); switch (option[0]) { @@ -1346,7 +1346,7 @@ void imapParser::parseBody (parseString & inWords) TQCString label; inWords.pos++; - specifier = parseOneWordC (inWords, TRUE); + specifier = parseOneWordC (inWords, true); if (inWords[0] == '(') { @@ -1834,7 +1834,7 @@ bool imapParser::parseRead (TQByteArray & buffer, ulong len, ulong relay) Q_UNUSED(relay); tqWarning ("imapParser::parseRead - virtual function not reimplemented - no data read"); - return FALSE; + return false; } bool imapParser::parseReadLine (TQByteArray & buffer, ulong relay) @@ -1843,7 +1843,7 @@ bool imapParser::parseReadLine (TQByteArray & buffer, ulong relay) Q_UNUSED(relay); tqWarning ("imapParser::parseReadLine - virtual function not reimplemented - no data read"); - return FALSE; + return false; } void @@ -1975,11 +1975,11 @@ TQCString imapParser::parseOneWordC (parseString & inWords, bool stopAtBracket, if (len > 0 && inWords[0] == '"') { unsigned int i = 1; - bool quote = FALSE; + bool quote = false; while (i < len && (inWords[i] != '"' || quote)) { if (inWords[i] == '\\') quote = !quote; - else quote = FALSE; + else quote = false; i++; } if (i < len) @@ -2049,7 +2049,7 @@ TQCString imapParser::parseOneWordC (parseString & inWords, bool stopAtBracket, bool imapParser::parseOneNumber (parseString & inWords, ulong & num) { bool valid; - num = parseOneWordC(inWords, TRUE).toULong(&valid); + num = parseOneWordC(inWords, true).toULong(&valid); return valid; } diff --git a/tdeioslave/imap4/imapparser.h b/tdeioslave/imap4/imapparser.h index 623fc8f8..24e4747a 100644 --- a/tdeioslave/imap4/imapparser.h +++ b/tdeioslave/imap4/imapparser.h @@ -382,7 +382,7 @@ public: /** parse one word (maybe quoted) upto next space " ) ] } */ static TQCString parseOneWordC (parseString & inWords, - bool stopAtBracket = FALSE, int *len = 0); + bool stopAtBracket = false, int *len = 0); /** parse one number using parseOneWord */ static bool parseOneNumber (parseString & inWords, ulong & num); diff --git a/tdeioslave/imap4/mimeheader.cpp b/tdeioslave/imap4/mimeheader.cpp index d9d2c7d2..e4ce632c 100644 --- a/tdeioslave/imap4/mimeheader.cpp +++ b/tdeioslave/imap4/mimeheader.cpp @@ -730,7 +730,7 @@ mimeHeader::magicSetType (bool aAutoDecode) TQByteArray body; KMimeMagicResult *result; - KMimeMagic::self ()->setFollowLinks (TRUE); // is it necessary ? + KMimeMagic::self ()->setFollowLinks (true); // is it necessary ? if (aAutoDecode) body = bodyDecodedBinary (); diff --git a/tdeioslave/imap4/rfcdecoder.cpp b/tdeioslave/imap4/rfcdecoder.cpp index 36111bf1..a82ebcd2 100644 --- a/tdeioslave/imap4/rfcdecoder.cpp +++ b/tdeioslave/imap4/rfcdecoder.cpp @@ -360,14 +360,14 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset, } beg = pos + 2; end = beg; - valid = TRUE; + valid = true; // parse charset name for (i = 2, pos += 2; i < maxLen && (*pos != '?' && (ispunct (*pos) || isalnum (*pos))); i++) pos++; if (*pos != '?' || i < 4 || i >= maxLen) - valid = FALSE; + valid = false; else { charset = TQCString (beg, i - 1); // -2 + 1 for the zero @@ -385,7 +385,7 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset, if (pos[2] != '?' || (encoding != 'Q' && encoding != 'B' && encoding != 'q' && encoding != 'b')) - valid = FALSE; + valid = false; pos += 3; i += 3; // kdDebug(7116) << "rfcDecoder::decodeRFC2047String - charset " << charset << " - language " << language << " - '" << pos << "'" << endl; @@ -401,7 +401,7 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset, } end = pos + 2; //end now points to the first char after the encoded string if (i >= maxLen || !*pos) - valid = FALSE; + valid = false; } if (valid) { diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp index 2c63da22..9ab685c8 100644 --- a/tderesources/caldav/resource.cpp +++ b/tderesources/caldav/resource.cpp @@ -827,14 +827,14 @@ bool ResourceCalDav::event ( TQEvent * e ) { if (e->type() == 1000) { // Read done loadFinished(); - return TRUE; + return true; } else if (e->type() == 1001) { // Write done writingFinished(); - return TRUE; + return true; } - else return FALSE; + else return false; } void ResourceCalDav::releaseReadLockout() { @@ -852,7 +852,7 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl, mWriteRetryTimer = new TQTimer(this); connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) ); } - mWriteRetryTimer->start(1000, TRUE); + mWriteRetryTimer->start(1000, true); return false; } diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp index ddd6928e..4bc11df0 100644 --- a/tderesources/carddav/resource.cpp +++ b/tderesources/carddav/resource.cpp @@ -587,14 +587,14 @@ bool ResourceCardDav::event ( TQEvent * e ) { if (e->type() == 1000) { // Read done loadFinished(); - return TRUE; + return true; } else if (e->type() == 1001) { // Write done writingFinished(); - return TRUE; + return true; } - else return FALSE; + else return false; } bool ResourceCardDav::startWriting(const TQString& url) { @@ -611,7 +611,7 @@ bool ResourceCardDav::startWriting(const TQString& url) { mWriteRetryTimer = new TQTimer(this); connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) ); } - mWriteRetryTimer->start(1000, TRUE); + mWriteRetryTimer->start(1000, true); return false; } diff --git a/tderesources/exchange/dateset.cpp b/tderesources/exchange/dateset.cpp index b2622902..5366b029 100644 --- a/tderesources/exchange/dateset.cpp +++ b/tderesources/exchange/dateset.cpp @@ -239,7 +239,7 @@ void DateSet::print() } // Try and merge range i with range i+1 -// NOT TRUE preconditions: range i starts before range i+1, but MAY end later! +// NOT true preconditions: range i starts before range i+1, but MAY end later! // preconditions: range i starts before or in range i+1 bool DateSet::tryMerge( int i ) { |