diff options
-rw-r--r-- | src/dialogs/advancedsearchdialog.cpp | 36 | ||||
-rw-r--r-- | src/dialogs/borderdialog.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/conversiondialog.cpp | 4 | ||||
-rw-r--r-- | src/dialogs/dbimportdialog.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/editratingdialog.cpp | 4 | ||||
-rw-r--r-- | src/dialogs/recipeinputdialog.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/resizerecipedialog.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/selectpropertydialog.cpp | 2 | ||||
-rw-r--r-- | src/importers/mxpimporter.cpp | 8 | ||||
-rw-r--r-- | src/krecipesview.cpp | 2 | ||||
-rw-r--r-- | src/widgets/conversiontable.cpp | 28 | ||||
-rw-r--r-- | src/widgets/ingredientinputwidget.cpp | 16 |
12 files changed, 54 insertions, 54 deletions
diff --git a/src/dialogs/advancedsearchdialog.cpp b/src/dialogs/advancedsearchdialog.cpp index 9f4864d..f4f6cd9 100644 --- a/src/dialogs/advancedsearchdialog.cpp +++ b/src/dialogs/advancedsearchdialog.cpp @@ -78,7 +78,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T parametersFrameLayout = new TQVBoxLayout( parametersFrame, 0, 0, "parametersFrameLayout"); titleButton = new TQPushButton( parametersFrame, "titleButton" ); - titleButton->setToggleButton( TRUE ); + titleButton->setToggleButton( true ); parametersFrameLayout->addWidget( titleButton ); titleFrame = new TQFrame( parametersFrame, "titleFrame" ); @@ -100,7 +100,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T ingredientButton = new TQPushButton( parametersFrame, "ingredientButton" ); - ingredientButton->setToggleButton( TRUE ); + ingredientButton->setToggleButton( true ); parametersFrameLayout->addWidget( ingredientButton ); ingredientFrame = new TQFrame( parametersFrame, "ingredientFrame" ); @@ -141,7 +141,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T categoriesButton = new TQPushButton( parametersFrame, "categoriesButton" ); - categoriesButton->setToggleButton( TRUE ); + categoriesButton->setToggleButton( true ); parametersFrameLayout->addWidget( categoriesButton ); categoryFrame = new TQFrame( parametersFrame, "categoryFrame" ); @@ -182,7 +182,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T authorsButton = new TQPushButton( parametersFrame, "authorsButton" ); - authorsButton->setToggleButton( TRUE ); + authorsButton->setToggleButton( true ); parametersFrameLayout->addWidget( authorsButton ); authorsFrame = new TQFrame( parametersFrame, "authorsFrame" ); @@ -223,7 +223,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T servingsButton = new TQPushButton( parametersFrame, "servingsButton" ); - servingsButton->setToggleButton( TRUE ); + servingsButton->setToggleButton( true ); parametersFrameLayout->addWidget( servingsButton ); servingsFrame = new TQFrame( parametersFrame, "servingsFrame" ); @@ -236,13 +236,13 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T layout5 = new TQHBoxLayout( 0, 0, 3, "layout5"); - servingsComboBox = new TQComboBox( FALSE, servingsFrame, "servingsComboBox" ); - servingsComboBox->setEnabled( FALSE ); + servingsComboBox = new TQComboBox( false, servingsFrame, "servingsComboBox" ); + servingsComboBox->setEnabled( false ); servingsComboBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 1, 0, servingsComboBox->sizePolicy().hasHeightForWidth() ) ); layout5->addWidget( servingsComboBox ); servingsSpinBox = new TQSpinBox( servingsFrame, "servingsSpinBox" ); - servingsSpinBox->setEnabled( FALSE ); + servingsSpinBox->setEnabled( false ); servingsSpinBox->setMinValue( 1 ); servingsSpinBox->setMaxValue( 9999 ); layout5->addWidget( servingsSpinBox ); @@ -253,7 +253,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T prepTimeButton = new TQPushButton( parametersFrame, "prepTimeButton" ); - prepTimeButton->setToggleButton( TRUE ); + prepTimeButton->setToggleButton( true ); parametersFrameLayout->addWidget( prepTimeButton ); prepTimeFrame = new TQFrame( parametersFrame, "prepTimeFrame" ); @@ -266,13 +266,13 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T layout6 = new TQHBoxLayout( 0, 0, 3, "layout6"); - prepTimeComboBox = new TQComboBox( FALSE, prepTimeFrame, "prepTimeComboBox" ); - prepTimeComboBox->setEnabled( FALSE ); + prepTimeComboBox = new TQComboBox( false, prepTimeFrame, "prepTimeComboBox" ); + prepTimeComboBox->setEnabled( false ); prepTimeComboBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 1, 0, prepTimeComboBox->sizePolicy().hasHeightForWidth() ) ); layout6->addWidget( prepTimeComboBox ); prepTimeEdit = new TQTimeEdit( prepTimeFrame, "prepTimeEdit" ); - prepTimeEdit->setEnabled( FALSE ); + prepTimeEdit->setEnabled( false ); prepTimeEdit->setDisplay( int( TQTimeEdit::Minutes | TQTimeEdit::Hours ) ); layout6->addWidget( prepTimeEdit ); prepTimeFrameLayout->addLayout( layout6 ); @@ -282,7 +282,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T instructionsButton = new TQPushButton( parametersFrame, "instructionsButton" ); - instructionsButton->setToggleButton( TRUE ); + instructionsButton->setToggleButton( true ); parametersFrameLayout->addWidget( instructionsButton ); instructionsFrame = new TQFrame( parametersFrame, "instructionsFrame" ); @@ -305,7 +305,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T metaDataButton = new TQPushButton( parametersFrame, "metaDataButton" ); - metaDataButton->setToggleButton( TRUE ); + metaDataButton->setToggleButton( true ); parametersFrameLayout->addWidget( metaDataButton ); metaDataFrame = new TQFrame( parametersFrame, "metaDataFrame" ); @@ -352,7 +352,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T //=============RATINGS FRAME===========// ratingsButton = new TQPushButton( parametersFrame, "ratingsButton" ); - ratingsButton->setToggleButton( TRUE ); + ratingsButton->setToggleButton( true ); parametersFrameLayout->addWidget( ratingsButton ); ratingButtonGroup = new TQButtonGroup( parametersFrame, "ratingButtonGroup" ); @@ -364,7 +364,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T ratingButtonGroupLayout->setAlignment( TQt::AlignTop ); ratingAvgRadioButton = new TQRadioButton( ratingButtonGroup, "ratingAvgRadioButton" ); - ratingAvgRadioButton->setChecked( TRUE ); + ratingAvgRadioButton->setChecked( true ); ratingButtonGroupLayout->addWidget( ratingAvgRadioButton ); ratingAvgFrame = new TQFrame( ratingButtonGroup, "ratingAvgFrame" ); @@ -383,13 +383,13 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T ratingButtonGroupLayout->addWidget( criterionRadioButton ); criterionFrame = new TQFrame( ratingButtonGroup, "criterionFrame" ); - criterionFrame->setEnabled( FALSE ); + criterionFrame->setEnabled( false ); criterionFrame->setLineWidth( 0 ); criterionFrameLayout = new TQVBoxLayout( criterionFrame, 2, 2, "criterionFrameLayout"); layout12 = new TQHBoxLayout( 0, 0, 6, "layout12"); - criteriaComboBox = new CriteriaComboBox( FALSE, criterionFrame, database ); + criteriaComboBox = new CriteriaComboBox( false, criterionFrame, database ); criteriaComboBox->setEditable( false ); criteriaComboBox->reload(); layout12->addWidget( criteriaComboBox ); diff --git a/src/dialogs/borderdialog.cpp b/src/dialogs/borderdialog.cpp index 13a8459..4353b80 100644 --- a/src/dialogs/borderdialog.cpp +++ b/src/dialogs/borderdialog.cpp @@ -255,7 +255,7 @@ void BorderDialog::setColor( const KColor &color ) valuePal->setSaturation( s ); valuePal->setValue( v ); valuePal->updateContents(); - valuePal->repaint( FALSE ); + valuePal->repaint( false ); } #include "borderdialog.moc" diff --git a/src/dialogs/conversiondialog.cpp b/src/dialogs/conversiondialog.cpp index c9e3f51..d535e3b 100644 --- a/src/dialogs/conversiondialog.cpp +++ b/src/dialogs/conversiondialog.cpp @@ -38,7 +38,7 @@ ConversionDialog::ConversionDialog( TQWidget* parent, RecipeDB *db, const char* setHelp("measure-converter"); setButtonText( KDialogBase::User1, i18n("Convert") ); - setSizeGripEnabled( TRUE ); + setSizeGripEnabled( true ); TQVBox *page = makeVBoxMainWidget(); @@ -56,7 +56,7 @@ ConversionDialog::ConversionDialog( TQWidget* parent, RecipeDB *db, const char* TQHBox *fromBottomBox = new TQHBox(vbox); - ingredientBox = new IngredientComboBox( FALSE, fromBottomBox, db, i18n( "--Ingredient (optional)--" ) ); + ingredientBox = new IngredientComboBox( false, fromBottomBox, db, i18n( "--Ingredient (optional)--" ) ); ingredientBox->reload(); prepMethodBox = new PrepMethodComboBox( false, fromBottomBox, db, i18n( "-No Preparation-" ) ); diff --git a/src/dialogs/dbimportdialog.cpp b/src/dialogs/dbimportdialog.cpp index db8e276..3e65955 100644 --- a/src/dialogs/dbimportdialog.cpp +++ b/src/dialogs/dbimportdialog.cpp @@ -52,7 +52,7 @@ DBImportDialog::DBImportDialog( TQWidget *parent, const char *name ) dbButtonGroupLayout->setAlignment( TQt::AlignTop ); liteRadioButton = new TQRadioButton( dbButtonGroup, "liteRadioButton" ); - liteRadioButton->setChecked( TRUE ); + liteRadioButton->setChecked( true ); dbButtonGroupLayout->addWidget( liteRadioButton ); mysqlRadioButton = new TQRadioButton( dbButtonGroup, "mysqlRadioButton" ); diff --git a/src/dialogs/editratingdialog.cpp b/src/dialogs/editratingdialog.cpp index bab6e1b..6fdd77c 100644 --- a/src/dialogs/editratingdialog.cpp +++ b/src/dialogs/editratingdialog.cpp @@ -85,9 +85,9 @@ void EditRatingDialog::init( const ElementList &criteriaList ) criteriaLabel = new TQLabel( layout8, "criteriaLabel" ); - criteriaComboBox = new TQComboBox( FALSE, layout8, "criteriaComboBox" ); + criteriaComboBox = new TQComboBox( false, layout8, "criteriaComboBox" ); criteriaComboBox->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, (TQSizePolicy::SizeType)0, 0, 0, criteriaComboBox->sizePolicy().hasHeightForWidth() ) ); - criteriaComboBox->setEditable( TRUE ); + criteriaComboBox->setEditable( true ); criteriaComboBox->lineEdit()->disconnect( criteriaComboBox ); //so hitting enter doesn't enter the item into the box starsLabel = new TQLabel( layout8, "starsLabel" ); diff --git a/src/dialogs/recipeinputdialog.cpp b/src/dialogs/recipeinputdialog.cpp index 5f7a46a..4a5b2c4 100644 --- a/src/dialogs/recipeinputdialog.cpp +++ b/src/dialogs/recipeinputdialog.cpp @@ -74,7 +74,7 @@ void ClickableLed::mouseReleaseEvent( TQMouseEvent* ) ImageDropLabel::ImageDropLabel( TQWidget *parent, TQPixmap &_sourcePhoto ) : TQLabel( parent ), sourcePhoto( _sourcePhoto ) { - setAcceptDrops( TRUE ); + setAcceptDrops( true ); } void ImageDropLabel::dragEnterEvent( TQDragEnterEvent* event ) diff --git a/src/dialogs/resizerecipedialog.cpp b/src/dialogs/resizerecipedialog.cpp index 958fadb..461af89 100644 --- a/src/dialogs/resizerecipedialog.cpp +++ b/src/dialogs/resizerecipedialog.cpp @@ -73,7 +73,7 @@ ResizeRecipeDialog::ResizeRecipeDialog( TQWidget *parent, Recipe *recipe ) yieldFrameLayout->addMultiCellWidget( newYieldLabel, 1, 1, 0, 1 ); currentYieldInput = new KLineEdit( yieldFrame ); - currentYieldInput->setReadOnly( TRUE ); + currentYieldInput->setReadOnly( true ); currentYieldInput->setAlignment( TQt::AlignRight ); yieldFrameLayout->addMultiCellWidget( currentYieldInput, 0, 0, 1, 2 ); diff --git a/src/dialogs/selectpropertydialog.cpp b/src/dialogs/selectpropertydialog.cpp index 1ce1887..8d24821 100644 --- a/src/dialogs/selectpropertydialog.cpp +++ b/src/dialogs/selectpropertydialog.cpp @@ -55,7 +55,7 @@ SelectPropertyDialog::SelectPropertyDialog( TQWidget* parent, IngredientProperty perUnitsLabel->setText( i18n( "Per units:" ) ); layout2->addWidget( perUnitsLabel ); - perUnitsBox = new KComboBox( FALSE, box ); + perUnitsBox = new KComboBox( false, box ); layout2->addWidget( perUnitsBox ); boxLayout->addLayout( layout2 ); diff --git a/src/importers/mxpimporter.cpp b/src/importers/mxpimporter.cpp index 20fbf0f..22a4db4 100644 --- a/src/importers/mxpimporter.cpp +++ b/src/importers/mxpimporter.cpp @@ -93,8 +93,8 @@ void MXPImporter::importMXP( TQTextStream &stream ) if ( current.mid( 0, current.find( ":" ) ).simplifyWhiteSpace().lower() == "serving size" ) { //allows serving size to be loaded even if preparation time is missing int end_index; - if ( current.contains( "preparation time", FALSE ) ) - end_index = current.find( "preparation time", 0, FALSE ) - 15; + if ( current.contains( "preparation time", false ) ) + end_index = current.find( "preparation time", 0, false ) - 15; else end_index = current.length(); @@ -107,8 +107,8 @@ void MXPImporter::importMXP( TQTextStream &stream ) "the field \"Serving Size:\" is either missing or could not be detected." ) ).arg( recipe.title ) ); } - if ( current.contains( "preparation time", FALSE ) ) { - TQString prep_time = current.mid( current.find( ":", current.find( "preparation time", 0, FALSE ) ) + 1, + if ( current.contains( "preparation time", false ) ) { + TQString prep_time = current.mid( current.find( ":", current.find( "preparation time", 0, false ) ) + 1, current.length() ).stripWhiteSpace(); recipe.prepTime = TQTime( prep_time.section( ':', 0, 0 ).toInt(), prep_time.section( ':', 1, 1 ).toInt() ); kdDebug() << "Found preparation time: " << prep_time << endl; diff --git a/src/krecipesview.cpp b/src/krecipesview.cpp index b9f79d1..462fe0e 100644 --- a/src/krecipesview.cpp +++ b/src/krecipesview.cpp @@ -110,7 +110,7 @@ KrecipesView::KrecipesView( TQWidget *parent ) START_TIMER("Setting up buttons") // Buttons buttonsList = new TQPtrList<KreMenuButton>(); - buttonsList->setAutoDelete( TRUE ); + buttonsList->setAutoDelete( true ); button0 = new KreMenuButton( leftPanel, SelectP ); button0->setIconSet( il.loadIconSet( "filefind", TDEIcon::Panel, 32 ) ); diff --git a/src/widgets/conversiontable.cpp b/src/widgets/conversiontable.cpp index a48b67e..40a975e 100644 --- a/src/widgets/conversiontable.cpp +++ b/src/widgets/conversiontable.cpp @@ -270,7 +270,7 @@ void ConversionTable::clear( void ) void ConversionTable::swapRows( int row1, int row2, bool /*swapHeader*/ ) { //if ( swapHeader ) - //((TQTableHeader*)verticalHeader())->swapSections( row1, row2, FALSE ); + //((TQTableHeader*)verticalHeader())->swapSections( row1, row2, false ); TQPtrVector<TQTableItem> tmpContents; tmpContents.resize( numCols() ); @@ -278,8 +278,8 @@ void ConversionTable::swapRows( int row1, int row2, bool /*swapHeader*/ ) tmpWidgets.resize( numCols() ); int i; - items.setAutoDelete( FALSE ); - widgets.setAutoDelete( FALSE ); + items.setAutoDelete( false ); + widgets.setAutoDelete( false ); for ( i = 0; i < numCols(); ++i ) { TQTableItem *i1, *i2; i1 = item( row1, i ); @@ -307,8 +307,8 @@ void ConversionTable::swapRows( int row1, int row2, bool /*swapHeader*/ ) widgets.insert( indexOf( row2, i ), tmpWidgets[ i ] ); } } - items.setAutoDelete( FALSE ); - widgets.setAutoDelete( TRUE ); + items.setAutoDelete( false ); + widgets.setAutoDelete( true ); //updateRowWidgets( row1 ); //updateRowWidgets( row2 ); @@ -327,7 +327,7 @@ void ConversionTable::swapRows( int row1, int row2, bool /*swapHeader*/ ) void ConversionTable::swapColumns( int col1, int col2, bool /*swapHeader*/ ) { //if ( swapHeader ) - //((TQTableHeader*)horizontalHeader())->swapSections( col1, col2, FALSE ); + //((TQTableHeader*)horizontalHeader())->swapSections( col1, col2, false ); TQPtrVector<TQTableItem> tmpContents; tmpContents.resize( numRows() ); @@ -335,8 +335,8 @@ void ConversionTable::swapColumns( int col1, int col2, bool /*swapHeader*/ ) tmpWidgets.resize( numRows() ); int i; - items.setAutoDelete( FALSE ); - widgets.setAutoDelete( FALSE ); + items.setAutoDelete( false ); + widgets.setAutoDelete( false ); for ( i = 0; i < numRows(); ++i ) { TQTableItem *i1, *i2; i1 = item( i, col1 ); @@ -364,8 +364,8 @@ void ConversionTable::swapColumns( int col1, int col2, bool /*swapHeader*/ ) widgets.insert( indexOf( i, col2 ), tmpWidgets[ i ] ); } } - items.setAutoDelete( FALSE ); - widgets.setAutoDelete( TRUE ); + items.setAutoDelete( false ); + widgets.setAutoDelete( true ); columnWidthChanged( col1 ); columnWidthChanged( col2 ); @@ -383,8 +383,8 @@ void ConversionTable::swapColumns( int col1, int col2, bool /*swapHeader*/ ) //TODO this is incomplete/wrong void ConversionTable::swapCells( int row1, int col1, int row2, int col2 ) { - items.setAutoDelete( FALSE ); - widgets.setAutoDelete( FALSE ); + items.setAutoDelete( false ); + widgets.setAutoDelete( false ); TQTableItem *i1, *i2; i1 = item( row1, col1 ); i2 = item( row2, col2 ); @@ -419,8 +419,8 @@ void ConversionTable::swapCells( int row1, int col1, int row2, int col2 ) //updateRowWidgets( row2 ); //updateColWidgets( col1 ); //updateColWidgets( col2 ); - items.setAutoDelete( FALSE ); - widgets.setAutoDelete( TRUE ); + items.setAutoDelete( false ); + widgets.setAutoDelete( true ); } #include "conversiontable.moc" diff --git a/src/widgets/ingredientinputwidget.cpp b/src/widgets/ingredientinputwidget.cpp index 3c0aa7e..ddf9a16 100644 --- a/src/widgets/ingredientinputwidget.cpp +++ b/src/widgets/ingredientinputwidget.cpp @@ -60,13 +60,13 @@ IngredientInput::IngredientInput( RecipeDB *db, TQWidget *parent, bool allowHead } header_ing_stack = new TQWidgetStack(ingredientVBox); - ingredientBox = new IngredientComboBox( TRUE, header_ing_stack, database ); - ingredientBox->setAutoCompletion( TRUE ); + ingredientBox = new IngredientComboBox( true, header_ing_stack, database ); + ingredientBox->setAutoCompletion( true ); ingredientBox->lineEdit() ->disconnect( ingredientBox ); //so hitting enter doesn't enter the item into the box ingredientBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ) ); header_ing_stack->addWidget( ingredientBox ); - headerBox = new HeaderComboBox( TRUE, header_ing_stack, database ); - headerBox->setAutoCompletion( TRUE ); + headerBox = new HeaderComboBox( true, header_ing_stack, database ); + headerBox->setAutoCompletion( true ); headerBox->lineEdit() ->disconnect( ingredientBox ); //so hitting enter doesn't enter the item into the box headerBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ) ); header_ing_stack->addWidget( headerBox ); @@ -79,15 +79,15 @@ IngredientInput::IngredientInput( RecipeDB *db, TQWidget *parent, bool allowHead TQVBox *unitVBox = new TQVBox( this ); unitLabel = new TQLabel( i18n( "Unit:" ), unitVBox ); - unitBox = new KComboBox( TRUE, unitVBox ); - unitBox->setAutoCompletion( TRUE ); + unitBox = new KComboBox( true, unitVBox ); + unitBox->setAutoCompletion( true ); unitBox->lineEdit() ->disconnect( unitBox ); //so hitting enter doesn't enter the item into the box unitBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ) ); TQVBox *prepMethodVBox = new TQVBox( this ); prepMethodLabel = new TQLabel( i18n( "Preparation Method:" ), prepMethodVBox ); - prepMethodBox = new PrepMethodComboBox( TRUE, prepMethodVBox, database ); - prepMethodBox->setAutoCompletion( TRUE ); + prepMethodBox = new PrepMethodComboBox( true, prepMethodVBox, database ); + prepMethodBox->setAutoCompletion( true ); prepMethodBox->lineEdit() ->disconnect( prepMethodBox ); //so hitting enter doesn't enter the item into the box prepMethodBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ) ); |