diff options
97 files changed, 480 insertions, 492 deletions
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index d6ba31af..43300409 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -451,7 +451,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) { if(m_hintHideTime) { - m_hintTimer->start(m_hintHideTime * 1000, TRUE); + m_hintTimer->start(m_hintHideTime * 1000, true); } m_showHint = true; randomHintImage(); diff --git a/kbruch/src/ratio.cpp b/kbruch/src/ratio.cpp index 0ba1e1c4..48827288 100644 --- a/kbruch/src/ratio.cpp +++ b/kbruch/src/ratio.cpp @@ -186,7 +186,7 @@ ratio ratio::operator=(int dummy) return *this; } -/* check, if the ratios are equivalent; -1/2 == 1/-2 -> TRUE */ +/* check, if the ratios are equivalent; -1/2 == 1/-2 -> true */ bool ratio::operator==(ratio right) { signed short orig_sign = 1, right_sign = 1; diff --git a/kbruch/src/task.cpp b/kbruch/src/task.cpp index 50cd2f28..1ebd13e9 100644 --- a/kbruch/src/task.cpp +++ b/kbruch/src/task.cpp @@ -45,18 +45,18 @@ task::~task() * can be customized by the given parameters: * pmax_md: maximum main denominator * pnr_ratios: number of ratios -> pnr_ratios - 1 operations - * padd_sub: if TRUE + and - are allowed operations - * pmul_div: if TRUE * and / are allowed operations */ + * padd_sub: if true + and - are allowed operations + * pmul_div: if true * and / are allowed operations */ void task::create_task(unsigned int pmax_md, short pnr_ratios, - short padd_sub, short pmul_div) + bool padd_sub, bool pmul_div) { unsigned short max_product_length = 0; int main_denominator = 1; /* we say that if add/sub and mul/div are not allowed we want a task * for add/sub only */ - if (padd_sub == NO && pmul_div == NO) - padd_sub = YES; + if (!padd_sub && !pmul_div) + padd_sub = true; do { @@ -395,9 +395,9 @@ unsigned short task::make_operation(short padd_sub, short pmul_div, ShortArray::iterator op_pointer; /* we need this to generate the fitting operations */ - if (padd_sub == YES) + if (padd_sub) operations += 2; - if (pmul_div == YES) + if (pmul_div) operations += 2; /* clear the old operations */ @@ -409,7 +409,7 @@ unsigned short task::make_operation(short padd_sub, short pmul_div, /* if we only wanted mul/div, operations was 2; but we want values * for the operations with 2 and 3 so we have to add 2 */ - if (padd_sub == NO && pmul_div == YES) + if (!padd_sub && pmul_div) { /* loop through all operations and add 2, so that the operations * are interpreted as mul/div and not add/sub */ @@ -418,7 +418,7 @@ unsigned short task::make_operation(short padd_sub, short pmul_div, *op_pointer += 2; } - if (pmul_div == YES) + if (pmul_div) { short flag_counter = 0; @@ -453,13 +453,13 @@ unsigned short task::make_operation(short padd_sub, short pmul_div, max_product_length++; } else - { /* if (pmul_div == YES) */ + { /* if (pmul_div) */ /* a task is given only with add/sub ops; so we want a max. * of pnr_ratios / 2 + 1 prime factors, but at least */ max_product_length = (unsigned short) (float(pnr_ratios) / 2) + 1; if (max_product_length < 2) max_product_length = 2; - } /* if (pmul_div == YES) */ + } /* if (pmul_div) */ return max_product_length; } @@ -580,7 +580,7 @@ void task::make_denominators(int main_denominator, short pmax_md, /* if the ratio is connected to a mul or div operation, we have to do some * extra work and regenerate the denominators */ - if (pmul_div == YES) + if (pmul_div) { /* lets loop through all ratios and check, if there is a mul/div * after the ratio */ @@ -697,7 +697,7 @@ void task::make_denominators(int main_denominator, short pmax_md, } ratio_pointer++; } - } /* if (pmul_div == YES) */ + } /* if (pmul_div) */ return; } diff --git a/kbruch/src/task.h b/kbruch/src/task.h index 57c80b86..806e11b9 100644 --- a/kbruch/src/task.h +++ b/kbruch/src/task.h @@ -23,10 +23,6 @@ #include <vector> -/** important for add_sub and mul_div */ -#define YES 1 -#define NO 0 - /** important for op_vector */ #define ADD 0 #define SUB 1 @@ -73,7 +69,7 @@ public: /** automatically generate a new task with the given parameters */ void create_task(unsigned int pmax_md = 10, short pnr_ratios = 2, - short padd_sub = YES, short pmul_div = NO); + bool padd_sub = true, bool pmul_div = false); /** set ratio n */ void set_ratio_n(unsigned short number = 0, int numerator = 0, diff --git a/kbruch/src/taskwidget.h b/kbruch/src/taskwidget.h index 647da4b2..1644ca87 100644 --- a/kbruch/src/taskwidget.h +++ b/kbruch/src/taskwidget.h @@ -27,10 +27,6 @@ #include <tqwidget.h> -/** important for add_sub and mul_div */ -#define YES 1 -#define NO 0 - /** important for op_vector */ #define ADD 0 #define SUB 1 diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index 06d617a4..f087572d 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -92,7 +92,7 @@ void Keduca::slotFileOpenURL( const KURL &url ) bool Keduca::queryClose() { configWrite(); - return( TRUE ); + return( true ); } void Keduca::configRead() diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp index 83b19467..aa5ff7f4 100644 --- a/keduca/keduca/kquestion.cpp +++ b/keduca/keduca/kquestion.cpp @@ -47,7 +47,7 @@ void KQuestion::initGUI() TQVBox *picBox = new TQVBox( this ); _picture = new TQLabel( picBox, "PixmapLabel1" ); - _picture->setScaledContents( FALSE ); + _picture->setScaledContents( false ); _picture->setPalette( TQPalette( TQt::white ) ); _countdownWidget = new KProgress( picBox ); diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index 2f8bd341..cb05b9e9 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -103,7 +103,7 @@ void KControlHeader::init() Layout12->setSpacing( 6 ); Layout12->setMargin( 0 ); - _headerType = new KComboBox( FALSE, GroupBox7, "_headerType" ); + _headerType = new KComboBox( false, GroupBox7, "_headerType" ); Layout12->addWidget( _headerType ); TQLabel *TextLabel11 = new TQLabel( GroupBox7, "TextLabel11" ); @@ -111,7 +111,7 @@ void KControlHeader::init() TextLabel11->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout12->addWidget( TextLabel11 ); - _headerLevel = new KComboBox( FALSE, GroupBox7, "_headerLevel" ); + _headerLevel = new KComboBox( false, GroupBox7, "_headerLevel" ); Layout12->addWidget( _headerLevel ); Layout13->addLayout( Layout12, 2, 1 ); diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index 361045d5..d7d1edf4 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -312,7 +312,7 @@ bool KEducaBuilder::queryClose () return false; } configWrite(); - return( TRUE ); + return( true ); } /** Add question */ diff --git a/keduca/keducabuilder/keducaeditorstartdialog.h b/keduca/keducabuilder/keducaeditorstartdialog.h index 06d51a5c..cce39e44 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.h +++ b/keduca/keducabuilder/keducaeditorstartdialog.h @@ -36,7 +36,7 @@ public: enum {Rejected=0, OpenDoc=1, OpenRecentDoc=2, Gallery=3, NewDoc=4}StartChoice; /** Constructor. */ - KEducaEditorStartDialog(KEducaBuilder * parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KEducaEditorStartDialog(KEducaBuilder * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /** Destructor. */ virtual ~KEducaEditorStartDialog(); diff --git a/kiten/xjdxgen.c b/kiten/xjdxgen.c index 6f0dbe5c..18afa221 100644 --- a/kiten/xjdxgen.c +++ b/kiten/xjdxgen.c @@ -30,6 +30,7 @@ #include <stdlib.h> #include <ctype.h> #include <string.h> +#include <stdbool.h> #ifdef HAVE_STDINT_H #include <stdint.h> @@ -37,8 +38,6 @@ #include "xjdic.h" -#define TRUE 1 -#define FALSE 0 #define SPTAG '@' #define EXLIM 100 #define TOKENLIM 40 @@ -62,7 +61,7 @@ int stringcomp(unsigned char *s1, unsigned char *s2); void jqsort(int32_t i, int32_t j); int Kstrcmp(uint32_t lhs, uint32_t rhs); void xjdicrc(); -int alphaoreuc(unsigned char x); +bool alphaoreuc(unsigned char x); int stringcomp(unsigned char *s1, unsigned char *s2) { @@ -88,7 +87,8 @@ int main(int argc, char *argv[]) { FILE *fp; uint32_t possav,schi,diclen,indlen; - int i,inwd,cstrp,saving,isc,nodread; + int i,cstrp,isc,nodread; + bool inwd, saving; unsigned char c; unsigned char currstr[TOKENLIM]; @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) JDXname = argv[2]; printf("Commandline request to use files %s and %s \n", Dname, JDXname); - inwd = FALSE; + inwd = false; indptr = 1; llone = 1; if(stat(Dname, &buf) != 0) @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) kana/kanji string and every alphabetic string it finds which is >=3 characters and is not on the "exclude" list */ indptr = 1; - saving = FALSE; + saving = false; cstrp = 0; for (schi =0; schi < dbyte; schi++) /* scan whole dictionary */ { @@ -168,9 +168,9 @@ int main(int argc, char *argv[]) else { currstr[cstrp] = '\0'; - inwd = FALSE; - if ((strlen(currstr) <= 2) && (currstr[0] < 127))saving = FALSE; - if ((strlen(currstr) == 2) && (currstr[1] <= '9'))saving = TRUE; + inwd = false; + if ((strlen(currstr) <= 2) && (currstr[0] < 127))saving = false; + if ((strlen(currstr) == 2) && (currstr[1] <= '9'))saving = true; if (saving && (currstr[0] > 127)) { possav = jindex[indptr]; @@ -237,12 +237,12 @@ int main(int argc, char *argv[]) { if (alphaoreuc(c) || c == SPTAG) { - inwd = TRUE; + inwd = true; jindex[indptr] = schi; cstrp = 1; currstr[0] = c; currstr[1] = '\0'; - saving = TRUE; + saving = true; } } } @@ -374,7 +374,7 @@ void xjdicrc() rcwd = (unsigned char *)strtok(rcstr," \t"); if( stringcomp((unsigned char *)"exlist",rcwd) == 0) { - while (TRUE) + while (true) { rcwd = (unsigned char *)strtok(NULL," \t\f\r\n"); if (rcwd == NULL) break; @@ -401,23 +401,23 @@ void xjdicrc() } */ /*=======function to test a character for alpha or kana/kanji====*/ -int alphaoreuc(unsigned char x) +bool alphaoreuc(unsigned char x) { int c; c = x & 0xff; if(((c >= 65) && (c <= 90)) || ((c >= 97) && (c <= 122))) { - return (TRUE); + return true; } if ((c >= '0') && (c <= '9')) { - return(TRUE); + return true; } if ((c & 0x80) > 0) { - return(TRUE); + return true; } - return (FALSE); + return false; } diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp index 3375603d..8e6d7a6d 100644 --- a/klatin/klatin/klatin.cpp +++ b/klatin/klatin/klatin.cpp @@ -87,7 +87,7 @@ void KLatin::loadVocab() // Set this widget as the central widget setCentralWidget(klatinvocabsection); - updateSection(FALSE); + updateSection(false); // When the child emits the signal exitted(), // then reset the GUI to go back to the menu @@ -107,7 +107,7 @@ void KLatin::loadGrammar() slotWriteMsg(i18n("Grammar")); // Disable all the menu entries under Section/ - updateSection(FALSE); + updateSection(false); // Set this widget as the central widget setCentralWidget(klatingrammarsection); @@ -135,7 +135,7 @@ void KLatin::loadVerbs() slotWriteMsg(i18n("Verbs")); // Disable all the menu entries under Section/ - updateSection(FALSE); + updateSection(false); // Set this widget as the central widget setCentralWidget(klatinverbssection); @@ -194,7 +194,7 @@ void KLatin::resetGUI() connect(klatinchoose->QuitButton, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit())); // Enable all the menu entries under Section/ - updateSection(TRUE); + updateSection(true); // Use XML GUI to construct the menubar setupGUI(); diff --git a/klatin/klatin/klatin.kcfg b/klatin/klatin/klatin.kcfg index 38431aa5..d2f21767 100644 --- a/klatin/klatin/klatin.kcfg +++ b/klatin/klatin/klatin.kcfg @@ -17,7 +17,7 @@ filename += m_language; TQDir check(filename); - if (check.exists() == FALSE) { + if (!check.exists()) { m_language = "en"; } kdDebug()<< m_language <<endl; diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp index c9a67814..f6e0d616 100644 --- a/klatin/klatin/klatingrammar.cpp +++ b/klatin/klatin/klatingrammar.cpp @@ -115,7 +115,7 @@ void KLatinGrammar::loadDatabase() // Check whether the file actually exists // If not - warn user. - if (TQFile::exists(locate("data", file)) == FALSE) { + if (!TQFile::exists(locate("data", file))) { KMessageBox::error(this, i18n("Could not load grammar-definition file, check KLatin installation."), i18n("Error with KLatin")); QuestionLabel->setText(i18n("Error.")); return; diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp index f1a3880d..5ecc8383 100644 --- a/klatin/klatin/klatinverbs.cpp +++ b/klatin/klatin/klatinverbs.cpp @@ -105,7 +105,7 @@ void KLatinVerbs::loadDatabase() TQString fileName = "klatin/data/verbs/" + databaseFile; - if (TQFile::exists(locate("data", fileName)) == FALSE) { + if (!TQFile::exists(locate("data", fileName))) { KMessageBox::error(this, i18n("Could not load verb-definition file, check KLatin installation."), i18n("Error with KLatin")); goBack(); } diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp index 8181d7af..6c83d22b 100644 --- a/klatin/klatin/klatinvocab.cpp +++ b/klatin/klatin/klatinvocab.cpp @@ -86,7 +86,7 @@ void KLatinVocab::parseVocab(TQString customFile) // Check whether file exists or not // If not then regenerate working default - if (TQFile::exists(fileName) == FALSE) { + if (!TQFile::exists(fileName)) { TDEConfigBase *globalConf = TDEGlobal::config(); globalConf->setGroup("Locale"); @@ -98,7 +98,7 @@ void KLatinVocab::parseVocab(TQString customFile) TQDir checkLang(fileNameLang); - if (checkLang.exists() == FALSE) { + if (!checkLang.exists()) { language = "en"; } @@ -106,7 +106,7 @@ void KLatinVocab::parseVocab(TQString customFile) TQString defaultFile = (fileNameLang + "/" + vocabDirectory[0]); - if (TQFile::exists(defaultFile) == FALSE) { + if (!TQFile::exists(defaultFile)) { KMessageBox::error(this, i18n("Could not load vocabulary file; there is a problem with your KLatin installation."), i18n("Error with KLatin")); kapp->quit(); } else { @@ -211,7 +211,7 @@ void KLatinVocab::newQuestion() // Initialise a couple of temporary variables int i = 0, j = 0, tempRand[4]; - bool override = FALSE; + bool override = false; // Assign m_choiceWords with the 4 words // to go into the multiple choice. Make sure @@ -242,15 +242,15 @@ void KLatinVocab::newQuestion() } // Make sure the actual answer isn't already in m_choiceWords - // If it is, set override to be TRUE + // If it is, set override to be true for (i = 0; i < 4; i++) { if (m_choiceWords[4] == m_choiceWords[i]) { m_lastAnswerNumber = i; - override = TRUE; + override = true; } } - bool exitLoop = FALSE; + bool exitLoop = false; // Override a random variable with the correct // answer @@ -260,7 +260,7 @@ void KLatinVocab::newQuestion() if (answerNumber != m_lastAnswerNumber) { m_choiceWords[answerNumber] = m_texts[randNum].second; m_lastAnswerNumber = answerNumber; - exitLoop = TRUE; + exitLoop = true; } else { answerNumber = (random() % 3); } @@ -348,7 +348,7 @@ void KLatinVocab::resultsDialog() { // Show the results dialog - results = new KLatinResultsDialog(this, 0, TRUE); + results = new KLatinResultsDialog(this, 0, true); results->CloseButton->setGuiItem(KStdGuiItem::close()); int temp = Score2Label->text().toInt(); diff --git a/kmplot/kmplot/kmplot.kcfg b/kmplot/kmplot/kmplot.kcfg index df9eba38..0013ab68 100644 --- a/kmplot/kmplot/kmplot.kcfg +++ b/kmplot/kmplot/kmplot.kcfg @@ -208,10 +208,10 @@ <whatsthis>If relative step width is set to true, the step width will be adapted to the size of the window.</whatsthis> <default>true</default> </entry> - <entry name="anglemode" type="Int"> + <entry name="anglemode" type="Bool"> <label>Radians instead of degrees</label> <whatsthis>Check the box if you want to use radians</whatsthis> - <default>0</default> + <default>false</default> </entry> <entry name="backgroundcolor" type="Color"> <label>Background color</label> diff --git a/kmplot/kmplot/parser.cpp b/kmplot/kmplot/parser.cpp index eaa741ff..13d37681 100644 --- a/kmplot/kmplot/parser.cpp +++ b/kmplot/kmplot/parser.cpp @@ -142,9 +142,9 @@ Parser::~Parser() } } -void Parser::setAngleMode(int angle) +void Parser::setAngleMode(bool angle) { - if(angle==0) + if(!angle) m_anglemode = 1; else m_anglemode = M_PI/180; diff --git a/kmplot/kmplot/parser.h b/kmplot/kmplot/parser.h index 559fb53e..f975156a 100644 --- a/kmplot/kmplot/parser.h +++ b/kmplot/kmplot/parser.h @@ -201,12 +201,12 @@ public: /// Returns the ID-number of the function "name". If the function couldn't be found, -1 is returned. int fnameToId(const TQString &name); /// Returns the current error value. If showMessageBox is true, an error message box will appear if an error was found - int parserError(bool showMessageBox=TRUE); + int parserError(bool showMessageBox=true); /// return the angletype static double anglemode(); - /// Sets the angletype. TRUE is radians and FALSE degrees - void setAngleMode(int); + /// Sets the angletype. true is radians and false degrees + void setAngleMode(bool); /// sets the decimal symbol void setDecimalSymbol(const TQString ); diff --git a/kpercentage/kpercentage/kanimation.cpp b/kpercentage/kpercentage/kanimation.cpp index 9be8601d..8716b481 100644 --- a/kpercentage/kpercentage/kanimation.cpp +++ b/kpercentage/kpercentage/kanimation.cpp @@ -31,9 +31,9 @@ KFrame::~KFrame() KScene::KScene() { current_frame_number = 0; - setAutoDelete( TRUE ); - following = new TQStrList( TRUE ); // deep copy - following->setAutoDelete( TRUE ); + setAutoDelete( true ); + following = new TQStrList( true ); // deep copy + following->setAutoDelete( true ); } KScene::~KScene() diff --git a/kpercentage/kpercentage/kanswer.cpp b/kpercentage/kpercentage/kanswer.cpp index 93270322..e4126eaf 100644 --- a/kpercentage/kpercentage/kanswer.cpp +++ b/kpercentage/kpercentage/kanswer.cpp @@ -40,7 +40,7 @@ #include "kanimation.h" #include "kanswer.h" -KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE ) +KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", true ) { setFont( parent->font() ); // fix size for the background pixmap @@ -222,9 +222,9 @@ void KAnswer::setupSprite() pixs = new TQCanvasPixmapArray( locate( "data", "kpercentage/pics/" )+"smily%1.png", 7 ); right_animation = new KAnimation( locate( "data", "kpercentage/story/right.story" ), pixs , canvas ); - right_animation->setAnimated( TRUE ); + right_animation->setAnimated( true ); wrong_animation = new KAnimation( locate( "data", "kpercentage/story/wrong.story" ), pixs , canvas ); - wrong_animation->setAnimated( TRUE ); + wrong_animation->setAnimated( true ); canvas_view = new TQCanvasView( canvas, this ); canvas_view->resize( size() ); diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp index 1035381e..5b3ffef7 100644 --- a/kpercentage/kpercentage/kpercentmain.cpp +++ b/kpercentage/kpercentage/kpercentmain.cpp @@ -43,7 +43,7 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : - KDialog( parent, name, TRUE ) // TRUE for modal dialog + KDialog( parent, name, true ) // true for modal dialog { setFont( parent->font() ); /** load and set the background pixmap */ @@ -75,7 +75,7 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : progress_bar_right_wrong->setFrameShape( TQProgressBar::Panel ); progress_bar_right_wrong->setFrameShadow( TQProgressBar::Sunken ); // progress_bar_right_wrong->setFixedWidth( 250 ); - progress_bar_right_wrong->setPercentageVisible( FALSE ); + progress_bar_right_wrong->setPercentageVisible( false ); progress_bar_right_wrong->setPaletteBackgroundColor( TQColor( "red" ) ); label_right = new TQLabel( this, "" ); @@ -87,7 +87,7 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : push_button_apply = new TQPushButton( this, "push_button_apply" ); push_button_apply->setText( KStdGuiItem::apply().text() ); - push_button_apply->setDefault( TRUE ); + push_button_apply->setDefault( true ); push_button_apply->setBackgroundPixmap( bgp); push_button_apply->setBackgroundOrigin( TQPushButton::ParentOrigin ); diff --git a/kpercentage/kpercentage/ksplashscreen.cpp b/kpercentage/kpercentage/ksplashscreen.cpp index a97c85e2..dcf75333 100644 --- a/kpercentage/kpercentage/ksplashscreen.cpp +++ b/kpercentage/kpercentage/ksplashscreen.cpp @@ -32,7 +32,7 @@ /* creates the splash window without titlebar and border */ KSplashScreen::KSplashScreen( KPercentage *percentage, const char *name ) : - KDialog( 0L, name, FALSE, TQWidget::WStyle_Customize | TQWidget::WStyle_NoBorder ) + KDialog( 0L, name, false, TQWidget::WStyle_Customize | TQWidget::WStyle_NoBorder ) { percentage_window = percentage; resize( 380, 300 ); diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 75810808..ffb3f65c 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -187,7 +187,7 @@ void AddCatDialog::slotShowDataFile() { if ( ! acd->DataURL->url().isEmpty() && dataFile.open( IO_ReadOnly ) ) { acd->DataFileBox->clear(); TQTextStream dataStream( &dataFile ); - acd->DataFileBox->insertStringList( TQStringList::split( "\n", dataStream.read(), TRUE ) ); + acd->DataFileBox->insertStringList( TQStringList::split( "\n", dataStream.read(), true ) ); dataFile.close(); } } diff --git a/kstars/kstars/addlinkdialog.h b/kstars/kstars/addlinkdialog.h index dddad8f5..23206924 100644 --- a/kstars/kstars/addlinkdialog.h +++ b/kstars/kstars/addlinkdialog.h @@ -60,7 +60,7 @@ public: */ void setDesc( const TQString &s ) { ald->DescBox->setText( s ); } -/**@return TRUE if user declared the link is an image */ +/**@return true if user declared the link is an image */ bool isImageLink() const { return ald->ImageRadio->isChecked(); } /**@short Set the link type diff --git a/kstars/kstars/colorscheme.h b/kstars/kstars/colorscheme.h index 696abcc0..e6190c8e 100644 --- a/kstars/kstars/colorscheme.h +++ b/kstars/kstars/colorscheme.h @@ -93,13 +93,13 @@ class ColorScheme { /**Load a color scheme from a *.colors file *@p filename the filename of the color scheme to be loaded. - *@return TRUE if the scheme was successfully loaded + *@return true if the scheme was successfully loaded */ bool load( const TQString &filename ); /**Save the current color scheme to a *.colors file. *@p name the filename to create - *@return TRUE if the color scheme is successfully writeen to a file + *@return true if the color scheme is successfully writeen to a file */ bool save( const TQString &name ); diff --git a/kstars/kstars/dms.h b/kstars/kstars/dms.h index b66814da..cc7bfaf1 100644 --- a/kstars/kstars/dms.h +++ b/kstars/kstars/dms.h @@ -348,7 +348,7 @@ public: *@li space-delimited ( 5 0 0; -33 0 0 ) or ( 5 0.0 or -33 0.0 ) *@li space-delimited, with unit labels ( 5h 0m 0s or -33d 0m 0s ) *@param s the string to be parsed as an angle value - *@param deg if TRUE, s is expressed in degrees; if FALSE, s is expressed in hours + *@param deg if true, s is expressed in degrees; if false, s is expressed in hours *@return a dms object whose value is parsed from the string argument */ static dms fromString(TQString & s, bool deg); diff --git a/kstars/kstars/dmsbox.h b/kstars/kstars/dmsbox.h index 8b5ccb7d..7b04b411 100644 --- a/kstars/kstars/dmsbox.h +++ b/kstars/kstars/dmsbox.h @@ -49,10 +49,10 @@ public: /**Constructor for the dmsBox object. *@param parent pointer to the parent TQWidget *@param ni the name of the object - *@param deg if TRUE use deg/arcmin/arcsec; otherwise + *@param deg if true use deg/arcmin/arcsec; otherwise * use hours/min/sec. */ - dmsBox(TQWidget *parent, const char *ni=0, bool deg=TRUE); + dmsBox(TQWidget *parent, const char *ni=0, bool deg=true); /**Destructor (empty)*/ ~dmsBox(); @@ -82,19 +82,19 @@ public: /**Display an angle. Simply calls showInDegrees(t) or *showInHours(t) depending on the value of deg. *@param t the dms object which is to be displayed. - *@param deg if TRUE, display Deg/Arcmin/Arcsec; otherwise + *@param deg if true, display Deg/Arcmin/Arcsec; otherwise *display Hours/Min/Sec. */ - void show(dms t, bool deg=TRUE); + void show(dms t, bool deg=true); /**Display an angle. Simply calls showInDegrees(t) or *showInHours(t) depending on the value of deg. *This behaves essentially like the above function. It *differs only in the data type of its argument. *@param t the dms object which is to be displayed. - *@param deg if TRUE, display Deg/Arcmin/Arcsec; otherwise + *@param deg if true, display Deg/Arcmin/Arcsec; otherwise *display Hours/Min/Sec. */ - void show(const dms *t,bool deg=TRUE); + void show(const dms *t,bool deg=true); /**Simply display a string. *@note JH: Why don't we just use KLineEdit::setText() instead? @@ -107,12 +107,12 @@ public: *or colons) representing deg/hrs, min, sec. It is also possible to have two *fields. In this case, if the second field is a double, it is converted *to decimal min and double sec. - *@param deg if TRUE use deg/arcmin/arcsec; otherwise + *@param deg if true use deg/arcmin/arcsec; otherwise * use hours/min/sec. *@param ok set to true if a dms object was succedssfully created. *@return a dms object constructed from the fields of the dmsbox */ - dms createDms(bool deg=TRUE, bool *ok=0); + dms createDms(bool deg=true, bool *ok=0); /**@return a boolean indicating if object contains degrees or hours */ diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp index 324b0690..81cbc711 100644 --- a/kstars/kstars/draglistbox.cpp +++ b/kstars/kstars/draglistbox.cpp @@ -24,8 +24,8 @@ DragListBox::DragListBox( TQWidget *parent, const char *name, WFlags f ) : TDEListBox( parent, name, f ) { - setAcceptDrops( TRUE ); - dragging = FALSE; + setAcceptDrops( true ); + dragging = false; } DragListBox::~DragListBox() {} @@ -70,7 +70,7 @@ void DragListBox::dropEvent( TQDropEvent *evt ) { void DragListBox::mousePressEvent( TQMouseEvent *evt ) { TQListBox::mousePressEvent( evt ); - dragging = TRUE; + dragging = true; //Record position of the Ignore item; we may have to restore it. if ( currentText() == i18n("Ignore") ) @@ -85,7 +85,7 @@ void DragListBox::mouseMoveEvent( TQMouseEvent * ) if ( dragging ) { TQDragObject *drag = new TQTextDrag( currentText(), this ); drag->dragMove(); - dragging = FALSE; + dragging = false; } } diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h index 870bde3f..dc4e1231 100644 --- a/kstars/kstars/imagesequence.h +++ b/kstars/kstars/imagesequence.h @@ -24,7 +24,7 @@ class imagesequence : public imgSequenceDlg public: - imagesequence(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + imagesequence(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~imagesequence(); diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index 67d217ec..e508789d 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp @@ -14,7 +14,6 @@ #include <unistd.h> #include <fcntl.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 @@ -203,7 +202,7 @@ void CCameraIO::RegWrite( short reg, unsigned short val ) m_RegShadow[ Reg_BICCounter ] = val; break; default: - _ASSERT( FALSE ); // application program bug + _ASSERT( false ); // application program bug } } diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp index 16a6bb72..41fd4fe5 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp @@ -13,7 +13,6 @@ #include <fcntl.h> #include <stdio.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp index a83a594e..80d66fdc 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp @@ -13,7 +13,6 @@ #include <fcntl.h> #include <stdio.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp index 7025d9ce..b9613498 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp @@ -13,7 +13,6 @@ #include <fcntl.h> #include <stdio.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 diff --git a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp index 3e6cc43e..65ab972d 100644 --- a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp @@ -72,7 +72,7 @@ long CCameraIO_PCI::Read(unsigned short reg, unsigned short& val) RegNumber = RegPCI_CommandReadback; break; default: - _ASSERT( FALSE ); // Application program bug + _ASSERT( false ); // Application program bug val = 0; return 0; } @@ -348,7 +348,7 @@ bool CCameraIO_PCI::InitDriver() return false; } - BOOL IoctlResult = DeviceIoControl( + BOOLEAN IoctlResult = DeviceIoControl( m_hDriver, // Handle to device IOCTL_PCI_BUS_SCAN, // IO Control code for PCI Bus Scan NULL, // Buffer to driver. diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index 23914204..1fb309f4 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -404,15 +404,15 @@ int INDI_D::setLabelState (INDI_P *pp, XMLEle *root, char errmsg[]) if (islight) break; - lp->push_w->setDown(state == PS_ON ? true : false); + lp->push_w->setDown(state == PS_ON); buttonFont = lp->push_w->font(); - buttonFont.setBold(state == PS_ON ? TRUE : FALSE); + buttonFont.setBold(state == PS_ON); lp->push_w->setFont(buttonFont); break; case PG_RADIO: - lp->check_w->setChecked(state == PS_ON ? true : false); + lp->check_w->setChecked(state == PS_ON); break; case PG_MENU: if (state == PS_ON) diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 9729ae76..b227ae27 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -46,7 +46,7 @@ /* * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index a69fa2cc..4e2a7759 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -378,7 +378,7 @@ void INDI_E::setupElementRead(int length) read_w->setFrameShadow( KLineEdit::Plain ); read_w->setCursorPosition( 0 ); read_w->setAlignment( int( KLineEdit::AlignHCenter ) ); - read_w->setReadOnly( TRUE ); + read_w->setReadOnly( true ); read_w->setText(text); EHBox->addWidget(read_w); diff --git a/kstars/kstars/indifitsconf.h b/kstars/kstars/indifitsconf.h index 5344e223..09e6aa34 100644 --- a/kstars/kstars/indifitsconf.h +++ b/kstars/kstars/indifitsconf.h @@ -18,7 +18,7 @@ class INDIFITSConf : public INDIConf public: - INDIFITSConf(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + INDIFITSConf(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~INDIFITSConf(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index 9603e201..d828ca8f 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -278,14 +278,14 @@ void INDI_P::newSwitch(int id) el.at(i)->push_w->setDown(false); buttonFont = el.at(i)->push_w->font(); - buttonFont.setBold(FALSE); + buttonFont.setBold(false); el.at(i)->push_w->setFont(buttonFont); el.at(i)->state = PS_OFF; } lp->push_w->setDown(true); buttonFont = lp->push_w->font(); - buttonFont.setBold(TRUE); + buttonFont.setBold(true); lp->push_w->setFont(buttonFont); lp->state = PS_ON; @@ -754,7 +754,7 @@ int INDI_P::buildSwitchesGUI(XMLEle *root, char errmsg[]) { button->setDown(true); buttonFont = button->font(); - buttonFont.setBold(TRUE); + buttonFont.setBold(true); button->setFont(buttonFont); } diff --git a/kstars/kstars/infobox.h b/kstars/kstars/infobox.h index 2c255543..591ed1d6 100644 --- a/kstars/kstars/infobox.h +++ b/kstars/kstars/infobox.h @@ -47,7 +47,7 @@ public: /**General constructor. Specify The text string, x,y position and size. *@param x the X-coordinate for the box *@param y the Y-coordinate for the box - *@param shade if TRUE, apply text shading as well + *@param shade if true, apply text shading as well *@param t1 The first line of text *@param t2 The second line of text *@param t3 The third line of text @@ -58,7 +58,7 @@ public: *This behaves just like the above function. It differs only in the data types *of its arguments. *@param p The (x,y) position of the box - *@param shade if TRUE, apply text shading as well + *@param shade if true, apply text shading as well *@param t1 The first line of text *@param t2 The second line of text *@param t3 The third line of text @@ -113,7 +113,7 @@ public: /**Make sure the InfoBox is inside (or outside) the TQRect r. *@return true if the function was able to obey the constraint. *@param r the Rect which the box must lie completely inside/outside of. - *@param inside if TRUE (the default), the box must lie inside the rect r. + *@param inside if true (the default), the box must lie inside the rect r. *Otherwise, the box must lie *outside* rect r. */ bool constrain( TQRect r, bool inside=true ); @@ -173,10 +173,10 @@ public: /**@return the geometry of the box*/ TQRect rect() const; - /**@return TRUE if the box is anchored to the right window edge*/ + /**@return true if the box is anchored to the right window edge*/ bool anchorRight() const { return ( AnchorFlag & AnchorRight ); } - /**@return TRUE if the box is anchored to the bottom window edge*/ + /**@return true if the box is anchored to the bottom window edge*/ bool anchorBottom() const { return ( AnchorFlag & AnchorBottom ); } /**Set the box to be anchored to the right window edge*/ diff --git a/kstars/kstars/infoboxes.h b/kstars/kstars/infoboxes.h index 84552cb0..45410684 100644 --- a/kstars/kstars/infoboxes.h +++ b/kstars/kstars/infoboxes.h @@ -54,13 +54,13 @@ public: *(typically the height of the SkyMap) *@param tx the x-position of the Time infobox *@param ty the y-position of the Time infobox - *@param tshade if TRUE, apply text shading to the Time infobox + *@param tshade if true, apply text shading to the Time infobox *@param gx the x-position of the Geographic infobox *@param gy the y-position of the Geographic infobox - *@param gshade if TRUE, apply text shading to the Geographic infobox + *@param gshade if true, apply text shading to the Geographic infobox *@param fx the x-position of the Focus-object infobox *@param fy the y-position of the Focus-object infobox - *@param fshade if TRUE, apply text shading to the Focus-object infobox + *@param fshade if true, apply text shading to the Focus-object infobox *@param colorText The foreground color for infoboxes *@param colorGrab The foreground color for infoboxes, while they are *"grabbed" by the user @@ -85,11 +85,11 @@ public: *@param h The height of the region in which the boxes can be drawn *(typically the height of the SkyMap) *@param tp the position of the Time infobox - *@param tshade if TRUE, apply text shading to the Time infobox + *@param tshade if true, apply text shading to the Time infobox *@param gp the position of the Geographic infobox - *@param gshade if TRUE, apply text shading to the Geographic infobox + *@param gshade if true, apply text shading to the Geographic infobox *@param fp the position of the Focus-object infobox - *@param fshade if TRUE, apply text shading to the Focus-object infobox + *@param fshade if true, apply text shading to the Focus-object infobox *@param colorText The foreground color for infoboxes *@param colorGrab The foreground color for infoboxes, while they are *"grabbed" by the user diff --git a/kstars/kstars/jupitermoons.h b/kstars/kstars/jupitermoons.h index 4555d74a..230c4d1f 100644 --- a/kstars/kstars/jupitermoons.h +++ b/kstars/kstars/jupitermoons.h @@ -69,7 +69,7 @@ public: */ SkyPoint* pos( int id ) { return &Pos[id]; } - /**@return TRUE if the Moon is nearer to Earth than Jupiter. + /**@return true if the Moon is nearer to Earth than Jupiter. *@param id which moon? 0=Io, 1=Europa, 2=Ganymede, 3=Callisto */ bool inFront( int id ) const { return InFront[id]; } diff --git a/kstars/kstars/ksfilereader.h b/kstars/kstars/ksfilereader.h index 91da9b75..c3a18d1f 100644 --- a/kstars/kstars/ksfilereader.h +++ b/kstars/kstars/ksfilereader.h @@ -44,7 +44,7 @@ public: /**Destructor*/ ~KSFileReader(); - /**@return TRUE if we are not yet at the end of the file. + /**@return true if we are not yet at the end of the file. */ bool hasMoreLines(); diff --git a/kstars/kstars/ksplanetbase.cpp b/kstars/kstars/ksplanetbase.cpp index 87f5e004..4b787318 100644 --- a/kstars/kstars/ksplanetbase.cpp +++ b/kstars/kstars/ksplanetbase.cpp @@ -45,7 +45,7 @@ KSPlanetBase::KSPlanetBase( KStarsData *kd, TQString s, TQString image_file, dou PositionAngle = 0.0; ImageAngle = 0.0; PhysicalSize = pSize; - Trail.setAutoDelete( TRUE ); + Trail.setAutoDelete( true ); } void KSPlanetBase::EquatorialToEcliptic( const dms *Obliquity ) { diff --git a/kstars/kstars/kspopupmenu.h b/kstars/kstars/kspopupmenu.h index 3bf65828..e2031e81 100644 --- a/kstars/kstars/kspopupmenu.h +++ b/kstars/kstars/kspopupmenu.h @@ -76,8 +76,8 @@ public: *"Add link..." item will be included, which allows the user to add their own cutsom *URLs for this object. *@param obj pointer to the skyobject which the menu describes - *@param showDSS if TRUE, include DSS Image links - *@param allowCustom if TRUE, include the "Add Link..." item + *@param showDSS if true, include DSS Image links + *@param allowCustom if true, include the "Add Link..." item */ void addLinksToMenu( SkyObject *obj, bool showDSS=true, bool allowCustom=true ); diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index 598e4028..f6936056 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -88,41 +88,41 @@ KStarsData::KStarsData() : stdDirs(0), locale(0), //initialize FOV symbol fovSymbol = FOV(); - //set AutoDelete property for TQPtrLists. Most are set TRUE, - //but some 'meta-lists' need to be FALSE. - starList.setAutoDelete( TRUE ); - ADVtreeList.setAutoDelete( TRUE ); - geoList.setAutoDelete( TRUE ); - deepSkyList.setAutoDelete( TRUE ); // list of all deep space objects + //set AutoDelete property for TQPtrLists. Most are set true, + //but some 'meta-lists' need to be false. + starList.setAutoDelete( true ); + ADVtreeList.setAutoDelete( true ); + geoList.setAutoDelete( true ); + deepSkyList.setAutoDelete( true ); // list of all deep space objects //separate lists for each deep-sky catalog. The objects are duplicates of //deepSkyList, so do not delete them twice! - deepSkyListMessier.setAutoDelete( FALSE ); - deepSkyListNGC.setAutoDelete( FALSE ); - deepSkyListIC.setAutoDelete( FALSE ); - deepSkyListOther.setAutoDelete( FALSE ); + deepSkyListMessier.setAutoDelete( false ); + deepSkyListNGC.setAutoDelete( false ); + deepSkyListIC.setAutoDelete( false ); + deepSkyListOther.setAutoDelete( false ); //ObjLabelList does not construct new objects, so no autoDelete needed - ObjLabelList.setAutoDelete( FALSE ); + ObjLabelList.setAutoDelete( false ); - cometList.setAutoDelete( TRUE ); - asteroidList.setAutoDelete( TRUE ); + cometList.setAutoDelete( true ); + asteroidList.setAutoDelete( true ); //Constellation lines are now pointers to existing StarObjects; //these are already auto-deleted by starList. - clineList.setAutoDelete( FALSE ); - clineModeList.setAutoDelete( TRUE ); - cnameList.setAutoDelete( TRUE ); - csegmentList.setAutoDelete( TRUE ); - - Equator.setAutoDelete( TRUE ); - Ecliptic.setAutoDelete( TRUE ); - Horizon.setAutoDelete( TRUE ); - for ( unsigned int i=0; i<11; ++i ) MilkyWay[i].setAutoDelete( TRUE ); - - VariableStarsList.setAutoDelete(TRUE); - INDIHostsList.setAutoDelete(TRUE); - INDITelescopeList.setAutoDelete(TRUE); + clineList.setAutoDelete( false ); + clineModeList.setAutoDelete( true ); + cnameList.setAutoDelete( true ); + csegmentList.setAutoDelete( true ); + + Equator.setAutoDelete( true ); + Ecliptic.setAutoDelete( true ); + Horizon.setAutoDelete( true ); + for ( unsigned int i=0; i<11; ++i ) MilkyWay[i].setAutoDelete( true ); + + VariableStarsList.setAutoDelete(true); + INDIHostsList.setAutoDelete(true); + INDITelescopeList.setAutoDelete(true); //Initialize object type strings TypeName[0] = i18n( "star" ); diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h index 390a68eb..3c835da3 100644 --- a/kstars/kstars/kstarsdata.h +++ b/kstars/kstars/kstarsdata.h @@ -283,7 +283,7 @@ public: *@li 13-15 IAU Abbreviation [string] e.g., 'Ori' == Orion *@li 17- Constellation name [string] *@short Read in constellation name data. - *@return TRUE if data file was successfully read. + *@return true if data file was successfully read. */ bool readCNameData( void ); @@ -302,7 +302,7 @@ public: *word-by-word, rather than line-by-line as we do in other files. * *@short Read in the constellation boundary data. - *@return TRUE if the boundary data is successfully parsed. + *@return true if the boundary data is successfully parsed. */ bool readCBoundData( void ); @@ -367,7 +367,7 @@ public: /**@short open a file containing URL links. *@param urlfile string representation of the filename to open *@param file reference to the TQFile object which will be opened to this file. - *@return TRUE if file successfully opened. + *@return true if file successfully opened. */ bool openURLFile(TQString urlfile, TQFile& file); @@ -526,7 +526,7 @@ public: *be used if you have previously called setSnapNextFocus(true), but then decided *you didn't want that after all. In other words, it's extremely unlikely you'd *ever want to use setSnapNextFocus(false). - *@param b when TRUE (the default), the next Focus chnage will omit the slewing + *@param b when true (the default), the next Focus chnage will omit the slewing *animation. */ void setSnapNextFocus(bool b=true) { snapToFocus = b; } @@ -536,7 +536,7 @@ public: *a sky image in command-line dump mode). *@param name the filename of the script to "execute". *@param map pointer to the SkyMap object. - *@return TRUE if the script was successfully parsed. + *@return true if the script was successfully parsed. */ bool executeScript( const TQString &name, SkyMap *map ); @@ -596,17 +596,17 @@ public slots: void setTimeDirection( float scale ); /**@short Save the shaded state of the Time infobox. - *@param b TRUE if the box is shaded + *@param b true if the box is shaded */ void saveTimeBoxShaded( bool b ); /**@short Save the shaded state of the Geo infobox. - *@param b TRUE if the box is shaded + *@param b true if the box is shaded */ void saveGeoBoxShaded( bool b ); /**@short Save the shaded state of the Focus infobox. - *@param b TRUE if the box is shaded + *@param b true if the box is shaded */ void saveFocusBoxShaded( bool b ); @@ -656,7 +656,7 @@ private: *was marked as "required", then abort the program when the messagebox is closed. *Otherwise, continue loading the program. *@param fn the name of the file which could not be opened. - *@param required if TRUE, then the error message is more severe, and the program + *@param required if true, then the error message is more severe, and the program *exits when the messagebox is closed. */ void initError(TQString fn, bool required); diff --git a/kstars/kstars/kstarsinterface.h b/kstars/kstars/kstarsinterface.h index 5bf2aa2c..2df3adc4 100644 --- a/kstars/kstars/kstarsinterface.h +++ b/kstars/kstars/kstarsinterface.h @@ -107,7 +107,7 @@ class KStarsInterface : virtual public DCOPObject /**Turn tracking mode on or off. If tracking is on, then the coordinates at *the center of the screen remain fixed with time. If tracking is off, then *the sky "drifts" past the screen at the sidereal rate. - *@param track if TRUE, turn tracking on; otherwise turn it off. + *@param track if true, turn tracking on; otherwise turn it off. */ virtual ASYNC setTracking( bool track ) = 0; diff --git a/kstars/kstars/objectnamelist.h b/kstars/kstars/objectnamelist.h index 63f5349a..4ff9bbb5 100644 --- a/kstars/kstars/objectnamelist.h +++ b/kstars/kstars/objectnamelist.h @@ -56,7 +56,7 @@ class ObjectNameList { /**Appends a skyobject to the list. *@param object pointer to the SkyObject to be appended to the list. - *@param useLongName if TRUE, use the longname of the object, + *@param useLongName if true, use the longname of the object, *rather than the primary name */ void append(SkyObject *object, bool useLongName=false); diff --git a/kstars/kstars/skymap.h b/kstars/kstars/skymap.h index cdc52fdc..55c4da2e 100644 --- a/kstars/kstars/skymap.h +++ b/kstars/kstars/skymap.h @@ -353,7 +353,7 @@ public: *so we save a lot of time by bringing the code which sets their values outside of checkVisibility() *(which must be run for each and every SkyPoint). setMapGeometry() is called once in paintEvent(). *The variables set by setMapGeometry are: - *@li isPoleVisible TRUE if a coordinate Pole is on-screen + *@li isPoleVisible true if a coordinate Pole is on-screen *@li XMax the horizontal center-to-edge angular distance *@li guideXMax a version of XMax used for guide lines (same as XMax at low zoom; 2x XMAX otherwise) *@li guideFOV similar to guideXMax, but for the vertical direction. @@ -431,7 +431,7 @@ public slots: *There are two cases: the true altitude is known, and the apparent altitude is needed; *or the apparent altitude is known and the true altitude is needed. *@param alt The input altitude - *@param findApparent if TRUE, then alt is the true altitude, and we'll find the apparent alt. + *@param findApparent if true, then alt is the true altitude, and we'll find the apparent alt. *@return the corrected altitude, as a dms object. */ dms refract( const dms *alt, bool findApparent ); @@ -699,8 +699,8 @@ private: *@param psky reference to the TQPainter on which to draw (either the sky pixmap or printer device) *@param catalog List of pointers to the objects in a particular deep-sky catalog. *@param color The color to be used when drawing the symbols for this catalog. - *@param drawObject if TRUE, the object symbols will be drawn - *@param drawImage if TRUE, the object images will be drawn + *@param drawObject if true, the object symbols will be drawn + *@param drawImage if true, the object images will be drawn *@param scale the scaling factor. We use the default value (1.0) everywhere, except when printing. */ void drawDeepSkyCatalog( TQPainter& psky, TQPtrList<DeepSkyObject>& catalog, TQColor& color, bool drawObject, bool drawImage, double scale = 1.0 ); @@ -717,14 +717,14 @@ private: /**@short Draw all solar system bodies: Sun, Moon, 8 planets, comets, asteroids. *@param psky reference to the TQPainter on which to draw (either the sky pixmap or printer device) - *@param drawPlanets if FALSE, do nothing + *@param drawPlanets if false, do nothing *@param scale the scaling factor. We use the default value (1.0) everywhere, except when printing. */ void drawSolarSystem( TQPainter& psky, bool drawPlanets, double scale = 1.0 ); /**@short Draw "User Labels". User labels are name labels attached to objects manually with *the right-click popup menu. Also adds a label to the FocusObject if the Option UseAutoLabel - *is TRUE. + *is true. *@param psky reference to the TQPainter on which to draw (either the sky pixmap or printer device) *@param scale the scaling factor. We use the default value (1.0) everywhere, except when printing. */ @@ -815,8 +815,8 @@ private: *pixel coordinates in the SkyMap. *@return TQPoint containing screen pixel x, y coordinates of SkyPoint. *@param o pointer to the SkyPoint for which to calculate x, y coordinates. - *@param Horiz if TRUE, use Alt/Az coordinates. - *@param doRefraction if TRUE, correct for atmospheric refraction + *@param Horiz if true, use Alt/Az coordinates. + *@param doRefraction if true, correct for atmospheric refraction *@param scale scaling factor (unused?) */ TQPoint getXY( SkyPoint *o, bool Horiz, bool doRefraction=true, double scale = 1.0 ); @@ -825,10 +825,10 @@ private: *screen pixel coordinate offsets from the center of the Sky pixmap. *@param dx horizontal pixel offset from center of SkyMap. *@param dy vertical pixel offset from center of SkyMap. - *@param Horiz if TRUE, the SkyMap is displayed using the Horizontal coordinate system + *@param Horiz if true, the SkyMap is displayed using the Horizontal coordinate system *@param LSTh pointer to the local sidereal time, as a dms object. *@param lat pointer to the current geographic laitude, as a dms object - *@param doRefraction if TRUE, correct for atmospheric refraction + *@param doRefraction if true, correct for atmospheric refraction */ SkyPoint dXdYToRaDec( double dx, double dy, bool Horiz, dms *LST, const dms *lat, bool doRefraction=true ); @@ -849,7 +849,7 @@ private: * *The function first checks the difference between the Declination/Altitude *coordinate of the Focus position, and that of the point p. If the absolute - *value of this difference is larger than fov, then the function returns FALSE. + *value of this difference is larger than fov, then the function returns false. *For most configurations of the sky map window, this simple check is enough to *exclude a large number of objects. * @@ -857,7 +857,7 @@ private: *(Equatorial or Horizontal) is currently inside the sky map window. This is *stored in the member variable 'bool SkyMap::isPoleVisible, and is set by the *function SkyMap::setMapGeometry(), which is called by SkyMap::paintEvent(). - *If a Pole is visible, then it will return TRUE immediately. The idea is that + *If a Pole is visible, then it will return true immediately. The idea is that *when a pole is on-screen it is computationally expensive to determine whether *a particular position is on-screen or not: for many valid Dec/Alt values, *all* *values of RA/Az will indeed be onscreen, but for other valid Dec/Alt values, @@ -867,8 +867,8 @@ private: * *Finally, if no Pole is onscreen, it checks the difference between the Focus *position's RA/Az coordinate and that of the point p. If the absolute value of - *this difference is larger than XMax, the function returns FALSE. Otherwise, - *it returns TRUE. + *this difference is larger than XMax, the function returns false. Otherwise, + *it returns true. *@param p pointer to the skypoint to be checked. *@param fov the vertical center-to-edge angle of the window, in degrees diff --git a/kstars/kstars/skyobject.h b/kstars/kstars/skyobject.h index b0742d9f..da86b5d8 100644 --- a/kstars/kstars/skyobject.h +++ b/kstars/kstars/skyobject.h @@ -172,14 +172,14 @@ public: *@return the local time that the object will rise *@param dt current UT date/time *@param geo current geographic location - *@param rst If TRUE, compute rise time. If FALSE, compute set time. + *@param rst If true, compute rise time. If false, compute set time. */ TQTime riseSetTime( const KStarsDateTime &dt, const GeoLocation *geo, bool rst ); /**@return the UT time when the object will rise or set *@param dt target date/time *@param geo pointer to Geographic location - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. */ TQTime riseSetTimeUT( const KStarsDateTime &dt, const GeoLocation *geo, bool rst); @@ -187,7 +187,7 @@ public: /**@return the LST time when the object will rise or set *@param dt target date/time *@param geo pointer to Geographic location - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. */ dms riseSetTimeLST( const KStarsDateTime &dt, const GeoLocation *geo, bool rst); @@ -196,7 +196,7 @@ public: *recomputes set or rise UT times. *@param dt target date/time *@param geo GeoLocation object - *@param rst Boolen. If TRUE will compute rise time. If FALSE + *@param rst Boolen. If true will compute rise time. If false * will compute set time. */ dms riseSetTimeAz( const KStarsDateTime &dt, const GeoLocation *geo, bool rst); @@ -262,7 +262,7 @@ private: *@param geo pointer to Geographic location *@param righta pointer to Right ascention of the object *@param decl pointer to Declination of the object - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. *@return the time at which the given position will rise or set. */ @@ -276,7 +276,7 @@ private: *@param gLt Geographic latitude *@param rga Right ascention of the object *@param decl Declination of the object - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. */ dms auxRiseSetTimeLST( const dms *gLt, const dms *rga, const dms *decl, bool rst ); diff --git a/kstars/kstars/telescopeprop.h b/kstars/kstars/telescopeprop.h index 58100cc3..c2404230 100644 --- a/kstars/kstars/telescopeprop.h +++ b/kstars/kstars/telescopeprop.h @@ -29,7 +29,7 @@ class telescopeProp : public scopeProp public: - telescopeProp(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + telescopeProp(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~telescopeProp(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/timebox.h b/kstars/kstars/timebox.h index 7e515731..3632b169 100644 --- a/kstars/kstars/timebox.h +++ b/kstars/kstars/timebox.h @@ -43,7 +43,7 @@ public: * @param tt boolean. true means that the object will hold a Time. * false means that the object will hold a Date. */ - timeBox(TQWidget *parent, const char *n, bool tt=TRUE); + timeBox(TQWidget *parent, const char *n, bool tt=true); ~timeBox(); diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index c88ce613..e7bfacc7 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -42,9 +42,9 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) HourBox = new TQSpinBox( page, "HourBox" ); TQFont Box_font( HourBox->font() ); - Box_font.setBold( TRUE ); + Box_font.setBold( true ); HourBox->setFont( Box_font ); - HourBox->setWrapping( TRUE ); + HourBox->setWrapping( true ); HourBox->setMaxValue( 23 ); HourBox->setButtonSymbols( TQSpinBox::PlusMinus ); HourBox->setValue( now.time().hour() ); @@ -56,7 +56,7 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) MinuteBox = new TQSpinBox( page, "MinuteBox" ); TQFont MinuteBox_font( MinuteBox->font() ); MinuteBox->setFont( Box_font ); - MinuteBox->setWrapping( TRUE ); + MinuteBox->setWrapping( true ); MinuteBox->setMaxValue( 59 ); MinuteBox->setButtonSymbols( TQSpinBox::PlusMinus ); MinuteBox->setValue( now.time().minute() ); @@ -67,7 +67,7 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) SecondBox = new TQSpinBox( page, "SecondBox" ); SecondBox->setFont( Box_font ); SecondBox->setMaxValue( 59 ); - SecondBox->setWrapping( TRUE ); + SecondBox->setWrapping( true ); SecondBox->setButtonSymbols( TQSpinBox::PlusMinus ); SecondBox->setValue( now.time().second() ); diff --git a/kstars/kstars/timespinbox.h b/kstars/kstars/timespinbox.h index 137b2bad..2498c516 100644 --- a/kstars/kstars/timespinbox.h +++ b/kstars/kstars/timespinbox.h @@ -46,7 +46,7 @@ public: /**Convert the displayed string to an internal value. *@note reimplemented from TQSpinBox - *@p ok bool pointer set to TRUE if conversion was successful + *@p ok bool pointer set to true if conversion was successful *@return internal value converted from displayed text */ virtual int mapTextToValue( bool *ok); diff --git a/kstars/kstars/timezonerule.h b/kstars/kstars/timezonerule.h index 3cadb4e5..fc2ec80e 100644 --- a/kstars/kstars/timezonerule.h +++ b/kstars/kstars/timezonerule.h @@ -78,11 +78,11 @@ public: */ bool isDSTActive( const KStarsDateTime &date ); - /**@return TRUE if the rule is the "empty" TZ rule. */ + /**@return true if the rule is the "empty" TZ rule. */ bool isEmptyRule() { return ( HourOffset == 0.0 ); } /** Toggle DST on/off. The @p activate argument should probably be isDSTActive() - *@param activate if TRUE, then set DST active; otherwise, deactivate DST + *@param activate if true, then set DST active; otherwise, deactivate DST */ void setDST( bool activate=true ); @@ -110,7 +110,7 @@ public: */ KStarsDateTime nextDSTChange_LTime() { return next_change_ltime; } - /**@return TRUE if this rule is the same as the argument. + /**@return true if this rule is the same as the argument. *@p r the rule to check for equivalence */ bool equals( TimeZoneRule *r ); @@ -144,7 +144,7 @@ private: *be 1-3 (1st/2nd/third weekday of the month), or 5 (last weekday of the month) *@p day the day integer is returned by reference through this value *@p week the week integer is returned by reference through this value - *@return TRUE if the day string was successfully parsed + *@return true if the day string was successfully parsed */ bool initDay( const TQString &d, int &day, int &week ); diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp index 0fd67579..869fa888 100644 --- a/kstars/kstars/tools/altvstime.cpp +++ b/kstars/kstars/tools/altvstime.cpp @@ -100,8 +100,8 @@ AltVsTime::AltVsTime( TQWidget* parent) : connect( avtUI->latBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAdvanceFocus() ) ); connect( avtUI->PlotList, TQ_SIGNAL( highlighted(int) ), this, TQ_SLOT( slotHighlight() ) ); - pList.setAutoDelete(FALSE); - deleteList.setAutoDelete(TRUE); //needed for skypoints which may be created in this class + pList.setAutoDelete(false); + deleteList.setAutoDelete(true); //needed for skypoints which may be created in this class //ther edit boxes should not pass on the return key! avtUI->nameBox->setTrapReturnKey( true ); diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index d708bbaf..5336e86e 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -131,30 +131,30 @@ void LCGenerator::createGUI() DataSelectBoxLayout->setAlignment( TQt::AlignTop ); VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" ); - VisualCheck->setChecked( TRUE ); + VisualCheck->setChecked( true ); DataSelectBoxLayout->addWidget( VisualCheck ); FainterCheck = new TQCheckBox( DataSelectBox, "FainterCheck" ); - FainterCheck->setChecked( TRUE ); + FainterCheck->setChecked( true ); DataSelectBoxLayout->addWidget( FainterCheck ); DiscrepantCheck = new TQCheckBox( DataSelectBox, "DiscrepantCheck" ); DataSelectBoxLayout->addWidget( DiscrepantCheck ); CCDBCheck = new TQCheckBox( DataSelectBox, "CCDBCheck" ); - CCDBCheck->setChecked( TRUE ); + CCDBCheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDBCheck ); CCDVCheck = new TQCheckBox( DataSelectBox, "CCDVCheck" ); - CCDVCheck->setChecked( TRUE ); + CCDVCheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDVCheck ); CCDRCheck = new TQCheckBox( DataSelectBox, "CCDRCheck" ); - CCDRCheck->setChecked( TRUE ); + CCDRCheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDRCheck ); CCDICheck = new TQCheckBox( DataSelectBox, "CCDICheck" ); - CCDICheck->setChecked( TRUE ); + CCDICheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDICheck ); PlotHLayout = new TQHBoxLayout( 0, 0, 6, "PlotHLayout"); diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp index 1a13ddf1..7c9185e2 100644 --- a/kstars/kstars/tools/modcalcangdist.cpp +++ b/kstars/kstars/tools/modcalcangdist.cpp @@ -32,8 +32,8 @@ modCalcAngDist::modCalcAngDist(TQWidget *parentSplit, const char *name) : modCalcAngDistDlg(parentSplit,name) { - ra0Box->setDegType(FALSE); - ra1Box->setDegType(FALSE); + ra0Box->setDegType(false); + ra1Box->setDegType(false); show(); } @@ -44,7 +44,7 @@ modCalcAngDist::~modCalcAngDist(){ SkyPoint modCalcAngDist::getCoords (dmsBox* rBox, dmsBox* dBox) { dms raCoord, decCoord; - raCoord = rBox->createDms(FALSE); + raCoord = rBox->createDms(false); decCoord = dBox->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -149,10 +149,10 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(ra0CheckBatch->isChecked() ) { - ra0B = dms::fromString( fields[i],FALSE); + ra0B = dms::fromString( fields[i],false); i++; } else - ra0B = ra0BoxBatch->createDms(FALSE); + ra0B = ra0BoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << ra0B.toHMSString() << space; @@ -163,7 +163,7 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(dec0CheckBatch->isChecked() ) { - dec0B = dms::fromString( fields[i], TRUE); + dec0B = dms::fromString( fields[i], true); i++; } else dec0B = dec0BoxBatch->createDms(); @@ -177,10 +177,10 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(ra1CheckBatch->isChecked() ) { - ra1B = dms::fromString( fields[i],FALSE); + ra1B = dms::fromString( fields[i],false); i++; } else - ra1B = ra1BoxBatch->createDms(FALSE); + ra1B = ra1BoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << ra1B.toHMSString() << space; @@ -191,7 +191,7 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(dec1CheckBatch->isChecked() ) { - dec1B = dms::fromString( fields[i], TRUE); + dec1B = dms::fromString( fields[i], true); i++; } else dec1B = dec1BoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index c50b7b9c..0b718ef3 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -40,8 +40,8 @@ modCalcApCoord::modCalcApCoord(TQWidget *parentSplit, const char *name) : modCalcApCoordDlg(parentSplit,name) { showCurrentTime(); - ra0Box->setDegType(FALSE); - rafBox->setDegType(FALSE); + ra0Box->setDegType(false); + rafBox->setDegType(false); show(); } @@ -52,7 +52,7 @@ modCalcApCoord::~modCalcApCoord(){ SkyPoint modCalcApCoord::getEquCoords (void) { dms raCoord, decCoord; - raCoord = ra0Box->createDms(FALSE); + raCoord = ra0Box->createDms(false); decCoord = dec0Box->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -87,7 +87,7 @@ double modCalcApCoord::getEpoch (TQString eName) { } void modCalcApCoord::showEquCoords ( SkyPoint sp ) { - rafBox->show( sp.ra() , FALSE); + rafBox->show( sp.ra() , false); decfBox->show( sp.dec() ); } @@ -265,10 +265,10 @@ void modCalcApCoord::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -279,7 +279,7 @@ void modCalcApCoord::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index 04a03904..0d7cfcbe 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -41,8 +41,8 @@ modCalcAzel::modCalcAzel(TQWidget *parentSplit, const char *name) : modCalcAzelD showCurrentDateTime(); initGeo(); showLongLat(); - horInputCoords = FALSE; - raBox->setDegType(FALSE); + horInputCoords = false; + raBox->setDegType(false); show(); } @@ -54,7 +54,7 @@ SkyPoint modCalcAzel::getEquCoords (void) { dms raCoord, decCoord; - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -156,7 +156,7 @@ void modCalcAzel::showHorCoords ( SkyPoint sp ) void modCalcAzel::showEquCoords ( SkyPoint sp ) { - raBox->show( sp.ra(), FALSE ); + raBox->show( sp.ra(), false ); decBox->show( sp.dec() ); showEpoch( getDateTime() ); } @@ -293,7 +293,7 @@ void modCalcAzel::horNoCheck() { azBoxBatch->setEnabled(false); elCheckBatch->setChecked(false); elBoxBatch->setEnabled(false); - horInputCoords = FALSE; + horInputCoords = false; } @@ -302,7 +302,7 @@ void modCalcAzel::equNoCheck() { raBoxBatch->setEnabled(false); decCheckBatch->setChecked(false); decBoxBatch->setEnabled(false); - horInputCoords = TRUE; + horInputCoords = true; } @@ -410,10 +410,10 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; @@ -425,10 +425,10 @@ void modCalcAzel::processLines( TQTextStream &istream ) { if (latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << latB.toDMSString() << space; else @@ -462,10 +462,10 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -476,7 +476,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); @@ -496,7 +496,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { } else { if(azCheckBatch->isChecked() ) { - azB = dms::fromString( fields[i],FALSE); + azB = dms::fromString( fields[i],false); i++; } else azB = azBoxBatch->createDms(); @@ -510,7 +510,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(elCheckBatch->isChecked() ) { - elB = dms::fromString( fields[i], TRUE); + elB = dms::fromString( fields[i], true); i++; } else elB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp index 33aa83ae..f3b88036 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.cpp +++ b/kstars/kstars/tools/modcalceclipticcoords.cpp @@ -37,8 +37,8 @@ modCalcEclCoords::modCalcEclCoords(TQWidget *parentSplit, const char *name) : modCalcEclCoordsDlg(parentSplit,name) { - equRadio->setChecked(TRUE); - raBox->setDegType(FALSE); + equRadio->setChecked(true); + raBox->setDegType(false); this->show(); } @@ -54,7 +54,7 @@ void modCalcEclCoords::getEclCoords (void) { void modCalcEclCoords::getEquCoords (void) { - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); epoch = getEpoch( epochName->text() ); } @@ -90,7 +90,7 @@ void modCalcEclCoords::slotComputeCoords (void) { } void modCalcEclCoords::showEquCoords(void) { - raBox->show( raCoord , FALSE); + raBox->show( raCoord , false); decBox->show( decCoord ); } @@ -135,7 +135,7 @@ void modCalcEclCoords::eclCheck() { eclLatBoxBatch->setEnabled(false); eclLongCheckBatch->setChecked(false); eclLongBoxBatch->setEnabled(false); - eclInputCoords = FALSE; + eclInputCoords = false; } @@ -146,7 +146,7 @@ void modCalcEclCoords::equCheck() { decCheckBatch->setChecked(false); decBoxBatch->setEnabled(false); //epochCheckBatch->setChecked(false); - eclInputCoords = TRUE; + eclInputCoords = true; } @@ -278,10 +278,10 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read Ecliptic Longitude and write in ostream if corresponds if(eclLongCheckBatch->isChecked() ) { - eclLongB = dms::fromString( fields[i], TRUE); + eclLongB = dms::fromString( fields[i], true); i++; } else - eclLongB = eclLongBoxBatch->createDms(TRUE); + eclLongB = eclLongBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << eclLongB.toDMSString() << space; @@ -292,7 +292,7 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read Ecliptic Latitude and write in ostream if corresponds if(eclLatCheckBatch->isChecked() ) { - eclLatB = dms::fromString( fields[i], TRUE); + eclLatB = dms::fromString( fields[i], true); i++; } else if ( allRadioBatch->isChecked() ) @@ -329,10 +329,10 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -343,7 +343,7 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index cc78629d..3f72a1fe 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -44,7 +44,7 @@ modCalcEquinox::~modCalcEquinox(){ int modCalcEquinox::getYear (TQString eName) { - bool ok = FALSE; + bool ok = false; int equinoxYear = eName.toInt(&ok); if ( ok ) return equinoxYear; diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp index 8c555b68..6ed71bb3 100644 --- a/kstars/kstars/tools/modcalcgalcoord.cpp +++ b/kstars/kstars/tools/modcalcgalcoord.cpp @@ -36,8 +36,8 @@ modCalcGalCoord::modCalcGalCoord(TQWidget *parentSplit, const char *name) : modCalcGalCoordDlg(parentSplit,name) { - equRadio->setChecked(TRUE); - raBox->setDegType(FALSE); + equRadio->setChecked(true); + raBox->setDegType(false); show(); } @@ -53,7 +53,7 @@ void modCalcGalCoord::getGalCoords (void) { void modCalcGalCoord::getEquCoords (void) { - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); epoch = getEpoch( epochName->text() ); } @@ -91,7 +91,7 @@ void modCalcGalCoord::slotComputeCoords (void) { } void modCalcGalCoord::showEquCoords(void) { - raBox->show( raCoord , FALSE); + raBox->show( raCoord , false); decBox->show( decCoord ); } @@ -135,7 +135,7 @@ void modCalcGalCoord::galCheck() { galLatBoxBatch->setEnabled(false); galLongCheckBatch->setChecked(false); galLongBoxBatch->setEnabled(false); - galInputCoords = FALSE; + galInputCoords = false; } @@ -146,7 +146,7 @@ void modCalcGalCoord::equCheck() { decCheckBatch->setChecked(false); decBoxBatch->setEnabled(false); epochCheckBatch->setChecked(false); - galInputCoords = TRUE; + galInputCoords = true; } @@ -281,10 +281,10 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read Galactic Longitude and write in ostream if corresponds if(galLongCheckBatch->isChecked() ) { - galLongB = dms::fromString( fields[i], TRUE); + galLongB = dms::fromString( fields[i], true); i++; } else - galLongB = galLongBoxBatch->createDms(TRUE); + galLongB = galLongBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << galLongB.toDMSString() << space; @@ -295,10 +295,10 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read Galactic Latitude and write in ostream if corresponds if(galLatCheckBatch->isChecked() ) { - galLatB = dms::fromString( fields[i], TRUE); + galLatB = dms::fromString( fields[i], true); i++; } else - galLatB = galLatBoxBatch->createDms(TRUE); + galLatB = galLatBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << galLatB.toDMSString() << space; @@ -316,10 +316,10 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -330,7 +330,7 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index fb54a23b..c9dd1e05 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -42,7 +42,7 @@ modCalcGeodCoord::modCalcGeodCoord(TQWidget *parentSplit, const char *name) : mo static const char *ellipsoidList[] = { "IAU76", "GRS80", "MERIT83", "WGS84", "IERS89"}; - spheRadio->setChecked(TRUE); + spheRadio->setChecked(true); ellipsoidBox->insertStrList (ellipsoidList,5); geoPlace = new GeoLocation(); showLongLat(); @@ -137,7 +137,7 @@ void modCalcGeodCoord::geoCheck(void) { yCheckBatch->setChecked( false ); zBoxBatch->setEnabled( false ); zCheckBatch->setChecked( false ); - xyzInputCoords = FALSE; + xyzInputCoords = false; } void modCalcGeodCoord::xyzCheck(void) { @@ -148,7 +148,7 @@ void modCalcGeodCoord::xyzCheck(void) { latCheckBatch->setChecked( false ); elevBoxBatch->setEnabled( false ); elevCheckBatch->setChecked( false ); - xyzInputCoords = TRUE; + xyzInputCoords = true; } @@ -346,10 +346,10 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if(longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; @@ -360,10 +360,10 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { // Read Latitude and write in ostream if corresponds if(latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << latB.toDMSString() << space; diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index fc51282a..474fda8a 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -41,7 +41,7 @@ modCalcPlanets::modCalcPlanets(TQWidget *parentSplit, const char *name) : modCalcPlanetsDlg (parentSplit,name) { showCurrentDateTime(); showLongLat(); - raBox->setDegType(FALSE); + raBox->setDegType(false); show(); } @@ -232,7 +232,7 @@ void modCalcPlanets::showGeocentricEclipticCoords(const dms *eLong, const dms *e void modCalcPlanets::showEquatorialCoords(const dms *ra, const dms *dec) { - raBox->show( ra, FALSE ); + raBox->show( ra, false ); decBox->show( dec ); } @@ -479,10 +479,10 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) lineToWrite += longB.toDMSString() + space; @@ -493,10 +493,10 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { // Read Latitude if (latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) lineToWrite += latB.toDMSString() + space; else diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index d489f1b0..efa7de5c 100644 --- a/kstars/kstars/tools/modcalcprec.cpp +++ b/kstars/kstars/tools/modcalcprec.cpp @@ -33,8 +33,8 @@ modCalcPrec::modCalcPrec(TQWidget *parentSplit, const char *name) : modCalcPrecDlg(parentSplit,name) { - ra0Box->setDegType(FALSE); - rafBox->setDegType(FALSE); + ra0Box->setDegType(false); + rafBox->setDegType(false); show(); } @@ -46,7 +46,7 @@ modCalcPrec::~modCalcPrec(){ SkyPoint modCalcPrec::getEquCoords (void) { dms raCoord, decCoord; - raCoord = ra0Box->createDms(FALSE); + raCoord = ra0Box->createDms(false); decCoord = dec0Box->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -111,7 +111,7 @@ void modCalcPrec::slotComputeCoords (void) { } void modCalcPrec::showEquCoords ( SkyPoint sp ) { - rafBox->show( sp.ra(),FALSE ); + rafBox->show( sp.ra(),false ); decfBox->show( sp.dec() ); } @@ -229,10 +229,10 @@ void modCalcPrec::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -243,7 +243,7 @@ void modCalcPrec::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index 8d38f257..aa7ad586 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -158,14 +158,14 @@ void modCalcSidTime::slotLongChecked(){ void modCalcSidTime::sidNoCheck() { stBoxBatch->setEnabled(false); - stInputTime = FALSE; + stInputTime = false; } void modCalcSidTime::utNoCheck() { utBoxBatch->setEnabled(false); - stInputTime = TRUE; + stInputTime = true; } void modCalcSidTime::slotInputFile() { @@ -245,10 +245,10 @@ void modCalcSidTime::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index ffe6ed29..d69a143a 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -42,7 +42,7 @@ modCalcVlsr::modCalcVlsr(TQWidget *parentSplit, const char *name) : modCalcVlsrD showCurrentDateTime(); initGeo(); showLongLat(); - raBox->setDegType(FALSE); + raBox->setDegType(false); show(); } @@ -54,7 +54,7 @@ SkyPoint modCalcVlsr::getEquCoords (void) { dms raCoord, decCoord; - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -457,10 +457,10 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -471,7 +471,7 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); @@ -513,10 +513,10 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; @@ -528,10 +528,10 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { if (latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << latB.toDMSString() << space; else diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index 2dbdb0a1..24e2b6d4 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -112,9 +112,9 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) sb = new ScriptBuilderUI( page ); vlay->addWidget( sb ); - KStarsFunctionList.setAutoDelete( TRUE ); - INDIFunctionList.setAutoDelete( TRUE); - ScriptList.setAutoDelete( TRUE ); + KStarsFunctionList.setAutoDelete( true ); + INDIFunctionList.setAutoDelete( true); + ScriptList.setAutoDelete( true ); //Initialize function templates and descriptions KStarsFunctionList.append( new ScriptFunction( "lookTowards", i18n( "Point the display at the specified location. %1 can be the name of an object, a cardinal point on the compass, or 'zenith'." ), diff --git a/ktouch/src/ktouchcoloreditor.h b/ktouch/src/ktouchcoloreditor.h index d411f043..731eb57a 100644 --- a/ktouch/src/ktouchcoloreditor.h +++ b/ktouch/src/ktouchcoloreditor.h @@ -31,7 +31,7 @@ class KTouchColorEditor : public KTouchColorEditorDlg public: /// Constructor - KTouchColorEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchColorEditor(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /// Destructor ~KTouchColorEditor(); diff --git a/ktouch/src/ktouchkeyboardeditor.h b/ktouch/src/ktouchkeyboardeditor.h index b4eba3f7..f473ab2d 100644 --- a/ktouch/src/ktouchkeyboardeditor.h +++ b/ktouch/src/ktouchkeyboardeditor.h @@ -45,7 +45,7 @@ class KTouchKeyboardEditor : public KTouchKeyboardEditorDlg { public: /// Constructor. - KTouchKeyboardEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchKeyboardEditor(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /// Default destructor. ~KTouchKeyboardEditor() {} /// Shows and executes the dialog (argument is the url to the default or diff --git a/ktouch/src/ktouchlectureeditor.h b/ktouch/src/ktouchlectureeditor.h index dc25069c..972357e6 100644 --- a/ktouch/src/ktouchlectureeditor.h +++ b/ktouch/src/ktouchlectureeditor.h @@ -44,7 +44,7 @@ class KTouchLectureEditor : public KTouchLectureEditorDlg { public: /// Constructor - KTouchLectureEditor(TQWidget *parent, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KTouchLectureEditor(TQWidget *parent, const char* name = 0, bool modal = false, WFlags fl = 0); /// Destructor ~KTouchLectureEditor() {} /// Shows and executes the dialog (argument is the url to the default or diff --git a/ktouch/src/ktouchopenrequest.h b/ktouch/src/ktouchopenrequest.h index 34d90718..849c157a 100644 --- a/ktouch/src/ktouchopenrequest.h +++ b/ktouch/src/ktouchopenrequest.h @@ -56,7 +56,7 @@ class KTouchOpenRequest : public KTouchOpenRequestDlg { public: /// Default constructor. - KTouchOpenRequest(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchOpenRequest(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /// Default destructor. ~KTouchOpenRequest() {} /// Sets up the dialog and runs it. diff --git a/ktouch/training/german2.ktouch.xml b/ktouch/training/german2.ktouch.xml index e201a0ce..0c3af5ee 100644 --- a/ktouch/training/german2.ktouch.xml +++ b/ktouch/training/german2.ktouch.xml @@ -1026,7 +1026,7 @@ Version: 0.1 beta <Line>Info_Dialog::Info_Dialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition,</Line> <Line>const wxSize& size =wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox") : wxDialog(parent, id, title, pos, size, style, name)</Line> <Line>{</Line> - <Line> SetAutoLayout(TRUE);</Line> + <Line> SetAutoLayout(true);</Line> <Line> #ifdef __WXMSW__</Line> <Line> wxBitmap::AddHandler(new wxPNGFileHandler);</Line> <Line> #endif</Line> @@ -1099,7 +1099,7 @@ Version: 0.1 beta <Line> wxPaintDC dc(this);</Line> <Line> wxMemoryDC memDC;</Line> <Line> memDC.SelectObject(* logo);</Line> - <Line> dc.Blit(5, 25, logo->GetWidth(), logo->GetHeight(), & memDC, 0, 0, wxCOPY, TRUE);</Line> + <Line> dc.Blit(5, 25, logo->GetWidth(), logo->GetHeight(), & memDC, 0, 0, wxCOPY, true);</Line> <Line> memDC.SelectObject(wxNullBitmap);</Line> <Line>}</Line> </Level> diff --git a/kturtle/src/canvas.cpp b/kturtle/src/canvas.cpp index 57bbc923..8564d6ae 100644 --- a/kturtle/src/canvas.cpp +++ b/kturtle/src/canvas.cpp @@ -403,7 +403,7 @@ void Canvas::line(double xa, double ya, double xb, double yb) xb + translation.x() * canvasWidth, yb + translation.y() * canvasHeight); if (cutLoop == true) { - // kdDebug(0)<<"Canvas::line(): cutLoop is set to TRUE! ABORT LINE MISSION"<<endl; + // kdDebug(0)<<"Canvas::line(): cutLoop is set to true! ABORT LINE MISSION"<<endl; return; } } @@ -418,7 +418,7 @@ bool Canvas::endlessLoop(TQPoint begin, TQPoint end) // this is to break the horrible endless loop bug that i cannot fix... // i need more simple reproductions of this bug to really find it // for now i say it is something with TQCanvas but i'm likely wrong on thisone - // kdDebug(0)<<"Canvas::endlessLoop TRUE!!"<<endl; + // kdDebug(0)<<"Canvas::endlessLoop true!!"<<endl; return true; } else diff --git a/kverbos/kverbos/kerfassen.h b/kverbos/kverbos/kerfassen.h index 8e264986..eb99ded1 100644 --- a/kverbos/kverbos/kerfassen.h +++ b/kverbos/kverbos/kerfassen.h @@ -38,7 +38,7 @@ public: * Verben in die Liste eingef�gt werden k�nnen. Es wird auch ein Iterator �bergeben, der * anzeigt, wo mit dem editieren begonnen werden soll. */ - KErfassen(spanishVerbList& l, int pos = -1, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KErfassen(spanishVerbList& l, int pos = -1, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); /** der Destruktor */ virtual ~KErfassen(); /** Gibt zur�ck, ob durch den Ablauf des Dialoges eine �nderung an der diff --git a/kverbos/kverbos/kresult.h b/kverbos/kverbos/kresult.h index e4aee250..6f10ec42 100644 --- a/kverbos/kverbos/kresult.h +++ b/kverbos/kverbos/kresult.h @@ -28,7 +28,7 @@ class KResult : public QResult { public: - KResult(KVerbosUser* pU, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KResult(KVerbosUser* pU, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~KResult(); public slots: /** Wird durch den OK-Button aufgerufen und beendet den Dialog. diff --git a/kverbos/kverbos/kverbedit.cpp b/kverbos/kverbos/kverbedit.cpp index 7e7bcde8..1c1b9bec 100644 --- a/kverbos/kverbos/kverbedit.cpp +++ b/kverbos/kverbos/kverbedit.cpp @@ -24,7 +24,7 @@ * die Liste der Verben bearbeitet werden kann. Zu Beginn mssen alle Verben * aus der Liste in eine dialogeigene Liste und die TQListView bertragen werden. */ -KVerbEdit::KVerbEdit(spanishVerbList& l, TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/) +KVerbEdit::KVerbEdit(spanishVerbList& l, TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= false*/, WFlags fl /*= 0*/) : QVerbEdit(parent, name, modal, fl), list(l) { // Die Spaltenbreiten anpassen diff --git a/kverbos/kverbos/kverbedit.h b/kverbos/kverbos/kverbedit.h index 54b1a6bd..f7c8e01e 100644 --- a/kverbos/kverbos/kverbedit.h +++ b/kverbos/kverbos/kverbedit.h @@ -34,7 +34,7 @@ public: /** An die Dialogklasse wird direkt die Verbliste �bergeben, damit * die Liste der Verben bearbeitet werden kann. */ - KVerbEdit(spanishVerbList& l, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KVerbEdit(spanishVerbList& l, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); ~KVerbEdit(); /** kopiert die Liste in die ListView. */ void listToView(); diff --git a/kverbos/kverbos/kverbosoptions.cpp b/kverbos/kverbos/kverbosoptions.cpp index 381e058b..35d4f9c1 100644 --- a/kverbos/kverbos/kverbosoptions.cpp +++ b/kverbos/kverbos/kverbosoptions.cpp @@ -19,7 +19,7 @@ #include "tqcheckbox.h" #include "kverbosoptions.h" -KVerbosOptions::KVerbosOptions( TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/ ) +KVerbosOptions::KVerbosOptions( TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= false*/, WFlags fl /*= 0*/ ) : QVerbosOptions(parent, name, modal, fl) { // some times are disabled because they aren't ready yet. diff --git a/kverbos/kverbos/kverbosoptions.h b/kverbos/kverbos/kverbosoptions.h index dfd80855..69b18047 100644 --- a/kverbos/kverbos/kverbosoptions.h +++ b/kverbos/kverbos/kverbosoptions.h @@ -27,7 +27,7 @@ class KVerbosOptions : public QVerbosOptions { public: - KVerbosOptions( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KVerbosOptions( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~KVerbosOptions(); public slots: diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index 26b1599f..060fe230 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -92,7 +92,7 @@ kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name) btimer = new TQTimer( this ); connect( btimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeOutBackup()) ); if (Prefs::autoBackup()) - btimer->start(Prefs::backupTime() * 60 * 1000, TRUE); + btimer->start(Prefs::backupTime() * 60 * 1000, true); } diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index 7261bd5d..fea8d733 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -65,7 +65,7 @@ void kvoctrainApp::slotTimeOutBackup() slotFileSave(); } if (Prefs::backupTime() > 0) - btimer->start(Prefs::backupTime() * 60 * 1000, TRUE); + btimer->start(Prefs::backupTime() * 60 * 1000, true); slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index b75c2050..2c284260 100644 --- a/kvoctrain/kvoctrain/kvoctrain.cpp +++ b/kvoctrain/kvoctrain/kvoctrain.cpp @@ -902,7 +902,7 @@ void kvoctrainApp::slotCleanVocabulary () void kvoctrainApp::slotCreateRandom() { - bool ok = FALSE; + bool ok = false; int res = KInputDialog::getInteger(i18n( "Entries in Lesson" ), i18n( "Enter number of entries in lesson:" ), Prefs::entriesPerLesson(), 1, 1000, 1, &ok, this ); if (!ok) diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp index 09710019..7b6bce55 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp @@ -144,7 +144,7 @@ void AdjQueryDlg::setQuery(TQString, timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -216,7 +216,7 @@ void AdjQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp index 9e8e9ce2..ad669511 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp @@ -165,7 +165,7 @@ void ArtQueryDlg::setQuery(TQString, timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -253,7 +253,7 @@ void ArtQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp index 4b287b83..bb14b63a 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp @@ -129,7 +129,7 @@ void MCQueryDlg::setQuery(TQString org, timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -353,7 +353,7 @@ void MCQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp index f9725434..541ef392 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp @@ -323,7 +323,7 @@ void RandomQueryDlg::setQuery(TQString org, timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -522,7 +522,7 @@ void RandomQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp index e0737d32..c15ea8e9 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp @@ -177,7 +177,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype, timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -200,7 +200,7 @@ void SimpleQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp index 03e29d64..40d6929d 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp @@ -153,7 +153,7 @@ void VerbQueryDlg::setQuery(TQString, timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -345,7 +345,7 @@ void VerbQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { @@ -367,7 +367,7 @@ void VerbQueryDlg::timeoutReached() } else if (Prefs::queryTimeout() == Prefs::EnumQueryTimeout::Continue) { next(); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); timercount = Prefs::maxTimePer(); } } @@ -395,7 +395,7 @@ void VerbQueryDlg::dontKnowClicked() if (current >= (int) conjugations.numEntries()-1 ) emit sigQueryChoice (Unknown); else { - qtimer->start(1000, TRUE); + qtimer->start(1000, true); timercount = Prefs::maxTimePer(); next(); } diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp index 9c12c248..696e7d84 100644 --- a/libtdeedu/extdate/extdatetime.cpp +++ b/libtdeedu/extdate/extdatetime.cpp @@ -623,8 +623,8 @@ ExtDateTime::ExtDateTime( const ExtDate &date, const TQTime &time ) /*! \fn bool ExtDateTime::isNull() const - Returns TRUE if both the date and the time are null; otherwise - returns FALSE. A null datetime is invalid. + Returns true if both the date and the time are null; otherwise + returns false. A null datetime is invalid. \sa ExtDate::isNull(), TQTime::isNull() */ @@ -632,8 +632,8 @@ ExtDateTime::ExtDateTime( const ExtDate &date, const TQTime &time ) /*! \fn bool ExtDateTime::isValid() const - Returns TRUE if both the date and the time are valid; otherwise - returns FALSE. + Returns true if both the date and the time are valid; otherwise + returns false. \sa ExtDate::isValid(), TQTime::isValid() */ @@ -948,7 +948,7 @@ int ExtDateTime::secsTo( const ExtDateTime &dt ) const /*! - Returns TRUE if this datetime is equal to \a dt; otherwise returns FALSE. + Returns true if this datetime is equal to \a dt; otherwise returns false. \sa operator!=() */ @@ -959,8 +959,8 @@ bool ExtDateTime::operator==( const ExtDateTime &dt ) const } /*! - Returns TRUE if this datetime is different from \a dt; otherwise - returns FALSE. + Returns true if this datetime is different from \a dt; otherwise + returns false. \sa operator==() */ @@ -971,8 +971,8 @@ bool ExtDateTime::operator!=( const ExtDateTime &dt ) const } /*! - Returns TRUE if this datetime is earlier than \a dt; otherwise - returns FALSE. + Returns true if this datetime is earlier than \a dt; otherwise + returns false. */ bool ExtDateTime::operator<( const ExtDateTime &dt ) const @@ -983,8 +983,8 @@ bool ExtDateTime::operator<( const ExtDateTime &dt ) const } /*! - Returns TRUE if this datetime is earlier than or equal to \a dt; - otherwise returns FALSE. + Returns true if this datetime is earlier than or equal to \a dt; + otherwise returns false. */ bool ExtDateTime::operator<=( const ExtDateTime &dt ) const @@ -995,8 +995,8 @@ bool ExtDateTime::operator<=( const ExtDateTime &dt ) const } /*! - Returns TRUE if this datetime is later than \a dt; otherwise - returns FALSE. + Returns true if this datetime is later than \a dt; otherwise + returns false. */ bool ExtDateTime::operator>( const ExtDateTime &dt ) const @@ -1007,8 +1007,8 @@ bool ExtDateTime::operator>( const ExtDateTime &dt ) const } /*! - Returns TRUE if this datetime is later than or equal to \a dt; - otherwise returns FALSE. + Returns true if this datetime is later than or equal to \a dt; + otherwise returns false. */ bool ExtDateTime::operator>=( const ExtDateTime &dt ) const diff --git a/libtdeedu/extdate/extdatetimeedit.cpp b/libtdeedu/extdate/extdatetimeedit.cpp index d9f19cd6..77b41352 100644 --- a/libtdeedu/extdate/extdatetimeedit.cpp +++ b/libtdeedu/extdate/extdatetimeedit.cpp @@ -44,7 +44,7 @@ static TQString *lDateSep = 0; static TQString *lTimeSep = 0; -static bool lAMPM = FALSE; +static bool lAMPM = false; static TQString *lAM = 0; static TQString *lPM = 0; static ExtDateEdit::Order lOrder = ExtDateEdit::YMD; @@ -181,11 +181,11 @@ class ExtDateTimeEditorPrivate { public: ExtDateTimeEditorPrivate() - : frm( TRUE ), - parag( new TQTextParagraph( 0, 0, 0, FALSE ) ), + : frm( true ), + parag( new TQTextParagraph( 0, 0, 0, false ) ), focusSec(0) { - parag->formatter()->setWrapEnabled( FALSE ); + parag->formatter()->setWrapEnabled( false ); cursor = new TQTextCursor( 0 ); cursor->setParagraph( parag ); offset = 0; @@ -242,13 +242,13 @@ public: bool setFocusSection( int idx ) { if ( idx > (int)sections.count()-1 || idx < 0 ) - return FALSE; + return false; if ( idx != focusSec ) { focusSec = idx; applyFocusSelection(); - return TRUE; + return true; } - return FALSE; + return false; } bool inSectionSelection( int idx ) @@ -256,9 +256,9 @@ public: for ( uint i = 0; i < sections.count(); ++i ) { if ( idx >= sections[i].selectionStart() && idx <= sections[i].selectionEnd() ) - return TRUE; + return true; } - return FALSE; + return false; } void paint( const TQString& txt, bool focus, TQPainter& p, @@ -304,7 +304,7 @@ public: yoff = 0; p.translate( xoff, yoff ); - parag->paint( p, cg, 0, TRUE ); + parag->paint( p, cg, 0, true ); if ( frm ) p.translate( -xoff, -yoff ); } @@ -465,7 +465,7 @@ void ExtDateTimeEditor::mousePressEvent( TQMouseEvent *e ) int sec = sectionAt( p ); if ( sec != -1 ) { cw->setFocusSection( sec ); - repaint( rect(), FALSE ); + repaint( rect(), false ); } } @@ -481,37 +481,37 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) case Key_Right: if ( d->focusSection() < (int)d->sectionCount()-1 ) { if ( cw->setFocusSection( focusSection()+1 ) ) - repaint( rect(), FALSE ); + repaint( rect(), false ); } - return TRUE; + return true; case Key_Left: if ( d->focusSection() > 0 ) { if ( cw->setFocusSection( focusSection()-1 ) ) - repaint( rect(), FALSE ); + repaint( rect(), false ); } - return TRUE; + return true; case Key_Up: cw->stepUp(); - return TRUE; + return true; case Key_Down: cw->stepDown(); - return TRUE; + return true; case Key_Backspace: if ( ::tqt_cast<ExtDateEdit*>(cw) ) ((ExtDateEdit*)cw)->removeFirstNumber( d->focusSection() ); else if ( ::tqt_cast<TQTimeEdit*>(cw) ) ((TQTimeEdit*)cw)->removeFirstNumber( d->focusSection() ); - return TRUE; + return true; case Key_Delete: cw->removeLastNumber( d->focusSection() ); - return TRUE; + return true; case Key_Tab: case Key_BackTab: { if ( ke->state() == TQt::ControlButton ) - return FALSE; + return false; TQWidget *w = this; - bool hadDateEdit = FALSE; + bool hadDateEdit = false; while ( w ) { if ( ::tqt_cast<ExtDateTimeSpinWidget*>(w) && qstrcmp( w->name(), "qt_spin_widget" ) != 0 || ::tqt_cast<ExtDateTimeEdit*>(w) ) @@ -527,10 +527,10 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) ExtDateTimeEdit *ed = (ExtDateTimeEdit*)w; if ( hadDateEdit && ke->key() == Key_Tab ) { ed->timeEdit()->setFocus(); - return TRUE; + return true; } else if ( !hadDateEdit && ke->key() == Key_BackTab ) { ed->dateEdit()->setFocus(); - return TRUE; + return true; } else { while ( w && !::tqt_cast<ExtDateTimeEdit*>(w) ) w = w->parentWidget(); @@ -538,7 +538,7 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) } tqApp->sendEvent( w, e ); - return TRUE; + return true; } } break; default: @@ -547,9 +547,9 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) // do the same thing as KEY_RIGHT when the user presses the separator key if ( d->focusSection() < 2 ) { if ( cw->setFocusSection( focusSection()+1 ) ) - repaint( rect(), FALSE ); + repaint( rect(), false ); } - return TRUE; + return true; } else if ( !txt.isEmpty() && ::tqt_cast<TQTimeEdit*>(cw) && focusSection() == (int) d->sectionCount()-1 ) { // the first character of the AM/PM indicator toggles if the section has focus TQTimeEdit *te = (TQTimeEdit*)cw; @@ -568,12 +568,12 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) int num = txt[0].digitValue(); if ( num != -1 ) { cw->addNumber( d->focusSection(), num ); - return TRUE; + return true; } } } } - return FALSE; + return false; } @@ -744,13 +744,13 @@ public: dateEdit->setRange( ExtDate::currentDate().addDays( -365 ), ExtDate::currentDate().addDays( 365 ) ); dateEdit->setOrder( ExtDateEdit::MDY ); - dateEdit->setAutoAdvance( TRUE ); + dateEdit->setAutoAdvance( true ); \endcode Here we've created a new ExtDateEdit object initialised with today's date and restricted the valid date range to today plus or minus 365 days. We've set the order to month, day, year. If the auto - advance property is TRUE (as we've set it here) when the user + advance property is true (as we've set it here) when the user completes a section of the date, e.g. enters two digits for the month, they are automatically taken to the next section. @@ -848,13 +848,13 @@ void ExtDateEdit::init() d->dayCache = 0; setOrder( localOrder() ); setFocusSection( 0 ); - d->overwrite = TRUE; - d->adv = FALSE; + d->overwrite = true; + d->adv = false; d->timerId = 0; - d->typing = FALSE; + d->typing = false; d->min = ExtDate( -50000, 1, 1 ); d->max = ExtDate( 50000, 12, 31 ); - d->changed = FALSE; + d->changed = false; setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); @@ -1133,7 +1133,7 @@ void ExtDateEdit::setOrder( ExtDateEdit::Order order ) } if ( isVisible() ) - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } @@ -1149,29 +1149,29 @@ ExtDateEdit::Order ExtDateEdit::order() const void ExtDateEdit::stepUp() { int sec = d->ed->focusSection(); - bool accepted = FALSE; + bool accepted = false; if ( sec == d->yearSection ) { if ( !outOfRange( d->y+1, d->m, d->d ) ) { - accepted = TRUE; + accepted = true; setYear( d->y+1 ); } } else if ( sec == d->monthSection ) { if ( !outOfRange( d->y, d->m+1, d->d ) ) { - accepted = TRUE; + accepted = true; setMonth( d->m+1 ); } } else if ( sec == d->daySection ) { if ( !outOfRange( d->y, d->m, d->d+1 ) ) { - accepted = TRUE; + accepted = true; setDay( d->d+1 ); } } if ( accepted ) { - d->changed = TRUE; + d->changed = true; emit valueChanged( date() ); } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } @@ -1183,29 +1183,29 @@ void ExtDateEdit::stepUp() void ExtDateEdit::stepDown() { int sec = d->ed->focusSection(); - bool accepted = FALSE; + bool accepted = false; if ( sec == d->yearSection ) { if ( !outOfRange( d->y-1, d->m, d->d ) ) { - accepted = TRUE; + accepted = true; setYear( d->y-1 ); } } else if ( sec == d->monthSection ) { if ( !outOfRange( d->y, d->m-1, d->d ) ) { - accepted = TRUE; + accepted = true; setMonth( d->m-1 ); } } else if ( sec == d->daySection ) { if ( !outOfRange( d->y, d->m, d->d-1 ) ) { - accepted = TRUE; + accepted = true; setDay( d->d-1 ); } } if ( accepted ) { - d->changed = TRUE; + d->changed = true; emit valueChanged( date() ); } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } /*! @@ -1291,8 +1291,8 @@ void ExtDateEdit::setDate( const ExtDate& date ) d->dayCache = d->d; emit valueChanged( date ); } - d->changed = FALSE; - d->ed->repaint( d->ed->rect(), FALSE ); + d->changed = false; + d->ed->repaint( d->ed->rect(), false ); } ExtDate ExtDateEdit::date() const @@ -1304,8 +1304,8 @@ ExtDate ExtDateEdit::date() const /*! \internal - Returns TRUE if \a y, \a m, \a d is out of range, otherwise returns - FALSE. + Returns true if \a y, \a m, \a d is out of range, otherwise returns + false. \sa setRange() @@ -1317,11 +1317,11 @@ bool ExtDateEdit::outOfRange( int y, int m, int d ) const ExtDate currentDate( y, m, d ); if ( currentDate > maxValue() || currentDate < minValue() ) { //## outOfRange should set overwrite? - return TRUE; + return true; } - return FALSE; + return false; } - return FALSE; /* assume ok */ + return false; /* assume ok */ } /*! \reimp @@ -1333,25 +1333,25 @@ void ExtDateEdit::addNumber( int sec, int num ) if ( sec == -1 ) return; killTimer( d->timerId ); - bool overwrite = FALSE; - bool accepted = FALSE; - d->typing = TRUE; + bool overwrite = false; + bool accepted = false; + d->typing = true; TQString txt; if ( sec == d->yearSection ) { if ( d->overwrite ) { d->y = num; - d->overwrite = FALSE; - accepted = TRUE; + d->overwrite = false; + accepted = true; } else { txt = TQString::number( 10*d->y + num ); if ( txt.length() > 5 ) txt = txt.mid(1); d->y = txt.toInt(); - accepted = TRUE; + accepted = true; } /* txt = TQString::number( d->y ); if ( d->overwrite || txt.length() == 4 ) { - accepted = TRUE; + accepted = true; d->y = num; } else { txt += TQString::number( num ); @@ -1364,23 +1364,23 @@ void ExtDateEdit::addNumber( int sec, int num ) else if ( outOfRange( val, d->m, d->d ) ) txt = TQString::number( d->y ); else { - accepted = TRUE; + accepted = true; d->y = val; } } else { - accepted = TRUE; + accepted = true; d->y = txt.toInt(); } if ( d->adv && txt.length() == 4 ) { d->ed->setFocusSection( d->ed->focusSection()+1 ); - overwrite = TRUE; + overwrite = true; } } */ } else if ( sec == d->monthSection ) { txt = TQString::number( d->m ); if ( d->overwrite || txt.length() == 2 ) { - accepted = TRUE; + accepted = true; d->m = num; } else { txt += TQString::number( num ); @@ -1390,18 +1390,18 @@ void ExtDateEdit::addNumber( int sec, int num ) if ( outOfRange( d->y, temp, d->d ) ) txt = TQString::number( d->m ); else { - accepted = TRUE; + accepted = true; d->m = temp; } if ( d->adv && txt.length() == 2 ) { d->ed->setFocusSection( d->ed->focusSection()+1 ); - overwrite = TRUE; + overwrite = true; } } } else if ( sec == d->daySection ) { txt = TQString::number( d->d ); if ( d->overwrite || txt.length() == 2 ) { - accepted = TRUE; + accepted = true; d->d = num; d->dayCache = d->d; } else { @@ -1412,23 +1412,23 @@ void ExtDateEdit::addNumber( int sec, int num ) if ( outOfRange( d->y, d->m, temp ) ) txt = TQString::number( d->d ); else { - accepted = TRUE; + accepted = true; d->d = temp; d->dayCache = d->d; } if ( d->adv && txt.length() == 2 ) { d->ed->setFocusSection( d->ed->focusSection()+1 ); - overwrite = TRUE; + overwrite = true; } } } if ( accepted ) { - d->changed = TRUE; + d->changed = true; emit valueChanged( date() ); } d->overwrite = overwrite; d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } @@ -1440,8 +1440,8 @@ bool ExtDateEdit::setFocusSection( int s ) { if ( s != d->ed->focusSection() ) { killTimer( d->timerId ); - d->overwrite = TRUE; - d->typing = FALSE; + d->overwrite = true; + d->typing = false; fix(); // will emit valueChanged if necessary } return d->ed->setFocusSection( s ); @@ -1466,13 +1466,13 @@ bool ExtDateEdit::setFocusSection( int s ) void ExtDateEdit::fix() { - bool changed = FALSE; + bool changed = false; ExtDate test = ExtDate( d->y, d->m, 1 ); if ( d->d > test.daysInMonth() ) { d->d = test.daysInMonth(); - changed = TRUE; + changed = true; } int currentYear = ExtDate::currentDate().year(); @@ -1488,11 +1488,11 @@ void ExtDateEdit::fix() if ( year >= currentYear + 30 ) year -= 100; } - changed = TRUE; + changed = true; } else if ( year < 1000 ) { int currentMillennium = currentYear / 10; year += currentMillennium * 10; - changed = TRUE; + changed = true; } */ if ( changed && outOfRange( year, d->m, d->d ) ) { @@ -1513,7 +1513,7 @@ void ExtDateEdit::fix() if ( changed ) { // emit valueChanged( date() ); -// d->changed = FALSE; +// d->changed = false; } } @@ -1525,8 +1525,8 @@ void ExtDateEdit::fix() bool ExtDateEdit::event( TQEvent *e ) { if( e->type() == TQEvent::FocusOut ) { - d->typing = FALSE; - d->overwrite = TRUE; + d->typing = false; + d->overwrite = true; // the following can't be done in fix() because fix() called // from all over the place and it will break the old behaviour if ( !ExtDate::isValid( d->y, d->m, d->d ) ) { @@ -1537,12 +1537,12 @@ bool ExtDateEdit::event( TQEvent *e ) if ( ExtDate::isValid( d->y, d->m, d->d ) ) break; } - d->changed = TRUE; + d->changed = true; } if ( d->changed ) { fix(); emit valueChanged( date() ); - d->changed = FALSE; + d->changed = false; } } else if ( e->type() == TQEvent::LocaleChange ) { readLocaleSettings(); @@ -1581,7 +1581,7 @@ void ExtDateEdit::removeFirstNumber( int sec ) d->d = txt.toInt(); d->dayCache = d->d; } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } /*! \reimp @@ -1607,7 +1607,7 @@ void ExtDateEdit::removeLastNumber( int sec ) d->d = txt.toInt(); d->dayCache = d->d; } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } /*! @@ -1615,9 +1615,9 @@ void ExtDateEdit::removeLastNumber( int sec ) \brief whether the editor automatically advances to the next section - If autoAdvance is TRUE, the editor will automatically advance + If autoAdvance is true, the editor will automatically advance focus to the next date section if a user has completed a section. - The default is FALSE. + The default is false. */ void ExtDateEdit::setAutoAdvance( bool advance ) @@ -1636,7 +1636,7 @@ bool ExtDateEdit::autoAdvance() const void ExtDateEdit::timerEvent( TQTimerEvent * ) { - d->overwrite = TRUE; + d->overwrite = true; } /*! @@ -1743,9 +1743,9 @@ public: // connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); // connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); // -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 2 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 0 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 1 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 2 ) ); // d->ed->setSeparator( localTimeSep() ); // // d->h = 0; @@ -1754,15 +1754,15 @@ public: // d->display = Hours | Minutes | Seconds; // if ( lAMPM ) { // d->display |= AMPM; -// d->ed->appendSection( TQNumberSection( 0,0, FALSE, 3 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, false, 3 ) ); // } -// d->adv = FALSE; -// d->overwrite = TRUE; +// d->adv = false; +// d->overwrite = true; // d->timerId = 0; -// d->typing = FALSE; +// d->typing = false; // d->min = TQTime( 0, 0, 0 ); // d->max = TQTime( 23, 59, 59 ); -// d->changed = FALSE; +// d->changed = false; // // setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); // @@ -1842,13 +1842,13 @@ public: // d->ed->clearSections(); // d->display = display; // if ( d->display & Hours ) -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 0 ) ); // if ( d->display & Minutes ) -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 1 ) ); // if ( d->display & Seconds ) -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 2 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 2 ) ); // if ( d->display & AMPM ) -// d->ed->appendSection( TQNumberSection( 0,0, FALSE, 3 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, false, 3 ) ); // // d->ed->setFocusSection( 0 ); // d->ed->update(); @@ -1881,8 +1881,8 @@ public: // d->s = time.second(); // emit valueChanged( time ); // } -// d->changed = FALSE; -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->changed = false; +// d->ed->repaint( d->ed->rect(), false ); // } // // TQTime TQTimeEdit::time() const @@ -1897,9 +1897,9 @@ public: // \brief whether the editor automatically advances to the next // section // -// If autoAdvance is TRUE, the editor will automatically advance +// If autoAdvance is true, the editor will automatically advance // focus to the next time section if a user has completed a section. -// The default is FALSE. +// The default is false. // */ // // void TQTimeEdit::setAutoAdvance( bool advance ) @@ -1946,10 +1946,10 @@ public: // bool TQTimeEdit::event( TQEvent *e ) // { // if ( e->type() == TQEvent::FocusOut ) { -// d->typing = FALSE; +// d->typing = false; // if ( d->changed ) { // emit valueChanged( time() ); -// d->changed = FALSE; +// d->changed = false; // } // } else if ( e->type() == TQEvent::LocaleChange ) { // readLocaleSettings(); @@ -1964,7 +1964,7 @@ public: // // void TQTimeEdit::timerEvent( TQTimerEvent * ) // { -// d->overwrite = TRUE; +// d->overwrite = true; // } // // @@ -1975,7 +1975,7 @@ public: // void TQTimeEdit::stepUp() // { // int sec = d->ed->mapSection( d->ed->focusSection() ); -// bool accepted = TRUE; +// bool accepted = true; // switch( sec ) { // case 0: // if ( !outOfRange( d->h+1, d->m, d->s ) ) @@ -2002,17 +2002,17 @@ public: // setHour( d->h-12 ); // break; // default: -// accepted = FALSE; +// accepted = false; // #ifdef TQT_CHECK_RANGE // tqWarning( "TQTimeEdit::stepUp: Focus section out of range!" ); // #endif // break; // } // if ( accepted ) { -// d->changed = TRUE; +// d->changed = true; // emit valueChanged( time() ); // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), false ); // } // // @@ -2024,7 +2024,7 @@ public: // { // int sec = d->ed->mapSection( d->ed->focusSection() ); // -// bool accepted = TRUE; +// bool accepted = true; // switch( sec ) { // case 0: // if ( !outOfRange( d->h-1, d->m, d->s ) ) @@ -2051,17 +2051,17 @@ public: // setHour( d->h+12 ); // break; // default: -// accepted = FALSE; +// accepted = false; // #ifdef TQT_CHECK_RANGE // tqWarning( "TQTimeEdit::stepDown: Focus section out of range!" ); // #endif // break; // } // if ( accepted ) { -// d->changed = TRUE; +// d->changed = true; // emit valueChanged( time() ); // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), false ); // } // // @@ -2094,15 +2094,15 @@ public: // { // if ( sec != d->ed->focusSection() ) { // killTimer( d->timerId ); -// d->overwrite = TRUE; -// d->typing = FALSE; +// d->overwrite = true; +// d->typing = false; // TQString txt = sectionText( sec ); // txt = txt.rightJustify( 2, EXTDATETIMEEDIT_HIDDEN_CHAR ); // int offset = sec*2+sec*separator().length() + txt.length(); // d->ed->setSectionSelection( sec, offset - txt.length(), offset ); // if ( d->changed ) { // emit valueChanged( time() ); -// d->changed = FALSE; +// d->changed = false; // } // } // return d->ed->setFocusSection( sec ); @@ -2203,7 +2203,7 @@ public: // // // /*! \internal -// Returns TRUE if \a h, \a m, and \a s are out of range. +// Returns true if \a h, \a m, and \a s are out of range. // */ // // bool TQTimeEdit::outOfRange( int h, int m, int s ) const @@ -2212,11 +2212,11 @@ public: // TQTime currentTime( h, m, s ); // if ( currentTime > maxValue() || // currentTime < minValue() ) -// return TRUE; +// return true; // else -// return FALSE; +// return false; // } -// return TRUE; +// return true; // } // // /*! \reimp @@ -2229,9 +2229,9 @@ public: // return; // sec = d->ed->mapSection( sec ); // killTimer( d->timerId ); -// bool overwrite = FALSE; -// bool accepted = FALSE; -// d->typing = TRUE; +// bool overwrite = false; +// bool accepted = false; +// d->typing = true; // TQString txt; // // switch( sec ) { @@ -2245,7 +2245,7 @@ public: // if ( d->display & AMPM && d->h > 11 ) // num += 12; // if ( !outOfRange( num, d->m, d->s ) ) { -// accepted = TRUE; +// accepted = true; // d->h = num; // } // } else { @@ -2257,19 +2257,19 @@ public: // if ( d->h < 12 ) { // temp = 0; // } -// accepted = TRUE; +// accepted = true; // } else if ( outOfRange( temp + 12, d->m, d->s ) ) { // txt = TQString::number( d->h ); // } else { // if ( d->h > 11 ) { // temp += 12; // } -// accepted = TRUE; +// accepted = true; // } // } else if ( !(d->display & AMPM) && outOfRange( temp, d->m, d->s ) ) { // txt = TQString::number( d->h ); // } else { -// accepted = TRUE; +// accepted = true; // } // // if ( accepted ) @@ -2277,7 +2277,7 @@ public: // // if ( d->adv && txt.length() == 2 ) { // setFocusSection( d->ed->focusSection()+1 ); -// overwrite = TRUE; +// overwrite = true; // } // } // break; @@ -2286,7 +2286,7 @@ public: // txt = TQString::number( d->m ); // if ( d->overwrite || txt.length() == 2 ) { // if ( !outOfRange( d->h, num, d->s ) ) { -// accepted = TRUE; +// accepted = true; // d->m = num; // } // } else { @@ -2297,12 +2297,12 @@ public: // if ( outOfRange( d->h, temp, d->s ) ) // txt = TQString::number( d->m ); // else { -// accepted = TRUE; +// accepted = true; // d->m = temp; // } // if ( d->adv && txt.length() == 2 ) { // setFocusSection( d->ed->focusSection()+1 ); -// overwrite = TRUE; +// overwrite = true; // } // } // break; @@ -2311,7 +2311,7 @@ public: // txt = TQString::number( d->s ); // if ( d->overwrite || txt.length() == 2 ) { // if ( !outOfRange( d->h, d->m, num ) ) { -// accepted = TRUE; +// accepted = true; // d->s = num; // } // } else { @@ -2322,12 +2322,12 @@ public: // if ( outOfRange( d->h, d->m, temp ) ) // txt = TQString::number( d->s ); // else { -// accepted = TRUE; +// accepted = true; // d->s = temp; // } // if ( d->adv && txt.length() == 2 ) { // setFocusSection( d->ed->focusSection()+1 ); -// overwrite = TRUE; +// overwrite = true; // } // } // break; @@ -2343,7 +2343,7 @@ public: // emit valueChanged( time() ); // d->overwrite = overwrite; // d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), false ); // } // // @@ -2383,7 +2383,7 @@ public: // d->s = txt.toInt(); // break; // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), false ); // } // // /*! \reimp @@ -2418,7 +2418,7 @@ public: // d->s = txt.toInt(); // break; // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), false ); // } // // /*! \reimp @@ -2609,7 +2609,7 @@ void ExtDateTimeEdit::init() d = new ExtDateTimeEditPrivate(); de = new ExtDateEdit( this, "qt_datetime_dateedit" ); te = new TQTimeEdit( this, "qt_datetime_timeedit" ); - d->adv = FALSE; + d->adv = false; connect( de, TQ_SIGNAL( valueChanged( const ExtDate& ) ), this, TQ_SLOT( newValue( const ExtDate& ) ) ); connect( te, TQ_SIGNAL( valueChanged( const TQTime& ) ), @@ -2684,7 +2684,7 @@ void ExtDateTimeEdit::newValue( const TQTime& ) /*! Sets the auto advance property of the editor to \a advance. If set - to TRUE, the editor will automatically advance focus to the next + to true, the editor will automatically advance focus to the next date or time section if the user has completed a section. */ @@ -2695,7 +2695,7 @@ void ExtDateTimeEdit::setAutoAdvance( bool advance ) } /*! - Returns TRUE if auto-advance is enabled, otherwise returns FALSE. + Returns true if auto-advance is enabled, otherwise returns false. \sa setAutoAdvance() */ diff --git a/libtdeedu/extdate/extdatetimeedit.h b/libtdeedu/extdate/extdatetimeedit.h index 6c252731..c4feaed7 100644 --- a/libtdeedu/extdate/extdatetimeedit.h +++ b/libtdeedu/extdate/extdatetimeedit.h @@ -285,7 +285,7 @@ private: class TQNumberSection { public: - TQNumberSection( int selStart = 0, int selEnd = 0, bool separat = TRUE, int actual = -1 ) + TQNumberSection( int selStart = 0, int selEnd = 0, bool separat = true, int actual = -1 ) : selstart( selStart ), selend( selEnd ), act( actual ), sep( separat ) {} int selectionStart() const { return selstart; } diff --git a/libtdeedu/extdate/test_extdate.cpp b/libtdeedu/extdate/test_extdate.cpp index d70d3e94..e787f6e4 100644 --- a/libtdeedu/extdate/test_extdate.cpp +++ b/libtdeedu/extdate/test_extdate.cpp @@ -237,8 +237,8 @@ void test5() void test6_unit(int y, int m, int d) { std::cout << d << "/" << m << "/" << y << " :: " - << ( ExtDate::isValid(y, m, d) ? "TRUE" : "FALSE" ) << " : " - << ( TQDate::isValid(y, m, d) ? "TRUE" : "FALSE" ) << std::endl; + << ( ExtDate::isValid(y, m, d) ? "true" : "false" ) << " : " + << ( TQDate::isValid(y, m, d) ? "true" : "false" ) << std::endl; } void test6() diff --git a/libtdeedu/extdate/testwidget.cpp b/libtdeedu/extdate/testwidget.cpp index 81965cc1..e78546e4 100644 --- a/libtdeedu/extdate/testwidget.cpp +++ b/libtdeedu/extdate/testwidget.cpp @@ -35,9 +35,9 @@ TestWidget::TestWidget( TQWidget *p, const char *name ) : TDEMainWindow( p, name kdp = new KDatePicker(w); edp = new ExtDatePicker(w); kdpEdit = new KLineEdit(w); - kdpEdit->setReadOnly( TRUE ); + kdpEdit->setReadOnly( true ); edpEdit = new KLineEdit(w); - edpEdit->setReadOnly( TRUE ); + edpEdit->setReadOnly( true ); kdw = new KDateWidget( TQDate::currentDate(), w ); edw = new ExtDateWidget( ExtDate::currentDate(), w ); |