diff options
Diffstat (limited to 'kspread')
27 files changed, 409 insertions, 409 deletions
diff --git a/kspread/dialogs/kspread_dlg_angle.cpp b/kspread/dialogs/kspread_dlg_angle.cpp index defb59bfd..50a93b583 100644 --- a/kspread/dialogs/kspread_dlg_angle.cpp +++ b/kspread/dialogs/kspread_dlg_angle.cpp @@ -39,7 +39,7 @@ using namespace KSpread; AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker) - : KDialogBase( parent, name,TRUE,i18n("Change Angle" ), Ok|Cancel|Default ) + : KDialogBase( parent, name,true,i18n("Change Angle" ), Ok|Cancel|Default ) { m_pView=parent; marker=_marker; diff --git a/kspread/dialogs/kspread_dlg_area.cpp b/kspread/dialogs/kspread_dlg_area.cpp index b160cb528..7771cc4ce 100644 --- a/kspread/dialogs/kspread_dlg_area.cpp +++ b/kspread/dialogs/kspread_dlg_area.cpp @@ -38,7 +38,7 @@ using namespace KSpread; AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marker ) - : KDialogBase( parent, name, TRUE, i18n("Area Name"), Ok | Cancel ) + : KDialogBase( parent, name, true, i18n("Area Name"), Ok | Cancel ) { m_pView = parent; m_marker = _marker; diff --git a/kspread/dialogs/kspread_dlg_comment.cpp b/kspread/dialogs/kspread_dlg_comment.cpp index 7c9bdb1c5..d3227bfc2 100644 --- a/kspread/dialogs/kspread_dlg_comment.cpp +++ b/kspread/dialogs/kspread_dlg_comment.cpp @@ -39,7 +39,7 @@ using namespace KSpread; CommentDialog::CommentDialog( View* parent, const char* name,const TQPoint &_marker) - : KDialogBase( parent, name,TRUE,i18n("Cell Comment"),Ok|Cancel ) + : KDialogBase( parent, name,true,i18n("Cell Comment"),Ok|Cancel ) { m_pView = parent; marker= _marker; diff --git a/kspread/dialogs/kspread_dlg_csv.cpp b/kspread/dialogs/kspread_dlg_csv.cpp index a93db2281..893c3c726 100644 --- a/kspread/dialogs/kspread_dlg_csv.cpp +++ b/kspread/dialogs/kspread_dlg_csv.cpp @@ -63,7 +63,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod if ( !name ) setName( "CSV" ); - setSizeGripEnabled( TRUE ); + setSizeGripEnabled( true ); TQWidget* page = new TQWidget( this ); setMainWidget( page ); @@ -102,7 +102,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_radioComma = new TQRadioButton( m_delimiterBox, "m_radioComma" ); m_radioComma->setText( i18n( "Comma" ) ); - m_radioComma->setChecked( TRUE ); + m_radioComma->setChecked( true ); m_delimiterBoxLayout->addWidget( m_radioComma, 0, 0 ); m_radioSemicolon = new TQRadioButton( m_delimiterBox, "m_radioSemicolon" ); @@ -144,7 +144,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_radioText = new TQRadioButton( m_formatBox, "m_radioText" ); m_radioText->setText( i18n( "Text" ) ); - m_radioText->setChecked( TRUE ); + m_radioText->setChecked( true ); m_formatBoxLayout->addWidget( m_radioText, 0, 0 ); m_radioCurrency = new TQRadioButton( m_formatBox, "m_radioCurrency" ); @@ -155,13 +155,13 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_radioDate->setText( i18n( "Date" ) ); m_formatBoxLayout->addWidget( m_radioDate, 1, 2 ); - m_comboLine = new TQComboBox( FALSE, page, "m_comboLine" ); + m_comboLine = new TQComboBox( false, page, "m_comboLine" ); m_comboLine->insertItem( i18n( "1" ) ); m_comboLine->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) ); MyDialogLayout->addWidget( m_comboLine, 1, 3 ); - m_comboQuote = new TQComboBox( FALSE, page, "m_comboQuote" ); + m_comboQuote = new TQComboBox( false, page, "m_comboQuote" ); m_comboQuote->insertItem( i18n( "\"" ) ); m_comboQuote->insertItem( i18n( "'" ) ); m_comboQuote->insertItem( i18n( "None" ) ); diff --git a/kspread/dialogs/kspread_dlg_database.cpp b/kspread/dialogs/kspread_dlg_database.cpp index a8c882493..41e15d6e2 100644 --- a/kspread/dialogs/kspread_dlg_database.cpp +++ b/kspread/dialogs/kspread_dlg_database.cpp @@ -104,7 +104,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * TextLabel2->setText( i18n( "Host:" ) ); Frame16Layout->addWidget( TextLabel2, 2, 0 ); - m_driver = new TQComboBox( FALSE, Frame16, "m_driver" ); + m_driver = new TQComboBox( false, Frame16, "m_driver" ); Frame16Layout->addWidget( m_driver, 0, 1 ); m_username = new TQLineEdit( Frame16, "m_username" ); @@ -172,7 +172,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * // TextLabel12_2->setText( i18n( "Database:" ) ); // Layout21->addWidget( TextLabel12_2 ); - // m_databaseList = new TQComboBox( FALSE, Frame5_2, "m_databaseList" ); + // m_databaseList = new TQComboBox( false, Frame5_2, "m_databaseList" ); // Layout21->addWidget( m_databaseList ); // m_connectButton = new KPushButton( Frame5_2, "m_connectButton" ); @@ -191,7 +191,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_sheetView = new TDEListView( Frame5_2, "m_tableView" ); m_sheetView->addColumn( i18n( "Sheet" ) ); - m_sheetView->setRootIsDecorated( FALSE ); + m_sheetView->setRootIsDecorated( false ); Frame5_2Layout->addWidget( m_sheetView, 2, 0 ); @@ -223,7 +223,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_columnView->addColumn( i18n( "Column" ) ); m_columnView->addColumn( i18n( "Sheet" ) ); m_columnView->addColumn( i18n( "Data Type" ) ); - m_columnView->setRootIsDecorated( FALSE ); + m_columnView->setRootIsDecorated( false ); Frame5_2_2Layout->addWidget( m_columnView, 1, 0 ); @@ -271,13 +271,13 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_operatorValue_1 = new TQLineEdit( optionsFrame, "m_operatorValue" ); optionsFrameLayout->addWidget( m_operatorValue_1, 2, 2 ); - m_columns_2 = new TQComboBox( FALSE, optionsFrame, "m_columns_2" ); + m_columns_2 = new TQComboBox( false, optionsFrame, "m_columns_2" ); optionsFrameLayout->addWidget( m_columns_2, 3, 0 ); m_operatorValue_3 = new TQLineEdit( optionsFrame, "m_operatorValue_3" ); optionsFrameLayout->addWidget( m_operatorValue_3, 4, 2 ); - m_operator_1 = new TQComboBox( FALSE, optionsFrame, "m_operator_1" ); + m_operator_1 = new TQComboBox( false, optionsFrame, "m_operator_1" ); m_operator_1->insertItem( i18n( "equals" ) ); m_operator_1->insertItem( i18n( "not equal" ) ); m_operator_1->insertItem( i18n( "in" ) ); @@ -290,7 +290,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * optionsFrameLayout->addWidget( m_operator_1, 2, 1 ); - m_operator_2 = new TQComboBox( FALSE, optionsFrame, "m_operator_2" ); + m_operator_2 = new TQComboBox( false, optionsFrame, "m_operator_2" ); m_operator_2->insertItem( i18n( "equals" ) ); m_operator_2->insertItem( i18n( "not equal" ) ); m_operator_2->insertItem( i18n( "in" ) ); @@ -301,7 +301,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * optionsFrameLayout->addWidget( m_operator_2, 3, 1 ); - m_operator_3 = new TQComboBox( FALSE, optionsFrame, "m_operator_3" ); + m_operator_3 = new TQComboBox( false, optionsFrame, "m_operator_3" ); m_operator_3->insertItem( i18n( "equals" ) ); m_operator_3->insertItem( i18n( "not equal" ) ); m_operator_3->insertItem( i18n( "in" ) ); @@ -395,7 +395,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_startingCell = new TQRadioButton( Frame12, "m_startingCell" ); m_startingCell->setText( i18n( "Starting in cell" ) ); - m_startingCell->setChecked( TRUE ); + m_startingCell->setChecked( true ); Frame12Layout->addWidget( m_startingCell, 1, 0 ); Frame5_2_2_3Layout->addWidget( Frame12, 2, 0 ); diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h index 03d49e9ac..4a90bfebc 100644 --- a/kspread/dialogs/kspread_dlg_database.h +++ b/kspread/dialogs/kspread_dlg_database.h @@ -55,7 +55,7 @@ class DatabaseDialog : public KWizard public: enum PageId { eDatabase = 0, eSheets = 1, eColumns = 2, eOptions = 3, eResult = 4 }; - DatabaseDialog( View * parent, TQRect const & rect, const char * name = 0, bool modal = FALSE, WFlags fl = 0 ); + DatabaseDialog( View * parent, TQRect const & rect, const char * name = 0, bool modal = false, WFlags fl = 0 ); virtual ~DatabaseDialog(); private slots: diff --git a/kspread/dialogs/kspread_dlg_format.cpp b/kspread/dialogs/kspread_dlg_format.cpp index 3b304f1d4..f09280fef 100644 --- a/kspread/dialogs/kspread_dlg_format.cpp +++ b/kspread/dialogs/kspread_dlg_format.cpp @@ -48,7 +48,7 @@ using namespace KSpread; FormatDialog::FormatDialog( View* view, const char* name ) - : KDialogBase( view, name, TRUE,i18n("Sheet Style"),Ok|Cancel ) + : KDialogBase( view, name, true,i18n("Sheet Style"),Ok|Cancel ) { for( int i = 0; i < 16; ++i ) m_cells[ i ] = 0; @@ -67,12 +67,12 @@ FormatDialog::FormatDialog( View* view, const char* name ) vbox->addWidget( m_label ); - TQStringList lst = Factory::global()->dirs()->findAllResources( "sheet-styles", "*.ksts", TRUE ); + TQStringList lst = Factory::global()->dirs()->findAllResources( "sheet-styles", "*.ksts", true ); TQStringList::Iterator it = lst.begin(); for( ; it != lst.end(); ++it ) { - KSimpleConfig cfg( *it, TRUE ); + KSimpleConfig cfg( *it, true ); cfg.setGroup( "Sheet-Style" ); Entry e; @@ -346,7 +346,7 @@ bool FormatDialog::parseXML( const TQDomDocument& doc ) } } - return TRUE; + return true; } #include "kspread_dlg_format.moc" diff --git a/kspread/dialogs/kspread_dlg_formula.cpp b/kspread/dialogs/kspread_dlg_formula.cpp index 324df02d8..24f90cd74 100644 --- a/kspread/dialogs/kspread_dlg_formula.cpp +++ b/kspread/dialogs/kspread_dlg_formula.cpp @@ -159,7 +159,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for grid2->addStretch( 10 ); m_tabwidget->addTab( m_input, i18n("&Parameters") ); - m_tabwidget->setTabEnabled( m_input, FALSE ); + m_tabwidget->setTabEnabled( m_input, false ); m_tabwidget->setCurrentPage( index ); @@ -282,12 +282,12 @@ bool FormulaDialog::eventFilter( TQObject* obj, TQEvent* ev ) else if ( obj == fiveElement && ev->type() == TQEvent::FocusIn ) m_focus = fiveElement; else - return FALSE; + return false; if ( m_focus ) m_pView->canvasWidget()->startChoose(); - return FALSE; + return false; } void FormulaDialog::slotOk() @@ -391,19 +391,19 @@ TQString FormulaDialog::createFormula() if ( !m_desc ) return TQString(); - bool first = TRUE; + bool first = true; int count = m_desc->params(); if(!firstElement->text().isEmpty() && count >= 1 ) { tmp=tmp+createParameter(firstElement->text(), 0 ); - first = FALSE; + first = false; } if(!secondElement->text().isEmpty() && count >= 2 ) { - first = FALSE; + first = false; if ( !first ) tmp=tmp+";"+createParameter(secondElement->text(), 1 ); else @@ -411,7 +411,7 @@ TQString FormulaDialog::createFormula() } if(!thirdElement->text().isEmpty() && count >= 3 ) { - first = FALSE; + first = false; if ( !first ) tmp=tmp+";"+createParameter(thirdElement->text(), 2 ); else @@ -419,7 +419,7 @@ TQString FormulaDialog::createFormula() } if(!fourElement->text().isEmpty() && count >= 4 ) { - first = FALSE; + first = false; if ( !first ) tmp=tmp+";"+createParameter(fourElement->text(), 3 ); else @@ -427,7 +427,7 @@ TQString FormulaDialog::createFormula() } if(!fiveElement->text().isEmpty() && count >= 5 ) { - first = FALSE; + first = false; if ( !first ) tmp=tmp+";"+createParameter(fiveElement->text(), 4 ); else @@ -570,7 +570,7 @@ void FormulaDialog::slotDoubleClicked( TQListBoxItem* item ) // Dont change order of these function calls due to a bug in TQt 2.2 m_browser->setText( m_desc->toTQML() ); - m_tabwidget->setTabEnabled( m_input, TRUE ); + m_tabwidget->setTabEnabled( m_input, true ); m_tabwidget->setCurrentPage( 1 ); // @@ -678,7 +678,7 @@ void FormulaDialog::slotSelected( const TQString& function ) } if( functions->currentItem() !=- 1 ) - selectFunction->setEnabled( TRUE ); + selectFunction->setEnabled( true ); // Lock refresh_result = false; @@ -693,7 +693,7 @@ void FormulaDialog::slotSelected( const TQString& function ) m_focus=0; m_tabwidget->setCurrentPage( 0 ); - m_tabwidget->setTabEnabled( m_input, FALSE ); + m_tabwidget->setTabEnabled( m_input, false ); // Unlock refresh_result=true; diff --git a/kspread/dialogs/kspread_dlg_goalseek.cpp b/kspread/dialogs/kspread_dlg_goalseek.cpp index 1a2dbb378..1f49ae3ae 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cpp +++ b/kspread/dialogs/kspread_dlg_goalseek.cpp @@ -111,13 +111,13 @@ GoalSeekDialog::GoalSeekDialog( View * parent, TQPoint const & marker, m_buttonOk = new TQPushButton( this, "m_buttonOk" ); m_buttonOk->setText( i18n( "&Start" ) ); m_buttonOk->setAccel( 276824143 ); - m_buttonOk->setAutoDefault( TRUE ); - m_buttonOk->setDefault( TRUE ); + m_buttonOk->setAutoDefault( true ); + m_buttonOk->setDefault( true ); Layout5->addWidget( m_buttonOk ); m_buttonCancel = new KPushButton( KStdGuiItem::cancel(), this, "m_buttonCancel" ); m_buttonCancel->setAccel( 276824131 ); - m_buttonCancel->setAutoDefault( TRUE ); + m_buttonCancel->setAutoDefault( true ); Layout5->addWidget( m_buttonCancel ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); Layout5->addItem( spacer ); @@ -204,12 +204,12 @@ bool GoalSeekDialog::eventFilter( TQObject* obj, TQEvent* ev ) else if ( obj == m_sourceEdit && ev->type() == TQEvent::FocusIn ) m_focus = m_sourceEdit; else - return FALSE; + return false; if ( m_focus ) m_pView->canvasWidget()->startChoose(); - return FALSE; + return false; } void GoalSeekDialog::closeEvent ( TQCloseEvent * e ) diff --git a/kspread/dialogs/kspread_dlg_goalseek.h b/kspread/dialogs/kspread_dlg_goalseek.h index 32ac2d9e6..371e488ca 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.h +++ b/kspread/dialogs/kspread_dlg_goalseek.h @@ -52,7 +52,7 @@ class GoalSeekDialog : public KDialog public: GoalSeekDialog( View * parent, TQPoint const & marker, const char * name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); ~GoalSeekDialog(); /** diff --git a/kspread/dialogs/kspread_dlg_goto.cpp b/kspread/dialogs/kspread_dlg_goto.cpp index 4c74c9b93..67a0ec133 100644 --- a/kspread/dialogs/kspread_dlg_goto.cpp +++ b/kspread/dialogs/kspread_dlg_goto.cpp @@ -39,7 +39,7 @@ using namespace KSpread; GotoDialog::GotoDialog( View* parent, const char* name ) - : KDialogBase( parent, name, TRUE, i18n("Goto Cell"), Ok|Cancel ) + : KDialogBase( parent, name, true, i18n("Goto Cell"), Ok|Cancel ) { m_pView = parent; TQWidget *page = new TQWidget( this ); diff --git a/kspread/dialogs/kspread_dlg_insert.cpp b/kspread/dialogs/kspread_dlg_insert.cpp index 8e4e3ae35..e6d2cc0e1 100644 --- a/kspread/dialogs/kspread_dlg_insert.cpp +++ b/kspread/dialogs/kspread_dlg_insert.cpp @@ -43,7 +43,7 @@ using namespace KSpread; InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,Mode _mode) - : KDialogBase( parent, name, TRUE,"",Ok|Cancel ) + : KDialogBase( parent, name, true,"",Ok|Cancel ) { m_pView = parent; rect=_rect; @@ -54,7 +54,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Insert"),page); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); lay1->addWidget(grp); if( insRem==Insert) diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h index 1360f1c88..a42df77ef 100644 --- a/kspread/dialogs/kspread_dlg_layout.h +++ b/kspread/dialogs/kspread_dlg_layout.h @@ -110,7 +110,7 @@ public: void setPattern( const TQColor &_color, int _width, TQt::PenStyle _style ); void setUndefined(); - void setDefined() { undefined = FALSE; repaint(); } + void setDefined() { undefined = false; repaint(); } bool isDefined() { return !undefined; } diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cpp b/kspread/dialogs/kspread_dlg_pasteinsert.cpp index b966f6eb2..e5c6c394f 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.cpp +++ b/kspread/dialogs/kspread_dlg_pasteinsert.cpp @@ -38,7 +38,7 @@ using namespace KSpread; PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRect &_rect) - : KDialogBase( parent, name, TRUE,i18n("Paste Inserting Cells"),Ok|Cancel ) + : KDialogBase( parent, name, true,i18n("Paste Inserting Cells"),Ok|Cancel ) { m_pView = parent; rect=_rect; @@ -48,7 +48,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Insert"),page); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); lay1->addWidget(grp); rb1 = new TQRadioButton( i18n("Move towards right"), grp ); diff --git a/kspread/dialogs/kspread_dlg_reference.cpp b/kspread/dialogs/kspread_dlg_reference.cpp index 96d0d5b59..bb30c244c 100644 --- a/kspread/dialogs/kspread_dlg_reference.cpp +++ b/kspread/dialogs/kspread_dlg_reference.cpp @@ -52,7 +52,7 @@ using namespace KSpread; reference::reference( View* parent, const char* name ) - : TQDialog( parent, name,TRUE ) + : TQDialog( parent, name,true ) { m_pView = parent; TQVBoxLayout *lay1 = new TQVBoxLayout( this ); @@ -74,7 +74,7 @@ reference::reference( View* parent, const char* name ) m_pEdit = bb->addButton( i18n("&Edit...") ); m_pOk = bb->addButton( KStdGuiItem::ok() ); m_pCancel = bb->addButton( KStdGuiItem::cancel() ); - m_pOk->setDefault( TRUE ); + m_pOk->setDefault( true ); bb->layout(); lay1->addWidget( bb ); @@ -285,7 +285,7 @@ EditAreaName::EditAreaName( View * parent, EditAreaNameLayout->addWidget( TextLabel1, 1, 0 ); - m_sheets = new TQComboBox( FALSE, page, "m_sheets" ); + m_sheets = new TQComboBox( false, page, "m_sheets" ); EditAreaNameLayout->addWidget( m_sheets, 1, 1 ); diff --git a/kspread/dialogs/kspread_dlg_series.cpp b/kspread/dialogs/kspread_dlg_series.cpp index d424f8253..e31eb9a00 100644 --- a/kspread/dialogs/kspread_dlg_series.cpp +++ b/kspread/dialogs/kspread_dlg_series.cpp @@ -48,7 +48,7 @@ using namespace KSpread; SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) - : KDialogBase( parent, name,TRUE,i18n("Series"),Ok|Cancel ) + : KDialogBase( parent, name,true,i18n("Series"),Ok|Cancel ) { m_pView = parent; marker=_marker; diff --git a/kspread/dialogs/kspread_dlg_show.cpp b/kspread/dialogs/kspread_dlg_show.cpp index 4cea9f115..76ef7dbb3 100644 --- a/kspread/dialogs/kspread_dlg_show.cpp +++ b/kspread/dialogs/kspread_dlg_show.cpp @@ -39,7 +39,7 @@ using namespace KSpread; ShowDialog::ShowDialog( View* parent, const char* name ) - : KDialogBase( parent, name,TRUE,i18n("Show Sheet"),Ok|Cancel ) + : KDialogBase( parent, name,true,i18n("Show Sheet"),Ok|Cancel ) { m_pView = parent; TQWidget *page = new TQWidget( this ); diff --git a/kspread/dialogs/kspread_dlg_showColRow.cpp b/kspread/dialogs/kspread_dlg_showColRow.cpp index 0828667f1..5bf192543 100644 --- a/kspread/dialogs/kspread_dlg_showColRow.cpp +++ b/kspread/dialogs/kspread_dlg_showColRow.cpp @@ -36,7 +36,7 @@ using namespace KSpread; ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) - : KDialogBase( parent, name,TRUE,"",Ok|Cancel ) + : KDialogBase( parent, name,true,"",Ok|Cancel ) { m_pView = parent; typeShow=_type; diff --git a/kspread/dialogs/kspread_dlg_special.cpp b/kspread/dialogs/kspread_dlg_special.cpp index 2b854f217..34554fb42 100644 --- a/kspread/dialogs/kspread_dlg_special.cpp +++ b/kspread/dialogs/kspread_dlg_special.cpp @@ -37,7 +37,7 @@ using namespace KSpread; SpecialDialog::SpecialDialog( View* parent, const char* name ) - : KDialogBase( parent, name, TRUE,i18n("Special Paste"),Ok|Cancel ) + : KDialogBase( parent, name, true,i18n("Special Paste"),Ok|Cancel ) { m_pView = parent; TQWidget *page = new TQWidget( this ); @@ -45,7 +45,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Paste What" ),page ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); lay1->addWidget(grp); rb1 = new TQRadioButton( i18n("Everything"), grp ); @@ -58,7 +58,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) rb1->setChecked(true); grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Operation"),page); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); lay1->addWidget(grp); diff --git a/kspread/dialogs/kspread_dlg_styles.cpp b/kspread/dialogs/kspread_dlg_styles.cpp index 1aae08149..3e4a38cc6 100644 --- a/kspread/dialogs/kspread_dlg_styles.cpp +++ b/kspread/dialogs/kspread_dlg_styles.cpp @@ -49,7 +49,7 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl ) m_styleList->setResizeMode( TDEListView::AllColumns ); layout->addWidget( m_styleList ); - m_displayBox = new KComboBox( FALSE, this, "m_displayBox" ); + m_displayBox = new KComboBox( false, this, "m_displayBox" ); layout->addWidget( m_displayBox ); m_styleList->header()->setLabel( 0, i18n( "Styles" ) ); diff --git a/kspread/functions.cpp b/kspread/functions.cpp index fa485171a..99f021c27 100644 --- a/kspread/functions.cpp +++ b/kspread/functions.cpp @@ -208,7 +208,7 @@ FunctionRepository* FunctionRepository::self() // find all XML description files TQStringList files = Factory::global()->dirs()->findAllResources - ("extensions", "*.xml", TRUE); + ("extensions", "*.xml", true); // load desc/help from XML file for( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) @@ -324,7 +324,7 @@ static ParameterType toType( const TQString& type ) return KSpread_Float; } -static TQString toString (ParameterType type, bool range = FALSE) +static TQString toString (ParameterType type, bool range = false) { if ( !range ) { @@ -363,7 +363,7 @@ static TQString toString (ParameterType type, bool range = FALSE) FunctionParameter::FunctionParameter() { m_type = KSpread_Float; - m_range = FALSE; + m_range = false; } FunctionParameter::FunctionParameter (const FunctionParameter& param) @@ -376,7 +376,7 @@ FunctionParameter::FunctionParameter (const FunctionParameter& param) FunctionParameter::FunctionParameter (const TQDomElement& element) { m_type = KSpread_Float; - m_range = FALSE; + m_range = false; TQDomNode n = element.firstChild(); for( ; !n.isNull(); n = n.nextSibling() ) @@ -391,7 +391,7 @@ FunctionParameter::FunctionParameter (const TQDomElement& element) if ( e.hasAttribute( "range" )) { if (e.attribute("range").lower() == "true") - m_range = TRUE; + m_range = true; } } } diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h index 2aaab4008..03ca9243a 100644 --- a/kspread/kspread_object.h +++ b/kspread/kspread_object.h @@ -356,7 +356,7 @@ class EmbeddedPictureObject : public EmbeddedObject //virtual void loadOasis(const TQDomElement &element, KoOasisLoadingContext & context, KPRLoadingInfo *info); // virtual void draw( TQPainter *_painter, KoZoomHandler*_zoomHandler, -// int /* page */, SelectionMode selectionMode, bool drawContour = FALSE ); +// int /* page */, SelectionMode selectionMode, bool drawContour = false ); TQPixmap getOriginalPixmap(); PictureMirrorType getPictureMirrorType() const { return mirrorType; } diff --git a/kspread/kspread_toolbox.cpp b/kspread/kspread_toolbox.cpp index 82373f893..76dc09db5 100644 --- a/kspread/kspread_toolbox.cpp +++ b/kspread/kspread_toolbox.cpp @@ -53,14 +53,14 @@ void ToolBox::setEnabled( bool enable ) { ++it; if ( w->isWidgetType() ) - w->setEnabled( TRUE ); + w->setEnabled( true ); } } } else { if ( focusWidget() == this ) - focusNextPrevChild( TRUE ); + focusNextPrevChild( true ); TQObjectList clo = childrenListObject(); if ( !clo.isEmpty() ) { @@ -71,7 +71,7 @@ void ToolBox::setEnabled( bool enable ) ++it; if ( w->isWidgetType() ) { - w->setEnabled( FALSE ); + w->setEnabled( false ); // w->clearWState( WState_ForceDisabled ); } } diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index 66ded1ffb..a08d2c391 100644 --- a/kspread/kspread_view.cpp +++ b/kspread/kspread_view.cpp @@ -4974,7 +4974,7 @@ void View::print( KPrinter &prt ) continue; } - setActiveSheet(sheet,FALSE); + setActiveSheet(sheet,false); SheetPrint* print = d->activeSheet->print(); diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index 92f665e71..a41418cdb 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -72,7 +72,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char pb = new TQPushButton( this, "helpbutton" ); pb->setText( "kCalc" ); - pb->setFont( TQFont("times",12,TQFont::Bold,FALSE) ); + pb->setFont( TQFont("times",12,TQFont::Bold,false) ); TQToolTip::add( pb, i18n("KCalc Setup/Help") ); connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(configclicked()) ); @@ -111,7 +111,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char anglebutton[0] = new TQRadioButton( angle_group ); anglebutton[0]->setText( "&Deg" ) ; - anglebutton[0]->setChecked( TRUE); + anglebutton[0]->setChecked( true); accel->connectItem( accel->insertItem(Key_D + ALT), this , TQ_SLOT(Deg_Selected()) ); @@ -145,7 +145,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char basebutton[1] = new TQRadioButton( base_group ); basebutton[1]->setText( "D&ec" ); - basebutton[1]->setChecked(TRUE); + basebutton[1]->setChecked(true); accel->connectItem( accel->insertItem(Key_E + ALT), this , TQ_SLOT(Dec_Selected()) ); @@ -173,203 +173,203 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char pbhyp = new TQPushButton("Hyp", mSmallPage, "hypbutton" ); connect( pbhyp, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbhyptoggled(bool))); - pbhyp->setToggleButton(TRUE); + pbhyp->setToggleButton(true); pbinv = new TQPushButton( "Inv", mSmallPage, "InverseButton" ); connect( pbinv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbinvtoggled(bool))); - pbinv->setToggleButton(TRUE); + pbinv->setToggleButton(true); pbA = new TQPushButton("A",mSmallPage, "Abutton" ); connect( pbA, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbAtoggled(bool))); - pbA->setToggleButton(TRUE); + pbA->setToggleButton(true); pbSin = new TQPushButton("Sin",mSmallPage, "Sinbutton" ); connect( pbSin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbSintoggled(bool))); - pbSin->setToggleButton(TRUE); + pbSin->setToggleButton(true); pbplusminus = new TQPushButton( "+/-", mSmallPage, "plusminusbutton" ); connect( pbplusminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbplusminustoggled(bool))); - pbplusminus->setToggleButton(TRUE); + pbplusminus->setToggleButton(true); pbplusminus->setFont(buttonfont); pbB = new TQPushButton("B", mSmallPage, "Bbutton" ); connect( pbB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbBtoggled(bool))); - pbB->setToggleButton(TRUE); + pbB->setToggleButton(true); pbCos = new TQPushButton("Cos",mSmallPage, "Cosbutton" ); pbCos->setText( "Cos" ); connect( pbCos, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCostoggled(bool))); - pbCos->setToggleButton(TRUE); + pbCos->setToggleButton(true); pbreci = new TQPushButton("1/x",mSmallPage, "recibutton" ); connect( pbreci, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbrecitoggled(bool))); - pbreci->setToggleButton(TRUE); + pbreci->setToggleButton(true); pbC = new TQPushButton( "C", mSmallPage, "Cbutton" ); connect( pbC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCtoggled(bool))); - pbC->setToggleButton(TRUE); + pbC->setToggleButton(true); pbTan = new TQPushButton("Tan" ,mSmallPage, "Tanbutton" ); connect( pbTan, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbTantoggled(bool))); - pbTan->setToggleButton(TRUE); + pbTan->setToggleButton(true); pbfactorial = new TQPushButton("x!",mSmallPage, "factorialbutton" ); connect( pbfactorial, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbfactorialtoggled(bool))); - pbfactorial->setToggleButton(TRUE); + pbfactorial->setToggleButton(true); pbD = new TQPushButton("D",mSmallPage, "Dbutton" ); connect( pbD, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbDtoggled(bool))); - pbD->setToggleButton(TRUE); + pbD->setToggleButton(true); pblog = new TQPushButton("Log",mSmallPage, "logbutton" ); connect( pblog, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pblogtoggled(bool))); - pblog->setToggleButton(TRUE); + pblog->setToggleButton(true); pbsquare = new TQPushButton( "x^2", mSmallPage, "squarebutton" ); connect( pbsquare, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbsquaretoggled(bool))); - pbsquare->setToggleButton(TRUE); + pbsquare->setToggleButton(true); pbE = new TQPushButton("E",mSmallPage, "Ebutton" ); connect( pbE, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbEtoggled(bool))); - pbE->setToggleButton(TRUE); + pbE->setToggleButton(true); pbln = new TQPushButton( "Ln", mSmallPage, "lnbutton" ); connect( pbln, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pblntoggled(bool))); - pbln->setToggleButton(TRUE); + pbln->setToggleButton(true); pbpower = new TQPushButton("x^y",mSmallPage, "powerbutton" ); connect( pbpower, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbpowertoggled(bool))); - pbpower->setToggleButton(TRUE); + pbpower->setToggleButton(true); pbF = new TQPushButton("F",mSmallPage, "Fbutton" ); connect( pbF, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbFtoggled(bool))); - pbF->setToggleButton(TRUE); + pbF->setToggleButton(true); pbEE = new TQPushButton("EE",mLargePage, "EEbutton" ); - pbEE->setToggleButton(TRUE); + pbEE->setToggleButton(true); connect( pbEE, TQ_SIGNAL(toggled(bool)), TQ_SLOT(EEtoggled(bool))); pbMR = new TQPushButton("MR",mLargePage, "MRbutton" ); connect( pbMR, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMRtoggled(bool))); - pbMR->setToggleButton(TRUE); + pbMR->setToggleButton(true); pbMR->setFont(buttonfont); pbMplusminus = new TQPushButton("M+-",mLargePage, "Mplusminusbutton" ); connect( pbMplusminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMplusminustoggled(bool))); - pbMplusminus->setToggleButton(TRUE); + pbMplusminus->setToggleButton(true); pbMC = new TQPushButton("MC",mLargePage, "MCbutton" ); connect( pbMC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMCtoggled(bool))); - pbMC->setToggleButton(TRUE); + pbMC->setToggleButton(true); pbClear = new TQPushButton("C",mLargePage, "Clearbutton" ); connect( pbClear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCleartoggled(bool))); - pbClear->setToggleButton(TRUE); + pbClear->setToggleButton(true); pbAC = new TQPushButton("AC", mLargePage, "ACbutton" ); connect( pbAC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbACtoggled(bool))); - pbAC->setToggleButton(TRUE); + pbAC->setToggleButton(true); pb7 = new TQPushButton("7",mLargePage, "7button" ); connect( pb7, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb7toggled(bool))); - pb7->setToggleButton(TRUE); + pb7->setToggleButton(true); pb8 = new TQPushButton("8",mLargePage, "8button" ); connect( pb8, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb8toggled(bool))); - pb8->setToggleButton(TRUE); + pb8->setToggleButton(true); pb9 = new TQPushButton("9",mLargePage,"9button" ); connect( pb9, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb9toggled(bool))); - pb9->setToggleButton(TRUE); + pb9->setToggleButton(true); pbparenopen = new TQPushButton("(",mLargePage, "parenopenbutton" ); connect( pbparenopen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbparenopentoggled(bool))); - pbparenopen->setToggleButton(TRUE); + pbparenopen->setToggleButton(true); pbparenclose = new TQPushButton(")",mLargePage, "parenclosebutton" ); connect( pbparenclose, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbparenclosetoggled(bool))); - pbparenclose->setToggleButton(TRUE); + pbparenclose->setToggleButton(true); pband = new TQPushButton("And",mLargePage, "andbutton" ); connect( pband, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbandtoggled(bool))); - pband->setToggleButton(TRUE); + pband->setToggleButton(true); pband->setFont(buttonfont); pb4 = new TQPushButton("4",mLargePage, "4button" ); connect( pb4, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb4toggled(bool))); - pb4->setToggleButton(TRUE); + pb4->setToggleButton(true); pb5 = new TQPushButton("5",mLargePage, "5button" ); connect( pb5, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb5toggled(bool))); - pb5->setToggleButton(TRUE); + pb5->setToggleButton(true); pb6 = new TQPushButton("6",mLargePage, "6button" ); connect( pb6, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb6toggled(bool))); - pb6->setToggleButton(TRUE); + pb6->setToggleButton(true); pbX = new TQPushButton("X",mLargePage, "Multiplybutton" ); connect( pbX, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbXtoggled(bool))); - pbX->setToggleButton(TRUE); + pbX->setToggleButton(true); pbdivision = new TQPushButton("/",mLargePage, "divisionbutton" ); connect( pbdivision, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbdivisiontoggled(bool))); - pbdivision->setToggleButton(TRUE); + pbdivision->setToggleButton(true); pbor = new TQPushButton("Or",mLargePage, "orbutton" ); connect( pbor, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbortoggled(bool))); - pbor->setToggleButton(TRUE); + pbor->setToggleButton(true); pb1 = new TQPushButton("1",mLargePage, "1button" ); connect( pb1, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb1toggled(bool))); - pb1->setToggleButton(TRUE); + pb1->setToggleButton(true); pb2 = new TQPushButton("2",mLargePage, "2button" ); connect( pb2, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb2toggled(bool))); - pb2->setToggleButton(TRUE); + pb2->setToggleButton(true); pb3 = new TQPushButton("3",mLargePage, "3button" ); connect( pb3, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb3toggled(bool))); - pb3->setToggleButton(TRUE); + pb3->setToggleButton(true); pbplus = new TQPushButton("+",mLargePage, "plusbutton" ); connect( pbplus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbplustoggled(bool))); - pbplus->setToggleButton(TRUE); + pbplus->setToggleButton(true); pbminus = new TQPushButton("-",mLargePage, "minusbutton" ); connect( pbminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbminustoggled(bool))); - pbminus->setToggleButton(TRUE); + pbminus->setToggleButton(true); pbshift = new TQPushButton("Lsh",mLargePage, "shiftbutton" ); connect( pbshift, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbshifttoggled(bool))); - pbshift->setToggleButton(TRUE); + pbshift->setToggleButton(true); pbperiod = new TQPushButton(".",mLargePage, "periodbutton" ); connect( pbperiod, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbperiodtoggled(bool))); - pbperiod->setToggleButton(TRUE); + pbperiod->setToggleButton(true); pb0 = new TQPushButton("0",mLargePage, "0button" ); connect( pb0, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb0toggled(bool))); - pb0->setToggleButton(TRUE); + pb0->setToggleButton(true); pbequal = new TQPushButton("=",mLargePage, "equalbutton" ); connect( pbequal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbequaltoggled(bool))); - pbequal->setToggleButton(TRUE); + pbequal->setToggleButton(true); pbpercent = new TQPushButton("%",mLargePage, "percentbutton" ); connect( pbpercent, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbpercenttoggled(bool))); - pbpercent->setToggleButton(TRUE); + pbpercent->setToggleButton(true); pbnegate = new TQPushButton("Cmp",mLargePage, "OneComplementbutton" ); connect( pbnegate, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbnegatetoggled(bool))); - pbnegate->setToggleButton(TRUE); + pbnegate->setToggleButton(true); pbmod = new TQPushButton("Mod",mLargePage, "modbutton" ); connect( pbmod, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbmodtoggled(bool))); - pbmod->setToggleButton(TRUE); + pbmod->setToggleButton(true); TQGridLayout *smallBtnLayout = new TQGridLayout(mSmallPage, 6, 3, 0, mInternalSpacing); @@ -631,30 +631,30 @@ void TQtCalculator::exit() void TQtCalculator::Hex_Selected() { - basebutton[0]->setChecked(TRUE); - basebutton[1]->setChecked(FALSE); - basebutton[2]->setChecked(FALSE); - basebutton[3]->setChecked(FALSE); + basebutton[0]->setChecked(true); + basebutton[1]->setChecked(false); + basebutton[2]->setChecked(false); + basebutton[3]->setChecked(false); SetHex(); } void TQtCalculator::Dec_Selected() { - basebutton[0]->setChecked(FALSE); - basebutton[1]->setChecked(TRUE); - basebutton[2]->setChecked(FALSE); - basebutton[3]->setChecked(FALSE); + basebutton[0]->setChecked(false); + basebutton[1]->setChecked(true); + basebutton[2]->setChecked(false); + basebutton[3]->setChecked(false); SetDec(); } void TQtCalculator::Oct_Selected() { - basebutton[0]->setChecked(FALSE); - basebutton[1]->setChecked(FALSE); - basebutton[2]->setChecked(TRUE); - basebutton[3]->setChecked(FALSE); + basebutton[0]->setChecked(false); + basebutton[1]->setChecked(false); + basebutton[2]->setChecked(true); + basebutton[3]->setChecked(false); SetOct(); } @@ -662,27 +662,27 @@ void TQtCalculator::Oct_Selected() void TQtCalculator::Bin_Selected() { - basebutton[0]->setChecked(FALSE); - basebutton[1]->setChecked(FALSE); - basebutton[2]->setChecked(FALSE); - basebutton[3]->setChecked(TRUE); + basebutton[0]->setChecked(false); + basebutton[1]->setChecked(false); + basebutton[2]->setChecked(false); + basebutton[3]->setChecked(true); SetBin(); } void TQtCalculator::Deg_Selected() { - anglebutton[0]->setChecked(TRUE); - anglebutton[1]->setChecked(FALSE); - anglebutton[2]->setChecked(FALSE); + anglebutton[0]->setChecked(true); + anglebutton[1]->setChecked(false); + anglebutton[2]->setChecked(false); SetDeg(); } void TQtCalculator::Rad_Selected() { - anglebutton[0]->setChecked(FALSE); - anglebutton[1]->setChecked(TRUE); - anglebutton[2]->setChecked(FALSE); + anglebutton[0]->setChecked(false); + anglebutton[1]->setChecked(true); + anglebutton[2]->setChecked(false); SetRad(); } @@ -690,9 +690,9 @@ void TQtCalculator::Rad_Selected() void TQtCalculator::Gra_Selected() { - anglebutton[0]->setChecked(FALSE); - anglebutton[1]->setChecked(FALSE); - anglebutton[2]->setChecked(TRUE); + anglebutton[0]->setChecked(false); + anglebutton[1]->setChecked(false); + anglebutton[2]->setChecked(true); SetGra(); } @@ -727,211 +727,211 @@ void TQtCalculator::keyPressEvent( TQKeyEvent *e ){ break; case Key_Next: - key_pressed = TRUE; - pbAC->setOn(TRUE); + key_pressed = true; + pbAC->setOn(true); break; case Key_Prior: - key_pressed = TRUE; - pbClear->setOn(TRUE); + key_pressed = true; + pbClear->setOn(true); break; case Key_H: - key_pressed = TRUE; - pbhyp->setOn(TRUE); + key_pressed = true; + pbhyp->setOn(true); break; case Key_I: - key_pressed = TRUE; - pbinv->setOn(TRUE); + key_pressed = true; + pbinv->setOn(true); break; case Key_A: - key_pressed = TRUE; - pbA->setOn(TRUE); + key_pressed = true; + pbA->setOn(true); break; case Key_E: - key_pressed = TRUE; + key_pressed = true; if (current_base == NB_HEX) - pbE->setOn(TRUE); + pbE->setOn(true); else - pbEE->setOn(TRUE); + pbEE->setOn(true); break; case Key_Escape: - key_pressed = TRUE; - pbClear->setOn(TRUE); + key_pressed = true; + pbClear->setOn(true); break; case Key_Delete: - key_pressed = TRUE; - pbAC->setOn(TRUE); + key_pressed = true; + pbAC->setOn(true); break; case Key_S: - key_pressed = TRUE; - pbSin->setOn(TRUE); + key_pressed = true; + pbSin->setOn(true); break; case Key_Backslash: - key_pressed = TRUE; - pbplusminus->setOn(TRUE); + key_pressed = true; + pbplusminus->setOn(true); break; case Key_B: - key_pressed = TRUE; - pbB->setOn(TRUE); + key_pressed = true; + pbB->setOn(true); break; case Key_7: - key_pressed = TRUE; - pb7->setOn(TRUE); + key_pressed = true; + pb7->setOn(true); break; case Key_8: - key_pressed = TRUE; - pb8->setOn(TRUE); + key_pressed = true; + pb8->setOn(true); break; case Key_9: - key_pressed = TRUE; - pb9->setOn(TRUE); + key_pressed = true; + pb9->setOn(true); break; case Key_ParenLeft: - key_pressed = TRUE; - pbparenopen->setOn(TRUE); + key_pressed = true; + pbparenopen->setOn(true); break; case Key_ParenRight: - key_pressed = TRUE; - pbparenclose->setOn(TRUE); + key_pressed = true; + pbparenclose->setOn(true); break; case Key_Ampersand: - key_pressed = TRUE; - pband->setOn(TRUE); + key_pressed = true; + pband->setOn(true); break; case Key_C: - key_pressed = TRUE; + key_pressed = true; if (current_base == NB_HEX) - pbC->setOn(TRUE); + pbC->setOn(true); else - pbCos->setOn(TRUE); + pbCos->setOn(true); break; case Key_4: - key_pressed = TRUE; - pb4->setOn(TRUE); + key_pressed = true; + pb4->setOn(true); break; case Key_5: - key_pressed = TRUE; - pb5->setOn(TRUE); + key_pressed = true; + pb5->setOn(true); break; case Key_6: - key_pressed = TRUE; - pb6->setOn(TRUE); + key_pressed = true; + pb6->setOn(true); break; case Key_Asterisk: - key_pressed = TRUE; - pbX->setOn(TRUE); + key_pressed = true; + pbX->setOn(true); break; case Key_Slash: - key_pressed = TRUE; - pbdivision->setOn(TRUE); + key_pressed = true; + pbdivision->setOn(true); break; case Key_O: - key_pressed = TRUE; - pbor->setOn(TRUE); + key_pressed = true; + pbor->setOn(true); break; case Key_T: - key_pressed = TRUE; - pbTan->setOn(TRUE); + key_pressed = true; + pbTan->setOn(true); break; case Key_Exclam: - key_pressed = TRUE; - pbfactorial->setOn(TRUE); + key_pressed = true; + pbfactorial->setOn(true); break; case Key_D: - key_pressed = TRUE; + key_pressed = true; if(kcalcdefaults.style == 0) - pbD->setOn(TRUE); // trig mode + pbD->setOn(true); // trig mode else - pblog->setOn(TRUE); // stat mode + pblog->setOn(true); // stat mode break; case Key_1: - key_pressed = TRUE; - pb1->setOn(TRUE); + key_pressed = true; + pb1->setOn(true); break; case Key_2: - key_pressed = TRUE; - pb2->setOn(TRUE); + key_pressed = true; + pb2->setOn(true); break; case Key_3: - key_pressed = TRUE; - pb3->setOn(TRUE); + key_pressed = true; + pb3->setOn(true); break; case Key_Plus: - key_pressed = TRUE; - pbplus->setOn(TRUE); + key_pressed = true; + pbplus->setOn(true); break; case Key_Minus: - key_pressed = TRUE; - pbminus->setOn(TRUE); + key_pressed = true; + pbminus->setOn(true); break; case Key_Less: - key_pressed = TRUE; - pbshift->setOn(TRUE); + key_pressed = true; + pbshift->setOn(true); break; case Key_N: - key_pressed = TRUE; - pbln->setOn(TRUE); + key_pressed = true; + pbln->setOn(true); break; case Key_L: - key_pressed = TRUE; - pblog->setOn(TRUE); + key_pressed = true; + pblog->setOn(true); break; case Key_AsciiCircum: - key_pressed = TRUE; - pbpower->setOn(TRUE); + key_pressed = true; + pbpower->setOn(true); break; case Key_F: - key_pressed = TRUE; - pbF->setOn(TRUE); + key_pressed = true; + pbF->setOn(true); break; case Key_Period: - key_pressed = TRUE; - pbperiod->setOn(TRUE); + key_pressed = true; + pbperiod->setOn(true); break; case Key_Comma: - key_pressed = TRUE; - pbperiod->setOn(TRUE); + key_pressed = true; + pbperiod->setOn(true); break; case Key_0: - key_pressed = TRUE; - pb0->setOn(TRUE); + key_pressed = true; + pb0->setOn(true); break; case Key_Equal: - key_pressed = TRUE; - pbequal->setOn(TRUE); + key_pressed = true; + pbequal->setOn(true); break; case Key_Return: - key_pressed = TRUE; - pbequal->setOn(TRUE); + key_pressed = true; + pbequal->setOn(true); break; case Key_Enter: - key_pressed = TRUE; - pbequal->setOn(TRUE); + key_pressed = true; + pbequal->setOn(true); break; case Key_Percent: - key_pressed = TRUE; - pbpercent->setOn(TRUE); + key_pressed = true; + pbpercent->setOn(true); break; case Key_AsciiTilde: - key_pressed = TRUE; - pbnegate->setOn(TRUE); + key_pressed = true; + pbnegate->setOn(true); break; case Key_Colon: - key_pressed = TRUE; - pbmod->setOn(TRUE); + key_pressed = true; + pbmod->setOn(true); break; case Key_BracketLeft: - key_pressed = TRUE; - pbsquare->setOn(TRUE); + key_pressed = true; + pbsquare->setOn(true); break; case Key_Backspace: - key_pressed = TRUE; - pbAC->setOn(TRUE); + key_pressed = true; + pbAC->setOn(true); break; case Key_R: - key_pressed = TRUE; - pbreci->setOn(TRUE); + key_pressed = true; + pbreci->setOn(true); break; } } @@ -940,210 +940,210 @@ void TQtCalculator::keyReleaseEvent( TQKeyEvent *e ){ switch (e->key() ){ case Key_Next: - key_pressed = FALSE; - pbAC->setOn(FALSE); + key_pressed = false; + pbAC->setOn(false); break; case Key_Prior: - key_pressed = FALSE; - pbClear->setOn(FALSE); + key_pressed = false; + pbClear->setOn(false); break; case Key_H: - key_pressed = FALSE; - pbhyp->setOn(FALSE); + key_pressed = false; + pbhyp->setOn(false); break; case Key_I: - key_pressed = FALSE; - pbinv->setOn(FALSE); + key_pressed = false; + pbinv->setOn(false); break; case Key_A: - key_pressed = FALSE; - pbA->setOn(FALSE); + key_pressed = false; + pbA->setOn(false); break; case Key_E: - key_pressed = FALSE; + key_pressed = false; if (current_base == NB_HEX) - pbE->setOn(FALSE); + pbE->setOn(false); else - pbEE->setOn(FALSE); + pbEE->setOn(false); break; case Key_Escape: - key_pressed = FALSE; - pbClear->setOn(FALSE); + key_pressed = false; + pbClear->setOn(false); break; case Key_Delete: - key_pressed = FALSE; - pbAC->setOn(FALSE); + key_pressed = false; + pbAC->setOn(false); break; case Key_S: - key_pressed = FALSE; - pbSin->setOn(FALSE); + key_pressed = false; + pbSin->setOn(false); break; case Key_Backslash: - key_pressed = FALSE; - pbplusminus->setOn(FALSE); + key_pressed = false; + pbplusminus->setOn(false); break; case Key_B: - key_pressed = FALSE; - pbB->setOn(FALSE); + key_pressed = false; + pbB->setOn(false); break; case Key_7: - key_pressed = FALSE; - pb7->setOn(FALSE); + key_pressed = false; + pb7->setOn(false); break; case Key_8: - key_pressed = FALSE; - pb8->setOn(FALSE); + key_pressed = false; + pb8->setOn(false); break; case Key_9: - key_pressed = FALSE; - pb9->setOn(FALSE); + key_pressed = false; + pb9->setOn(false); break; case Key_ParenLeft: - key_pressed = FALSE; - pbparenopen->setOn(FALSE); + key_pressed = false; + pbparenopen->setOn(false); break; case Key_ParenRight: - key_pressed = FALSE; - pbparenclose->setOn(FALSE); + key_pressed = false; + pbparenclose->setOn(false); break; case Key_Ampersand: - key_pressed = FALSE; - pband->setOn(FALSE); + key_pressed = false; + pband->setOn(false); break; case Key_C: - key_pressed = FALSE; + key_pressed = false; if (current_base == NB_HEX) - pbC->setOn(FALSE); + pbC->setOn(false); else - pbCos->setOn(FALSE); + pbCos->setOn(false); break; case Key_4: - key_pressed = FALSE; - pb4->setOn(FALSE); + key_pressed = false; + pb4->setOn(false); break; case Key_5: - key_pressed = FALSE; - pb5->setOn(FALSE); + key_pressed = false; + pb5->setOn(false); break; case Key_6: - key_pressed = FALSE; - pb6->setOn(FALSE); + key_pressed = false; + pb6->setOn(false); break; case Key_Asterisk: - key_pressed = FALSE; - pbX->setOn(FALSE); + key_pressed = false; + pbX->setOn(false); break; case Key_Slash: - key_pressed = FALSE; - pbdivision->setOn(FALSE); + key_pressed = false; + pbdivision->setOn(false); break; case Key_O: - key_pressed = FALSE; - pbor->setOn(FALSE); + key_pressed = false; + pbor->setOn(false); break; case Key_T: - key_pressed = FALSE; - pbTan->setOn(FALSE); + key_pressed = false; + pbTan->setOn(false); break; case Key_Exclam: - key_pressed = FALSE; - pbfactorial->setOn(FALSE); + key_pressed = false; + pbfactorial->setOn(false); break; case Key_D: - key_pressed = FALSE; + key_pressed = false; if(kcalcdefaults.style == 0) - pbD->setOn(FALSE); // trig mode + pbD->setOn(false); // trig mode else - pblog->setOn(FALSE);// stat mode + pblog->setOn(false);// stat mode break; case Key_1: - key_pressed = FALSE; - pb1->setOn(FALSE); + key_pressed = false; + pb1->setOn(false); break; case Key_2: - key_pressed = FALSE; - pb2->setOn(FALSE); + key_pressed = false; + pb2->setOn(false); break; case Key_3: - key_pressed = FALSE; - pb3->setOn(FALSE); + key_pressed = false; + pb3->setOn(false); break; case Key_Plus: - key_pressed = FALSE; - pbplus->setOn(FALSE); + key_pressed = false; + pbplus->setOn(false); break; case Key_Minus: - key_pressed = FALSE; - pbminus->setOn(FALSE); + key_pressed = false; + pbminus->setOn(false); break; case Key_Less: - key_pressed = FALSE; - pbshift->setOn(FALSE); + key_pressed = false; + pbshift->setOn(false); break; case Key_N: - key_pressed = FALSE; - pbln->setOn(FALSE); + key_pressed = false; + pbln->setOn(false); break; case Key_L: - key_pressed = FALSE; - pblog->setOn(FALSE); + key_pressed = false; + pblog->setOn(false); break; case Key_AsciiCircum: - key_pressed = FALSE; - pbpower->setOn(FALSE); + key_pressed = false; + pbpower->setOn(false); break; case Key_F: - key_pressed = FALSE; - pbF->setOn(FALSE); + key_pressed = false; + pbF->setOn(false); break; case Key_Period: - key_pressed = FALSE; - pbperiod->setOn(FALSE); + key_pressed = false; + pbperiod->setOn(false); break; case Key_Comma: - key_pressed = FALSE; - pbperiod->setOn(FALSE); + key_pressed = false; + pbperiod->setOn(false); break; case Key_0: - key_pressed = FALSE; - pb0->setOn(FALSE); + key_pressed = false; + pb0->setOn(false); break; case Key_Equal: - key_pressed = FALSE; - pbequal->setOn(FALSE); + key_pressed = false; + pbequal->setOn(false); break; case Key_Return: - key_pressed = FALSE; - pbequal->setOn(FALSE); + key_pressed = false; + pbequal->setOn(false); break; case Key_Enter: - key_pressed = FALSE; - pbequal->setOn(FALSE); + key_pressed = false; + pbequal->setOn(false); break; case Key_Percent: - key_pressed = FALSE; - pbpercent->setOn(FALSE); + key_pressed = false; + pbpercent->setOn(false); break; case Key_AsciiTilde: - key_pressed = FALSE; - pbnegate->setOn(FALSE); + key_pressed = false; + pbnegate->setOn(false); break; case Key_Colon: - key_pressed = FALSE; - pbmod->setOn(FALSE); + key_pressed = false; + pbmod->setOn(false); break; case Key_BracketLeft: - key_pressed = FALSE; - pbsquare->setOn(FALSE); + key_pressed = false; + pbsquare->setOn(false); break; case Key_Backspace: - key_pressed = FALSE; - pbAC->setOn(FALSE); + key_pressed = false; + pbAC->setOn(false); break; case Key_R: - key_pressed = FALSE; - pbreci->setOn(FALSE); + key_pressed = false; + pbreci->setOn(false); break; } @@ -1159,300 +1159,300 @@ void TQtCalculator::EEtoggled(bool myboolean){ if(myboolean) EE(); if(pbEE->isOn() && (!key_pressed)) - pbEE->setOn(FALSE); + pbEE->setOn(false); } void TQtCalculator::pbinvtoggled(bool myboolean){ if(myboolean) SetInverse(); if(pbinv->isOn() && (!key_pressed)) - pbinv->setOn(FALSE); + pbinv->setOn(false); } void TQtCalculator::pbhyptoggled(bool myboolean){ if(myboolean) EnterHyp(); if(pbhyp->isOn() && (!key_pressed)) - pbhyp->setOn(FALSE); + pbhyp->setOn(false); } void TQtCalculator::pbMRtoggled(bool myboolean){ if(myboolean) MR(); if(pbMR->isOn() && (!key_pressed)) - pbMR->setOn(FALSE); + pbMR->setOn(false); } void TQtCalculator::pbAtoggled(bool myboolean){ if(myboolean) buttonA(); if(pbA->isOn() && (!key_pressed)) - pbA->setOn(FALSE); + pbA->setOn(false); } void TQtCalculator::pbSintoggled(bool myboolean){ if(myboolean) ExecSin(); if(pbSin->isOn() && (!key_pressed)) - pbSin->setOn(FALSE); + pbSin->setOn(false); } void TQtCalculator::pbplusminustoggled(bool myboolean){ if(myboolean) EnterNegate(); if(pbplusminus->isOn() && (!key_pressed)) - pbplusminus->setOn(FALSE); + pbplusminus->setOn(false); } void TQtCalculator::pbMplusminustoggled(bool myboolean){ if(myboolean) Mplusminus(); if(pbMplusminus->isOn() && (!key_pressed)) - pbMplusminus->setOn(FALSE); + pbMplusminus->setOn(false); } void TQtCalculator::pbBtoggled(bool myboolean){ if(myboolean) buttonB(); if(pbB->isOn() && (!key_pressed)) - pbB->setOn(FALSE); + pbB->setOn(false); } void TQtCalculator::pbCostoggled(bool myboolean){ if(myboolean) ExecCos(); if(pbCos->isOn() && (!key_pressed)) - pbCos->setOn(FALSE); + pbCos->setOn(false); } void TQtCalculator::pbrecitoggled(bool myboolean){ if(myboolean) EnterRecip(); if(pbreci->isOn() && (!key_pressed)) - pbreci->setOn(FALSE); + pbreci->setOn(false); } void TQtCalculator::pbCtoggled(bool myboolean){ if(myboolean) buttonC(); if(pbC->isOn() && (!key_pressed)) - pbC->setOn(FALSE); + pbC->setOn(false); } void TQtCalculator::pbTantoggled(bool myboolean){ if(myboolean) ExecTan(); if(pbTan->isOn() && (!key_pressed)) - pbTan->setOn(FALSE); + pbTan->setOn(false); } void TQtCalculator::pbfactorialtoggled(bool myboolean){ if(myboolean) EnterFactorial(); if(pbfactorial->isOn() && (!key_pressed)) - pbfactorial->setOn(FALSE); + pbfactorial->setOn(false); } void TQtCalculator::pbDtoggled(bool myboolean){ if(myboolean) buttonD(); if(pbD->isOn() && (!key_pressed)) - pbD->setOn(FALSE); + pbD->setOn(false); } void TQtCalculator::pblogtoggled(bool myboolean){ if(myboolean) EnterLogr(); if(pblog->isOn() && (!key_pressed)) - pblog->setOn(FALSE); + pblog->setOn(false); } void TQtCalculator::pbsquaretoggled(bool myboolean){ if(myboolean) EnterSquare(); if(pbsquare->isOn() && (!key_pressed)) - pbsquare->setOn(FALSE); + pbsquare->setOn(false); } void TQtCalculator::pbEtoggled(bool myboolean){ if(myboolean) buttonE(); if(pbE->isOn() && (!key_pressed)) - pbE->setOn(FALSE); + pbE->setOn(false); } void TQtCalculator::pblntoggled(bool myboolean){ if(myboolean) EnterLogn(); if(pbln->isOn() && (!key_pressed)) - pbln->setOn(FALSE); + pbln->setOn(false); } void TQtCalculator::pbpowertoggled(bool myboolean){ if(myboolean) Power(); if(pbpower->isOn() && (!key_pressed)) - pbpower->setOn(FALSE); + pbpower->setOn(false); } void TQtCalculator::pbFtoggled(bool myboolean){ if(myboolean) buttonF(); if(pbF->isOn() && (!key_pressed)) - pbF->setOn(FALSE); + pbF->setOn(false); } void TQtCalculator::pbMCtoggled(bool myboolean){ if(myboolean) MC(); if(pbMC->isOn() && (!key_pressed)) - pbMC->setOn(FALSE); + pbMC->setOn(false); } void TQtCalculator::pbCleartoggled(bool myboolean){ if(myboolean) Clear(); if(pbClear->isOn() && (!key_pressed)) - pbClear->setOn(FALSE); + pbClear->setOn(false); } void TQtCalculator::pbACtoggled(bool myboolean){ if(myboolean) ClearAll(); if(pbAC->isOn() && (!key_pressed)) - pbAC->setOn(FALSE); + pbAC->setOn(false); } void TQtCalculator::pb7toggled(bool myboolean){ if(myboolean) button7(); if(pb7->isOn() && (!key_pressed)) - pb7->setOn(FALSE); + pb7->setOn(false); } void TQtCalculator::pb8toggled(bool myboolean){ if(myboolean) button8(); if(pb8->isOn() && (!key_pressed)) - pb8->setOn(FALSE); + pb8->setOn(false); } void TQtCalculator::pb9toggled(bool myboolean){ if(myboolean) button9(); if(pb9->isOn() && (!key_pressed)) - pb9->setOn(FALSE); + pb9->setOn(false); } void TQtCalculator::pbparenopentoggled(bool myboolean){ if(myboolean) EnterOpenParen(); if(pbparenopen->isOn() && (!key_pressed)) - pbparenopen->setOn(FALSE); + pbparenopen->setOn(false); } void TQtCalculator::pbparenclosetoggled(bool myboolean){ if(myboolean) EnterCloseParen(); if(pbparenclose->isOn() && (!key_pressed)) - pbparenclose->setOn(FALSE); + pbparenclose->setOn(false); } void TQtCalculator::pbandtoggled(bool myboolean){ if(myboolean) And(); if(pband->isOn() && (!key_pressed)) - pband->setOn(FALSE); + pband->setOn(false); } void TQtCalculator::pb4toggled(bool myboolean){ if(myboolean) button4(); if(pb4->isOn() && (!key_pressed)) - pb4->setOn(FALSE); + pb4->setOn(false); } void TQtCalculator::pb5toggled(bool myboolean){ if(myboolean) button5(); if(pb5->isOn() && (!key_pressed)) - pb5->setOn(FALSE); + pb5->setOn(false); } void TQtCalculator::pb6toggled(bool myboolean){ if(myboolean) button6(); if(pb6->isOn() && (!key_pressed)) - pb6->setOn(FALSE); + pb6->setOn(false); } void TQtCalculator::pbXtoggled(bool myboolean){ if(myboolean) Multiply(); if(pbX->isOn() && (!key_pressed)) - pbX->setOn(FALSE); + pbX->setOn(false); } void TQtCalculator::pbdivisiontoggled(bool myboolean){ if(myboolean) Divide(); if(pbdivision->isOn() && (!key_pressed)) - pbdivision->setOn(FALSE); + pbdivision->setOn(false); } void TQtCalculator::pbortoggled(bool myboolean){ if(myboolean) Or(); if(pbor->isOn() && (!key_pressed)) - pbor->setOn(FALSE); + pbor->setOn(false); } void TQtCalculator::pb1toggled(bool myboolean){ if(myboolean) button1(); if(pb1->isOn() && (!key_pressed)) - pb1->setOn(FALSE); + pb1->setOn(false); } void TQtCalculator::pb2toggled(bool myboolean){ if(myboolean) button2(); if(pb2->isOn() && (!key_pressed)) - pb2->setOn(FALSE); + pb2->setOn(false); } void TQtCalculator::pb3toggled(bool myboolean){ if(myboolean) button3(); if(pb3->isOn() && (!key_pressed)) - pb3->setOn(FALSE); + pb3->setOn(false); } void TQtCalculator::pbplustoggled(bool myboolean){ if(myboolean) Plus(); if(pbplus->isOn() && (!key_pressed)) - pbplus->setOn(FALSE); + pbplus->setOn(false); } void TQtCalculator::pbminustoggled(bool myboolean){ if(myboolean) Minus(); if(pbminus->isOn() && (!key_pressed)) - pbminus->setOn(FALSE); + pbminus->setOn(false); } void TQtCalculator::pbshifttoggled(bool myboolean){ if(myboolean) Shift(); if(pbshift->isOn() && (!key_pressed)) - pbshift->setOn(FALSE); + pbshift->setOn(false); } void TQtCalculator::pbperiodtoggled(bool myboolean){ if(myboolean) EnterDecimal(); if(pbperiod->isOn() && (!key_pressed)) - pbperiod->setOn(FALSE); + pbperiod->setOn(false); } void TQtCalculator::pb0toggled(bool myboolean){ if(myboolean) button0(); if(pb0->isOn() && (!key_pressed)) - pb0->setOn(FALSE); + pb0->setOn(false); } void TQtCalculator::pbequaltoggled(bool myboolean){ if(myboolean) EnterEqual(); if(pbequal->isOn() && (!key_pressed)) - pbequal->setOn(FALSE); + pbequal->setOn(false); } void TQtCalculator::pbpercenttoggled(bool myboolean){ if(myboolean) EnterPercent(); if(pbpercent->isOn() && (!key_pressed)) - pbpercent->setOn(FALSE); + pbpercent->setOn(false); } void TQtCalculator::pbnegatetoggled(bool myboolean){ if(myboolean) EnterNotCmp(); if(pbnegate->isOn() && (!key_pressed)) - pbnegate->setOn(FALSE); + pbnegate->setOn(false); } void TQtCalculator::pbmodtoggled(bool myboolean) { if(myboolean) Mod(); if(pbmod->isOn() && (!key_pressed)) - pbmod->setOn(FALSE); + pbmod->setOn(false); } void TQtCalculator::configclicked(){ TQTabDialog * tabdialog; - tabdialog = new TQTabDialog(0,"tabdialog",TRUE); + tabdialog = new TQTabDialog(0,"tabdialog",true); tabdialog->setCaption( i18n("KCalc Configuration") ); tabdialog->resize( 360, 390 ); @@ -1659,7 +1659,7 @@ void TQtCalculator::selection_timed_out(){ // printf("selection timed out\n"); selection_timer->stop(); - calc_display->setLit(FALSE); + calc_display->setLit(false); invertColors(); @@ -1675,7 +1675,7 @@ void TQtCalculator::clear_status_label(){ void TQtCalculator::setStatusLabel(const TQString& string){ statusERRORLabel->setText(string); - status_timer->start(3000,TRUE); + status_timer->start(3000,true); } diff --git a/kspread/plugins/calculator/main.cpp b/kspread/plugins/calculator/main.cpp index b791f36a1..7b5fa1669 100644 --- a/kspread/plugins/calculator/main.cpp +++ b/kspread/plugins/calculator/main.cpp @@ -112,7 +112,7 @@ Calculator::~Calculator() bool Calculator::eventFilter( TQObject*, TQEvent* ev ) { if ( !m_calc ) - return FALSE; + return false; if ( SelectionChanged::test( ev ) ) { @@ -120,18 +120,18 @@ bool Calculator::eventFilter( TQObject*, TQEvent* ev ) // Selection cleared ? if (!event->region().isValid()) - return FALSE; + return false; Sheet* sheet = m_view->doc()->map()->findSheet( event->sheet() ); if ( !sheet ) - return FALSE; + return false; // A single cell selected ? if (event->region().isSingular()) { Cell* cell = sheet->cellAt( event->rect().left(), event->rect().top(), false ); if ( !cell ) - return FALSE; + return false; double d; if ( cell->isEmpty() ) @@ -140,7 +140,7 @@ bool Calculator::eventFilter( TQObject*, TQEvent* ev ) d = cell->value().asFloat(); m_calc->setValue( d ); - return FALSE; + return false; } // Multiple cells selected ? @@ -148,10 +148,10 @@ bool Calculator::eventFilter( TQObject*, TQEvent* ev ) TQString str = util_rangeName( sheet, event->rect() ); m_calc->setLabel( str.latin1() ); - return FALSE; + return false; } - return FALSE; + return false; } /*************************************************** diff --git a/kspread/plugins/calculator/stats.cpp b/kspread/plugins/calculator/stats.cpp index 5413701b8..df7e1576b 100644 --- a/kspread/plugins/calculator/stats.cpp +++ b/kspread/plugins/calculator/stats.cpp @@ -31,8 +31,8 @@ KStats::KStats(){ - error_flag = FALSE; - data.setAutoDelete(TRUE); + error_flag = false; + data.setAutoDelete(true); } @@ -164,7 +164,7 @@ CALCAMNT KStats::median(){ bound = list.count(); if (bound == 0){ - error_flag = TRUE; + error_flag = true; return 0.0; } @@ -234,7 +234,7 @@ CALCAMNT KStats::mean(){ CALCAMNT result = 0.0; if(data.count() == 0){ - error_flag = TRUE; + error_flag = true; return 0.0; } @@ -253,7 +253,7 @@ CALCAMNT KStats::std(){ CALCAMNT result = 0.0; if(data.count() == 0){ - error_flag = TRUE; + error_flag = true; #ifdef DEBUG_STATS printf("set stats error\n"); @@ -283,7 +283,7 @@ CALCAMNT KStats::sample_std(){ CALCAMNT result = 0.0; if(data.count() < 2 ){ - error_flag = TRUE; + error_flag = true; return 0.0; } @@ -306,7 +306,7 @@ bool KStats::error(){ bool value; value = error_flag; - error_flag = FALSE; + error_flag = false; return value; |