From dd228586bd5b9ebce4232be9e354bf4619a13fdd Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 28 Dec 2023 21:16:39 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit c7dcbcecefbabfeece27deadb5507bfccd0a31b0) --- krecipes/src/backends/progressinterface.cpp | 6 +- krecipes/src/backends/recipedb.cpp | 4 +- krecipes/src/convert_sqlite3.cpp | 2 +- krecipes/src/dialogs/advancedsearchdialog.cpp | 96 +++++++++++------------ krecipes/src/dialogs/authorsdialog.cpp | 4 +- krecipes/src/dialogs/borderdialog.cpp | 10 +-- krecipes/src/dialogs/categorieseditordialog.cpp | 4 +- krecipes/src/dialogs/conversiondialog.cpp | 2 +- krecipes/src/dialogs/createunitdialog.cpp | 2 +- krecipes/src/dialogs/dbimportdialog.cpp | 2 +- krecipes/src/dialogs/dietviewdialog.cpp | 6 +- krecipes/src/dialogs/dietwizarddialog.cpp | 26 +++--- krecipes/src/dialogs/editratingdialog.cpp | 8 +- krecipes/src/dialogs/ingredientgroupsdialog.cpp | 4 +- krecipes/src/dialogs/ingredientmatcherdialog.cpp | 14 ++-- krecipes/src/dialogs/ingredientparserdialog.cpp | 8 +- krecipes/src/dialogs/ingredientsdialog.cpp | 28 +++---- krecipes/src/dialogs/pagesetupdialog.cpp | 20 ++--- krecipes/src/dialogs/prepmethodsdialog.cpp | 4 +- krecipes/src/dialogs/propertiesdialog.cpp | 4 +- krecipes/src/dialogs/recipeinputdialog.cpp | 74 ++++++++--------- krecipes/src/dialogs/recipeviewdialog.cpp | 2 +- krecipes/src/dialogs/refineshoppinglistdialog.cpp | 6 +- krecipes/src/dialogs/resizerecipedialog.cpp | 2 +- krecipes/src/dialogs/selectauthorsdialog.cpp | 4 +- krecipes/src/dialogs/selectcategoriesdialog.cpp | 2 +- krecipes/src/dialogs/selectrecipedialog.cpp | 44 +++++------ krecipes/src/dialogs/setupdisplay.cpp | 16 ++-- krecipes/src/dialogs/shoppinglistdialog.cpp | 20 ++--- krecipes/src/dialogs/shoppinglistviewdialog.cpp | 4 +- krecipes/src/dialogs/similarcategoriesdialog.cpp | 10 +-- krecipes/src/dialogs/unitsdialog.cpp | 20 ++--- krecipes/src/dialogs/usdadatadialog.cpp | 2 +- krecipes/src/krecipes.cpp | 62 +++++++-------- krecipes/src/krecipesview.cpp | 32 ++++---- krecipes/src/pref.cpp | 2 +- krecipes/src/recipeactionshandler.cpp | 26 +++--- krecipes/src/setupwizard.cpp | 22 +++--- krecipes/src/widgets/amountunitinput.cpp | 8 +- krecipes/src/widgets/authorlistview.cpp | 16 ++-- krecipes/src/widgets/categorycombobox.cpp | 8 +- krecipes/src/widgets/categorylistview.cpp | 44 +++++------ krecipes/src/widgets/conversiontable.cpp | 6 +- krecipes/src/widgets/criteriacombobox.cpp | 2 +- krecipes/src/widgets/dblistviewbase.cpp | 2 +- krecipes/src/widgets/fractioninput.cpp | 4 +- krecipes/src/widgets/headerlistview.cpp | 16 ++-- krecipes/src/widgets/ingredientcombobox.cpp | 10 +-- krecipes/src/widgets/ingredientinputwidget.cpp | 30 +++---- krecipes/src/widgets/ingredientlistview.cpp | 16 ++-- krecipes/src/widgets/kdateedit.cpp | 12 +-- krecipes/src/widgets/kdatepickerpopup.cpp | 18 ++--- krecipes/src/widgets/krelistview.cpp | 10 +-- krecipes/src/widgets/kremenu.cpp | 10 +-- krecipes/src/widgets/kreruler.cpp | 8 +- krecipes/src/widgets/kretextedit.cpp | 2 +- krecipes/src/widgets/kwidgetlistbox.cpp | 4 +- krecipes/src/widgets/prepmethodcombobox.cpp | 4 +- krecipes/src/widgets/prepmethodlistview.cpp | 16 ++-- krecipes/src/widgets/propertylistview.cpp | 16 ++-- krecipes/src/widgets/recipelistview.cpp | 8 +- krecipes/src/widgets/unitcombobox.cpp | 4 +- krecipes/src/widgets/unitlistview.cpp | 20 ++--- krecipes/src/widgets/weightinput.cpp | 2 +- 64 files changed, 450 insertions(+), 450 deletions(-) diff --git a/krecipes/src/backends/progressinterface.cpp b/krecipes/src/backends/progressinterface.cpp index aab2bc5..cf37ff0 100644 --- a/krecipes/src/backends/progressinterface.cpp +++ b/krecipes/src/backends/progressinterface.cpp @@ -68,9 +68,9 @@ void ProgressInterface::listenOn( RecipeDB *db ) database->disconnect(slot_obj); if ( db ) { - slot_obj->connect( db, SIGNAL(progressBegin(int,const TQString&,const TQString&,int)), slot_obj, SLOT(progressBegin(int,const TQString&,const TQString&,int)) ); - slot_obj->connect( db, SIGNAL(progressDone()), slot_obj, SLOT(progressDone()) ); - slot_obj->connect( db, SIGNAL(progress()), slot_obj, SLOT(progress()) ); + slot_obj->connect( db, TQ_SIGNAL(progressBegin(int,const TQString&,const TQString&,int)), slot_obj, TQ_SLOT(progressBegin(int,const TQString&,const TQString&,int)) ); + slot_obj->connect( db, TQ_SIGNAL(progressDone()), slot_obj, TQ_SLOT(progressDone()) ); + slot_obj->connect( db, TQ_SIGNAL(progress()), slot_obj, TQ_SLOT(progress()) ); } database = db; diff --git a/krecipes/src/backends/recipedb.cpp b/krecipes/src/backends/recipedb.cpp index 5de6f25..1967b0f 100644 --- a/krecipes/src/backends/recipedb.cpp +++ b/krecipes/src/backends/recipedb.cpp @@ -295,8 +295,8 @@ bool RecipeDB::backup( const TQString &backup_file, TQString *errMsg ) kdDebug()<<"Running '"<" << backup_file*/; - TQApplication::connect( p, SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, SLOT(processDumpOutput(TDEProcess*,char*,int)) ); - TQApplication::connect( p, SIGNAL(receivedStderr(TDEProcess*,char*,int)), this, SLOT(processDumpOutput(TDEProcess*,char*,int)) ); + TQApplication::connect( p, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, TQ_SLOT(processDumpOutput(TDEProcess*,char*,int)) ); + TQApplication::connect( p, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), this, TQ_SLOT(processDumpOutput(TDEProcess*,char*,int)) ); emit progressBegin(0,TQString::null, TQString("
%1
%2") diff --git a/krecipes/src/convert_sqlite3.cpp b/krecipes/src/convert_sqlite3.cpp index f89dbba..fae9401 100644 --- a/krecipes/src/convert_sqlite3.cpp +++ b/krecipes/src/convert_sqlite3.cpp @@ -37,7 +37,7 @@ ConvertSQLite3::ConvertSQLite3( const TQString &db_file ) : TQObject(), error(fa *p << "sqlite" << file << ".dump" << "|" << "sqlite3" << file+".new"; - TQApplication::connect( p, SIGNAL(readReady(KProcIO*)), this, SLOT(processOutput(KProcIO*)) ); + TQApplication::connect( p, TQ_SIGNAL(readReady(KProcIO*)), this, TQ_SLOT(processOutput(KProcIO*)) ); bool success = p->start( TDEProcess::Block, true ); if ( !success ) { diff --git a/krecipes/src/dialogs/advancedsearchdialog.cpp b/krecipes/src/dialogs/advancedsearchdialog.cpp index ec56857..95898a4 100644 --- a/krecipes/src/dialogs/advancedsearchdialog.cpp +++ b/krecipes/src/dialogs/advancedsearchdialog.cpp @@ -467,50 +467,50 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T actionHandler = new RecipeActionsHandler( resultsListView, database, RecipeActionsHandler::Open | RecipeActionsHandler::Edit | RecipeActionsHandler::Export | RecipeActionsHandler::CopyToClipboard | RecipeActionsHandler::Remove ); - connect( titleEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( ingredientsAllEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( ingredientsAnyEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( ingredientsWithoutEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( authorsAnyEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( authorsAllEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( authorsWithoutEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( categoriesNotEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( categoriesAnyEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( categoriesAllEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( ingredientsWithoutEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - connect( instructionsEdit, SIGNAL( returnPressed() ), SLOT( search() ) ); - - connect( findButton, SIGNAL( clicked() ), SLOT( search() ) ); - connect( clearButton, SIGNAL( clicked() ), SLOT( clear() ) ); - - connect( enableServingsCheckBox, SIGNAL( toggled( bool ) ), servingsSpinBox, SLOT( setEnabled( bool ) ) ); - connect( enableServingsCheckBox, SIGNAL( toggled( bool ) ), servingsComboBox, SLOT( setEnabled( bool ) ) ); - connect( enablePrepTimeCheckBox, SIGNAL( toggled( bool ) ), prepTimeEdit, SLOT( setEnabled( bool ) ) ); - connect( enablePrepTimeCheckBox, SIGNAL( toggled( bool ) ), prepTimeComboBox, SLOT( setEnabled( bool ) ) ); - - connect( titleButton, SIGNAL( toggled( bool ) ), titleFrame, SLOT( setShown( bool ) ) ); - connect( ingredientButton, SIGNAL( toggled( bool ) ), ingredientFrame, SLOT( setShown( bool ) ) ); - connect( authorsButton, SIGNAL( toggled( bool ) ), authorsFrame, SLOT( setShown( bool ) ) ); - connect( categoriesButton, SIGNAL( toggled( bool ) ), categoryFrame, SLOT( setShown( bool ) ) ); - connect( servingsButton, SIGNAL( toggled( bool ) ), servingsFrame, SLOT( setShown( bool ) ) ); - connect( prepTimeButton, SIGNAL( toggled( bool ) ), prepTimeFrame, SLOT( setShown( bool ) ) ); - connect( instructionsButton, SIGNAL( toggled( bool ) ), instructionsFrame, SLOT( setShown( bool ) ) ); - connect( metaDataButton, SIGNAL( toggled( bool ) ), metaDataFrame, SLOT( setShown( bool ) ) ); - connect( ratingsButton, SIGNAL( toggled( bool ) ), ratingButtonGroup, SLOT( setShown( bool ) ) ); - - connect( titleButton, SIGNAL( toggled( bool ) ), SLOT( buttonSwitched() ) ); - connect( ingredientButton, SIGNAL( toggled( bool ) ), SLOT( buttonSwitched() ) ); - connect( authorsButton, SIGNAL( toggled( bool ) ), SLOT( buttonSwitched() ) ); - connect( categoriesButton, SIGNAL( toggled( bool ) ), SLOT( buttonSwitched() ) ); - connect( servingsButton, SIGNAL( toggled( bool ) ), SLOT( buttonSwitched() ) ); - connect( prepTimeButton, SIGNAL( toggled( bool ) ), SLOT( buttonSwitched() ) ); - connect( instructionsButton, SIGNAL( toggled( bool ) ), SLOT( buttonSwitched() ) ); - connect( metaDataButton, SIGNAL( toggled( bool ) ), SLOT( buttonSwitched() ) ); - connect( ratingsButton, SIGNAL( toggled( bool ) ), SLOT( buttonSwitched() ) ); - - connect( ratingButtonGroup, SIGNAL( clicked( int ) ), this, SLOT( activateRatingOption( int ) ) ); - - connect( addCriteriaButton, SIGNAL( clicked() ), this, SLOT( slotAddRatingCriteria() ) ); + connect( titleEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( ingredientsAllEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( ingredientsAnyEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( ingredientsWithoutEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( authorsAnyEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( authorsAllEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( authorsWithoutEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( categoriesNotEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( categoriesAnyEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( categoriesAllEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( ingredientsWithoutEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + connect( instructionsEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( search() ) ); + + connect( findButton, TQ_SIGNAL( clicked() ), TQ_SLOT( search() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), TQ_SLOT( clear() ) ); + + connect( enableServingsCheckBox, TQ_SIGNAL( toggled( bool ) ), servingsSpinBox, TQ_SLOT( setEnabled( bool ) ) ); + connect( enableServingsCheckBox, TQ_SIGNAL( toggled( bool ) ), servingsComboBox, TQ_SLOT( setEnabled( bool ) ) ); + connect( enablePrepTimeCheckBox, TQ_SIGNAL( toggled( bool ) ), prepTimeEdit, TQ_SLOT( setEnabled( bool ) ) ); + connect( enablePrepTimeCheckBox, TQ_SIGNAL( toggled( bool ) ), prepTimeComboBox, TQ_SLOT( setEnabled( bool ) ) ); + + connect( titleButton, TQ_SIGNAL( toggled( bool ) ), titleFrame, TQ_SLOT( setShown( bool ) ) ); + connect( ingredientButton, TQ_SIGNAL( toggled( bool ) ), ingredientFrame, TQ_SLOT( setShown( bool ) ) ); + connect( authorsButton, TQ_SIGNAL( toggled( bool ) ), authorsFrame, TQ_SLOT( setShown( bool ) ) ); + connect( categoriesButton, TQ_SIGNAL( toggled( bool ) ), categoryFrame, TQ_SLOT( setShown( bool ) ) ); + connect( servingsButton, TQ_SIGNAL( toggled( bool ) ), servingsFrame, TQ_SLOT( setShown( bool ) ) ); + connect( prepTimeButton, TQ_SIGNAL( toggled( bool ) ), prepTimeFrame, TQ_SLOT( setShown( bool ) ) ); + connect( instructionsButton, TQ_SIGNAL( toggled( bool ) ), instructionsFrame, TQ_SLOT( setShown( bool ) ) ); + connect( metaDataButton, TQ_SIGNAL( toggled( bool ) ), metaDataFrame, TQ_SLOT( setShown( bool ) ) ); + connect( ratingsButton, TQ_SIGNAL( toggled( bool ) ), ratingButtonGroup, TQ_SLOT( setShown( bool ) ) ); + + connect( titleButton, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( buttonSwitched() ) ); + connect( ingredientButton, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( buttonSwitched() ) ); + connect( authorsButton, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( buttonSwitched() ) ); + connect( categoriesButton, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( buttonSwitched() ) ); + connect( servingsButton, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( buttonSwitched() ) ); + connect( prepTimeButton, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( buttonSwitched() ) ); + connect( instructionsButton, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( buttonSwitched() ) ); + connect( metaDataButton, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( buttonSwitched() ) ); + connect( ratingsButton, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( buttonSwitched() ) ); + + connect( ratingButtonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( activateRatingOption( int ) ) ); + + connect( addCriteriaButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddRatingCriteria() ) ); titleFrame->setShown(false); ingredientFrame->setShown(false); @@ -522,15 +522,15 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T metaDataFrame->setShown(false); ratingButtonGroup->setShown(false); - connect( actionHandler, SIGNAL( recipeSelected( int, int ) ), SIGNAL( recipeSelected( int, int ) ) ); - connect( actionHandler, SIGNAL( recipesSelected( const TQValueList &, int ) ), SIGNAL( recipesSelected( const TQValueList &, int ) ) ); + connect( actionHandler, TQ_SIGNAL( recipeSelected( int, int ) ), TQ_SIGNAL( recipeSelected( int, int ) ) ); + connect( actionHandler, TQ_SIGNAL( recipesSelected( const TQValueList &, int ) ), TQ_SIGNAL( recipesSelected( const TQValueList &, int ) ) ); - connect( database, SIGNAL( recipeRemoved( int ) ), SLOT( removeRecipe( int ) ) ); + connect( database, TQ_SIGNAL( recipeRemoved( int ) ), TQ_SLOT( removeRecipe( int ) ) ); clear(); TDEPopupMenu *kpop = new TDEPopupMenu( criteriaListView ); - kpop->insertItem( i18n( "&Delete" ), this, SLOT( slotRemoveRatingCriteria() ), Key_Delete ); + kpop->insertItem( i18n( "&Delete" ), this, TQ_SLOT( slotRemoveRatingCriteria() ), Key_Delete ); } AdvancedSearchDialog::~AdvancedSearchDialog() diff --git a/krecipes/src/dialogs/authorsdialog.cpp b/krecipes/src/dialogs/authorsdialog.cpp index 2cdbedb..0a53899 100644 --- a/krecipes/src/dialogs/authorsdialog.cpp +++ b/krecipes/src/dialogs/authorsdialog.cpp @@ -49,8 +49,8 @@ AuthorsDialog::AuthorsDialog( TQWidget* parent, RecipeDB *db ) : TQWidget( paren //Connect Signals & Slots - connect ( newAuthorButton, SIGNAL( clicked() ), authorListView, SLOT( createNew() ) ); - connect ( removeAuthorButton, SIGNAL( clicked() ), authorListView, SLOT( remove + connect ( newAuthorButton, TQ_SIGNAL( clicked() ), authorListView, TQ_SLOT( createNew() ) ); + connect ( removeAuthorButton, TQ_SIGNAL( clicked() ), authorListView, TQ_SLOT( remove () ) ); } diff --git a/krecipes/src/dialogs/borderdialog.cpp b/krecipes/src/dialogs/borderdialog.cpp index 95f14a3..39c088d 100644 --- a/krecipes/src/dialogs/borderdialog.cpp +++ b/krecipes/src/dialogs/borderdialog.cpp @@ -60,11 +60,11 @@ BorderDialog::BorderDialog( const KreBorder &border, TQWidget* parent, const cha color_hbox->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); hsSelector = new KHSSelector( color_hbox ); hsSelector->setMinimumSize( 140, 70 ); - connect( hsSelector, SIGNAL( valueChanged( int, int ) ), SLOT( slotHSChanged( int, int ) ) ); + connect( hsSelector, TQ_SIGNAL( valueChanged( int, int ) ), TQ_SLOT( slotHSChanged( int, int ) ) ); valuePal = new KValueSelector( color_hbox ); valuePal->setMinimumSize( 26, 70 ); - connect( valuePal, SIGNAL( valueChanged( int ) ), SLOT( slotVChanged( int ) ) ); + connect( valuePal, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotVChanged( int ) ) ); layout2->addWidget( color_hbox ); layout4->addLayout( layout2 ); @@ -89,9 +89,9 @@ BorderDialog::BorderDialog( const KreBorder &border, TQWidget* parent, const cha languageChange(); - connect( widthSpinBox, SIGNAL( valueChanged( int ) ), SLOT( updatePreview() ) ); - connect( widthListBox, SIGNAL( highlighted( int ) ), SLOT( updateSpinBox( int ) ) ); - connect( styleListBox, SIGNAL( highlighted( int ) ), SLOT( updatePreview() ) ); + connect( widthSpinBox, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( updatePreview() ) ); + connect( widthListBox, TQ_SIGNAL( highlighted( int ) ), TQ_SLOT( updateSpinBox( int ) ) ); + connect( styleListBox, TQ_SIGNAL( highlighted( int ) ), TQ_SLOT( updatePreview() ) ); initListBoxs(); loadBorder( border ); diff --git a/krecipes/src/dialogs/categorieseditordialog.cpp b/krecipes/src/dialogs/categorieseditordialog.cpp index 0ca574b..d383fde 100644 --- a/krecipes/src/dialogs/categorieseditordialog.cpp +++ b/krecipes/src/dialogs/categorieseditordialog.cpp @@ -51,8 +51,8 @@ CategoriesEditorDialog::CategoriesEditorDialog( TQWidget* parent, RecipeDB *db ) //Connect Signals & Slots - connect ( newCategoryButton, SIGNAL( clicked() ), categoryListView, SLOT( createNew() ) ); - connect ( removeCategoryButton, SIGNAL( clicked() ), categoryListView, SLOT( remove + connect ( newCategoryButton, TQ_SIGNAL( clicked() ), categoryListView, TQ_SLOT( createNew() ) ); + connect ( removeCategoryButton, TQ_SIGNAL( clicked() ), categoryListView, TQ_SLOT( remove () ) ); } diff --git a/krecipes/src/dialogs/conversiondialog.cpp b/krecipes/src/dialogs/conversiondialog.cpp index 90d590f..c64645b 100644 --- a/krecipes/src/dialogs/conversiondialog.cpp +++ b/krecipes/src/dialogs/conversiondialog.cpp @@ -82,7 +82,7 @@ ConversionDialog::ConversionDialog( TQWidget* parent, RecipeDB *db, const char* setInitialSize( TQSize(300, 200).expandedTo(minimumSizeHint()) ); // signals and slots connections - connect ( this, SIGNAL( closeClicked() ), this, SLOT( accept() ) ); + connect ( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( accept() ) ); } ConversionDialog::~ConversionDialog() diff --git a/krecipes/src/dialogs/createunitdialog.cpp b/krecipes/src/dialogs/createunitdialog.cpp index 483c200..82fd22e 100644 --- a/krecipes/src/dialogs/createunitdialog.cpp +++ b/krecipes/src/dialogs/createunitdialog.cpp @@ -69,7 +69,7 @@ CreateUnitDialog::CreateUnitDialog( TQWidget *parent, const TQString &name, cons adjustSize(); setFixedSize( size() ); //we've got all the widgets put in, now let's keep it this size - connect( nameAbbrevEdit, SIGNAL(textChanged(const TQString&)), SLOT(nameAbbrevTextChanged(const TQString &)) ); + connect( nameAbbrevEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(nameAbbrevTextChanged(const TQString &)) ); if ( name.isEmpty() ) nameEdit->setFocus(); diff --git a/krecipes/src/dialogs/dbimportdialog.cpp b/krecipes/src/dialogs/dbimportdialog.cpp index 5b3b18a..f756fdb 100644 --- a/krecipes/src/dialogs/dbimportdialog.cpp +++ b/krecipes/src/dialogs/dbimportdialog.cpp @@ -144,7 +144,7 @@ DBImportDialog::DBImportDialog( TQWidget *parent, const char *name ) #endif // signals and slots connections - connect( dbButtonGroup, SIGNAL( clicked( int ) ), this, SLOT( switchDBPage( int ) ) ); + connect( dbButtonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( switchDBPage( int ) ) ); } void DBImportDialog::languageChange() diff --git a/krecipes/src/dialogs/dietviewdialog.cpp b/krecipes/src/dialogs/dietviewdialog.cpp index 6a09b25..5b51c27 100644 --- a/krecipes/src/dialogs/dietviewdialog.cpp +++ b/krecipes/src/dialogs/dietviewdialog.cpp @@ -32,9 +32,9 @@ DietViewDialog::DietViewDialog( TQWidget *parent, const RecipeList &recipeList, setSizeGripEnabled( true ); - connect ( this, SIGNAL( user2Clicked() ), this, SLOT( slotOk() ) ); - connect ( this, SIGNAL( closeClicked() ), this, SLOT( close() ) ); - connect ( this, SIGNAL( user1Clicked() ), this, SLOT( print() ) ); + connect ( this, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT( slotOk() ) ); + connect ( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( close() ) ); + connect ( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( print() ) ); // Show the diet showDiet( recipeList, dayNumber, mealNumber, dishNumbers ); diff --git a/krecipes/src/dialogs/dietwizarddialog.cpp b/krecipes/src/dialogs/dietwizarddialog.cpp index a5d8192..6c66921 100644 --- a/krecipes/src/dialogs/dietwizarddialog.cpp +++ b/krecipes/src/dialogs/dietwizarddialog.cpp @@ -97,10 +97,10 @@ DietWizardDialog::DietWizardDialog( TQWidget *parent, RecipeDB *db ) : TQVBox( p mealTabs->setCurrentPage( mealTabs->indexOf( mealTab ) ); // Signals & Slots - connect( mealNumberSelector, SIGNAL( valueChanged( int ) ), this, SLOT( changeMealNumber( int ) ) ); - connect( dayNumberSelector, SIGNAL( valueChanged( int ) ), this, SLOT( changeDayNumber( int ) ) ); - connect( okButton, SIGNAL( clicked() ), this, SLOT( createDiet() ) ); - connect( clearButton, SIGNAL( clicked() ), this, SLOT( clear() ) ); + connect( mealNumberSelector, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeMealNumber( int ) ) ); + connect( dayNumberSelector, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeDayNumber( int ) ) ); + connect( okButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( createDiet() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clear() ) ); } @@ -246,7 +246,7 @@ void DietWizardDialog::createDiet( void ) // display the list DietViewDialog dietDisplay( this, *dietRList, dayNumber, mealNumber, dishNumbers ); - connect( &dietDisplay, SIGNAL( signalOk() ), this, SLOT( createShoppingList() ) ); + connect( &dietDisplay, TQ_SIGNAL( signalOk() ), this, TQ_SLOT( createShoppingList() ) ); dietDisplay.exec(); } @@ -366,9 +366,9 @@ MealInput::MealInput( TQWidget *parent, RecipeDB *db ) : TQWidget( parent ), dishNumberInput->setValue( dishNumber ); // Signals & Slots - connect( dishNumberInput, SIGNAL( valueChanged( int ) ), this, SLOT( changeDishNumber( int ) ) ); - connect( buttonPrev, SIGNAL( clicked() ), this, SLOT( prevDish() ) ); - connect( buttonNext, SIGNAL( clicked() ), this, SLOT( nextDish() ) ); + connect( dishNumberInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeDishNumber( int ) ) ); + connect( buttonPrev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prevDish() ) ); + connect( buttonNext, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextDish() ) ); } @@ -494,11 +494,11 @@ DishInput::DishInput( TQWidget* parent, RecipeDB *db, const TQString &title ) : // Connect Signals & Slots - connect( constraintsView, SIGNAL( executed( TQListViewItem* ) ), this, SLOT( insertConstraintsEditBoxes( TQListViewItem* ) ) ); - connect( constraintsView, SIGNAL( selectionChanged() ), this, SLOT( hideConstraintInputs() ) ); - connect( constraintsEditBox1, SIGNAL( valueChanged( double ) ), this, SLOT( setMinValue( double ) ) ); - connect( constraintsEditBox2, SIGNAL( valueChanged( double ) ), this, SLOT( setMaxValue( double ) ) ); - connect( categoriesEnabledBox, SIGNAL( toggled( bool ) ), this, SLOT( enableCategories( bool ) ) ); + connect( constraintsView, TQ_SIGNAL( executed( TQListViewItem* ) ), this, TQ_SLOT( insertConstraintsEditBoxes( TQListViewItem* ) ) ); + connect( constraintsView, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( hideConstraintInputs() ) ); + connect( constraintsEditBox1, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( setMinValue( double ) ) ); + connect( constraintsEditBox2, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( setMaxValue( double ) ) ); + connect( categoriesEnabledBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( enableCategories( bool ) ) ); } DishInput::~DishInput() diff --git a/krecipes/src/dialogs/editratingdialog.cpp b/krecipes/src/dialogs/editratingdialog.cpp index 73ac893..5a48bb9 100644 --- a/krecipes/src/dialogs/editratingdialog.cpp +++ b/krecipes/src/dialogs/editratingdialog.cpp @@ -115,13 +115,13 @@ void EditRatingDialog::init( const ElementList &criteriaList ) resize( TQSize(358, 331).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); - connect( criteriaListView, SIGNAL(itemRenamed(TQListViewItem*,const TQString &,int)), this, SLOT(itemRenamed(TQListViewItem*,const TQString &,int)) ); - connect( addButton, SIGNAL(clicked()), this, SLOT(slotAddRatingCriteria()) ); - connect( removeButton, SIGNAL(clicked()), this, SLOT(slotRemoveRatingCriteria()) ); + connect( criteriaListView, TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString &,int)), this, TQ_SLOT(itemRenamed(TQListViewItem*,const TQString &,int)) ); + connect( addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddRatingCriteria()) ); + connect( removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveRatingCriteria()) ); TDEIconLoader il; TDEPopupMenu *kpop = new TDEPopupMenu( criteriaListView ); - kpop->insertItem( il.loadIcon( "editshred", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( slotRemoveRatingCriteria() ), Key_Delete ); + kpop->insertItem( il.loadIcon( "editshred", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, TQ_SLOT( slotRemoveRatingCriteria() ), Key_Delete ); for ( ElementList::const_iterator criteria_it = criteriaList.begin(); criteria_it != criteriaList.end(); ++criteria_it ) { criteriaComboBox->insertItem( ( *criteria_it ).name ); diff --git a/krecipes/src/dialogs/ingredientgroupsdialog.cpp b/krecipes/src/dialogs/ingredientgroupsdialog.cpp index 8edb0d6..22f55ba 100644 --- a/krecipes/src/dialogs/ingredientgroupsdialog.cpp +++ b/krecipes/src/dialogs/ingredientgroupsdialog.cpp @@ -55,8 +55,8 @@ IngredientGroupsDialog::IngredientGroupsDialog( RecipeDB *db, TQWidget *parent, layout->addLayout(buttonLayout); - connect( addHeaderButton, SIGNAL( clicked() ), list_view, SLOT( createNew() ) ); - connect( removeHeaderButton, SIGNAL( clicked() ), list_view, SLOT( remove() ) ); + connect( addHeaderButton, TQ_SIGNAL( clicked() ), list_view, TQ_SLOT( createNew() ) ); + connect( removeHeaderButton, TQ_SIGNAL( clicked() ), list_view, TQ_SLOT( remove() ) ); } void IngredientGroupsDialog::reload( ReloadFlags flag ) diff --git a/krecipes/src/dialogs/ingredientmatcherdialog.cpp b/krecipes/src/dialogs/ingredientmatcherdialog.cpp index dc823b0..5662d21 100644 --- a/krecipes/src/dialogs/ingredientmatcherdialog.cpp +++ b/krecipes/src/dialogs/ingredientmatcherdialog.cpp @@ -122,13 +122,13 @@ IngredientMatcherDialog::IngredientMatcherDialog( TQWidget *parent, RecipeDB *db dialogLayout->addWidget(buttonBox); // Connect signals & slots - connect ( okButton, SIGNAL( clicked() ), this, SLOT( findRecipes() ) ); - connect ( clearButton, SIGNAL( clicked() ), recipeListView->listView(), SLOT( clear() ) ); - connect ( clearButton, SIGNAL( clicked() ), this, SLOT( unselectIngredients() ) ); - connect ( actionHandler, SIGNAL( recipeSelected( int, int ) ), SIGNAL( recipeSelected( int, int ) ) ); - connect( addButton, SIGNAL( clicked() ), this, SLOT( addIngredient() ) ); - connect( removeButton, SIGNAL( clicked() ), this, SLOT( removeIngredient() ) ); - connect( ingListView->listView(), SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), SLOT( itemRenamed( TQListViewItem*, const TQPoint &, int ) ) ); + connect ( okButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( findRecipes() ) ); + connect ( clearButton, TQ_SIGNAL( clicked() ), recipeListView->listView(), TQ_SLOT( clear() ) ); + connect ( clearButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( unselectIngredients() ) ); + connect ( actionHandler, TQ_SIGNAL( recipeSelected( int, int ) ), TQ_SIGNAL( recipeSelected( int, int ) ) ); + connect( addButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addIngredient() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeIngredient() ) ); + connect( ingListView->listView(), TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), TQ_SLOT( itemRenamed( TQListViewItem*, const TQPoint &, int ) ) ); } IngredientMatcherDialog::~IngredientMatcherDialog() diff --git a/krecipes/src/dialogs/ingredientparserdialog.cpp b/krecipes/src/dialogs/ingredientparserdialog.cpp index f115f1c..a979b55 100644 --- a/krecipes/src/dialogs/ingredientparserdialog.cpp +++ b/krecipes/src/dialogs/ingredientparserdialog.cpp @@ -83,11 +83,11 @@ IngredientParserDialog::IngredientParserDialog( const UnitList &units, TQWidget* buttonBox->addItem( horizontalSpacing ); TDEPopupMenu *kpop = new TDEPopupMenu( previewIngView ); - kpop->insertItem( i18n( "&Delete" ), this, SLOT( removeIngredient() ), Key_Delete ); - kpop->insertItem( i18n("Set &Header") , this, SLOT( convertToHeader() ) ); + kpop->insertItem( i18n( "&Delete" ), this, TQ_SLOT( removeIngredient() ), Key_Delete ); + kpop->insertItem( i18n("Set &Header") , this, TQ_SLOT( convertToHeader() ) ); - connect( parseButton, SIGNAL(clicked()), this, SLOT(parseText()) ); - connect( buttonGroup, SIGNAL(clicked()), this, SLOT(convertToHeader()) ); + connect( parseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(parseText()) ); + connect( buttonGroup, TQ_SIGNAL(clicked()), this, TQ_SLOT(convertToHeader()) ); } IngredientParserDialog::~IngredientParserDialog() diff --git a/krecipes/src/dialogs/ingredientsdialog.cpp b/krecipes/src/dialogs/ingredientsdialog.cpp index 768c45e..86dce62 100644 --- a/krecipes/src/dialogs/ingredientsdialog.cpp +++ b/krecipes/src/dialogs/ingredientsdialog.cpp @@ -272,23 +272,23 @@ IngredientsDialog::IngredientsDialog( TQWidget* parent, RecipeDB *db ) : TQWidge unitList = new UnitList; // Signals & Slots - connect( ingredientListView->listView(), SIGNAL( selectionChanged() ), this, SLOT( updateLists() ) ); - connect( addIngredientButton, SIGNAL( clicked() ), list_view, SLOT( createNew() ) ); - connect( addUnitButton, SIGNAL( clicked() ), this, SLOT( addUnitToIngredient() ) ); - connect( removeUnitButton, SIGNAL( clicked() ), this, SLOT( removeUnitFromIngredient() ) ); - connect( addWeightButton, SIGNAL( clicked() ), this, SLOT( addWeight() ) ); - connect( removeWeightButton, SIGNAL( clicked() ), this, SLOT( removeWeight() ) ); - connect( removeIngredientButton, SIGNAL( clicked() ), list_view, SLOT( remove + connect( ingredientListView->listView(), TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateLists() ) ); + connect( addIngredientButton, TQ_SIGNAL( clicked() ), list_view, TQ_SLOT( createNew() ) ); + connect( addUnitButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addUnitToIngredient() ) ); + connect( removeUnitButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeUnitFromIngredient() ) ); + connect( addWeightButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addWeight() ) ); + connect( removeWeightButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeWeight() ) ); + connect( removeIngredientButton, TQ_SIGNAL( clicked() ), list_view, TQ_SLOT( remove () ) ); - connect( addPropertyButton, SIGNAL( clicked() ), this, SLOT( addPropertyToIngredient() ) ); - connect( removePropertyButton, SIGNAL( clicked() ), this, SLOT( removePropertyFromIngredient() ) ); - connect( propertiesListView->listView(), SIGNAL( executed( TQListViewItem* ) ), this, SLOT( insertPropertyEditBox( TQListViewItem* ) ) ); - connect( propertiesListView->listView(), SIGNAL( selectionChanged() ), inputBox, SLOT( hide() ) ); - connect( inputBox, SIGNAL( valueChanged( double ) ), this, SLOT( setPropertyAmount( double ) ) ); + connect( addPropertyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addPropertyToIngredient() ) ); + connect( removePropertyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removePropertyFromIngredient() ) ); + connect( propertiesListView->listView(), TQ_SIGNAL( executed( TQListViewItem* ) ), this, TQ_SLOT( insertPropertyEditBox( TQListViewItem* ) ) ); + connect( propertiesListView->listView(), TQ_SIGNAL( selectionChanged() ), inputBox, TQ_SLOT( hide() ) ); + connect( inputBox, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( setPropertyAmount( double ) ) ); - connect( weightsListView->listView(), SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), SLOT( itemRenamed( TQListViewItem*, const TQPoint &, int ) ) ); + connect( weightsListView->listView(), TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), TQ_SLOT( itemRenamed( TQListViewItem*, const TQPoint &, int ) ) ); - connect( loadUsdaButton, SIGNAL( clicked() ), this, SLOT( openUSDADialog() ) ); + connect( loadUsdaButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openUSDADialog() ) ); } diff --git a/krecipes/src/dialogs/pagesetupdialog.cpp b/krecipes/src/dialogs/pagesetupdialog.cpp index f9d004c..7957147 100644 --- a/krecipes/src/dialogs/pagesetupdialog.cpp +++ b/krecipes/src/dialogs/pagesetupdialog.cpp @@ -46,29 +46,29 @@ PageSetupDialog::PageSetupDialog( TQWidget *parent, const Recipe &sample, const TDEActionCollection *actionCollection = new TDEActionCollection( this ); TDEAction *std_open = KStdAction::open( 0, 0, 0 ); //use this to create a custom open action - TDEToolBarPopupAction *custom_open = new TDEToolBarPopupAction( std_open->text(), std_open->icon(), std_open->shortcut(), this, SLOT( loadFile() ), actionCollection, "open_popup" ); + TDEToolBarPopupAction *custom_open = new TDEToolBarPopupAction( std_open->text(), std_open->icon(), std_open->shortcut(), this, TQ_SLOT( loadFile() ), actionCollection, "open_popup" ); TDEPopupMenu *open_popup = custom_open->popupMenu(); open_popup->insertTitle( i18n( "Styles" ) ); TQDir included_layouts( getIncludedLayoutDir(), "*.klo", TQDir::Name | TQDir::IgnoreCase, TQDir::Files ); for ( unsigned int i = 0; i < included_layouts.count(); i++ ) { - int id = open_popup->insertItem( included_layouts[ i ].left(included_layouts[ i ].find(".")), this, SLOT( loadLayout( int ) ) ); + int id = open_popup->insertItem( included_layouts[ i ].left(included_layouts[ i ].find(".")), this, TQ_SLOT( loadLayout( int ) ) ); included_layouts_map.insert( id, included_layouts[ i ] ); } open_popup->insertTitle( i18n( "Templates" ) ); TQDir included_templates( getIncludedLayoutDir(), "*.template", TQDir::Name | TQDir::IgnoreCase, TQDir::Files ); for ( unsigned int i = 0; i < included_templates.count(); i++ ) { - int id = open_popup->insertItem( included_templates[ i ].left(included_templates[ i ].find(".")).replace("_"," "), this, SLOT( loadTemplate( int ) ) ); + int id = open_popup->insertItem( included_templates[ i ].left(included_templates[ i ].find(".")).replace("_"," "), this, TQ_SLOT( loadTemplate( int ) ) ); included_layouts_map.insert( id, included_templates[ i ] ); } custom_open->plug( toolbar ); - KStdAction::save( this, SLOT( saveLayout() ), actionCollection ) ->plug( toolbar ); - KStdAction::saveAs( this, SLOT( saveAsLayout() ), actionCollection ) ->plug( toolbar ); - KStdAction::redisplay( this, SLOT( reloadLayout() ), actionCollection ) ->plug( toolbar ); + KStdAction::save( this, TQ_SLOT( saveLayout() ), actionCollection ) ->plug( toolbar ); + KStdAction::saveAs( this, TQ_SLOT( saveAsLayout() ), actionCollection ) ->plug( toolbar ); + KStdAction::redisplay( this, TQ_SLOT( reloadLayout() ), actionCollection ) ->plug( toolbar ); TDEToolBarPopupAction *shown_items = new TDEToolBarPopupAction( i18n( "Items Shown" ), "frame_edit" ); shown_items->setDelayed( false ); @@ -88,9 +88,9 @@ PageSetupDialog::PageSetupDialog( TQWidget *parent, const Recipe &sample, const TQPushButton *cancelButton = new TQPushButton( il.loadIconSet( "cancel", TDEIcon::Small ), i18n( "&Cancel" ), buttonsBox ); layout->addWidget( buttonsBox ); - connect( m_htmlPart, SIGNAL(itemVisibilityChanged(KreDisplayItem*,bool)), this, SLOT(updateItemVisibility(KreDisplayItem*,bool)) ); - connect( okButton, SIGNAL( clicked() ), SLOT( accept() ) ); - connect( cancelButton, SIGNAL( clicked() ), SLOT( reject() ) ); + connect( m_htmlPart, TQ_SIGNAL(itemVisibilityChanged(KreDisplayItem*,bool)), this, TQ_SLOT(updateItemVisibility(KreDisplayItem*,bool)) ); + connect( okButton, TQ_SIGNAL( clicked() ), TQ_SLOT( accept() ) ); + connect( cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) ); TDEConfig *config = TDEGlobal::config(); config->setGroup( "Page Setup" ); @@ -178,7 +178,7 @@ void PageSetupDialog::initShownItems() if ( properties[item] & SetupDisplay::Visibility ) { int new_id = shown_items_popup->insertItem ( *it ); shown_items_popup->setItemChecked( new_id, item->show ); - shown_items_popup->connectItem( new_id, this, SLOT( setItemShown( int ) ) ); + shown_items_popup->connectItem( new_id, this, TQ_SLOT( setItemShown( int ) ) ); popup_widget_map.insert( new_id, item ); widget_popup_map.insert( item, new_id ); diff --git a/krecipes/src/dialogs/prepmethodsdialog.cpp b/krecipes/src/dialogs/prepmethodsdialog.cpp index 1ec4b76..066c09f 100644 --- a/krecipes/src/dialogs/prepmethodsdialog.cpp +++ b/krecipes/src/dialogs/prepmethodsdialog.cpp @@ -50,8 +50,8 @@ PrepMethodsDialog::PrepMethodsDialog( TQWidget* parent, RecipeDB *db ) : TQWidge //Connect Signals & Slots - connect ( newPrepMethodButton, SIGNAL( clicked() ), prepMethodListView, SLOT( createNew() ) ); - connect ( removePrepMethodButton, SIGNAL( clicked() ), prepMethodListView, SLOT( remove + connect ( newPrepMethodButton, TQ_SIGNAL( clicked() ), prepMethodListView, TQ_SLOT( createNew() ) ); + connect ( removePrepMethodButton, TQ_SIGNAL( clicked() ), prepMethodListView, TQ_SLOT( remove () ) ); } diff --git a/krecipes/src/dialogs/propertiesdialog.cpp b/krecipes/src/dialogs/propertiesdialog.cpp index f1b4d48..366eb63 100644 --- a/krecipes/src/dialogs/propertiesdialog.cpp +++ b/krecipes/src/dialogs/propertiesdialog.cpp @@ -56,8 +56,8 @@ PropertiesDialog::PropertiesDialog( TQWidget *parent, RecipeDB *db ) : TQWidget( layout->addLayout( vboxl ); // Connect signals & slots - connect( addPropertyButton, SIGNAL( clicked() ), propertyListView, SLOT( createNew() ) ); - connect( removePropertyButton, SIGNAL( clicked() ), propertyListView, SLOT( remove + connect( addPropertyButton, TQ_SIGNAL( clicked() ), propertyListView, TQ_SLOT( createNew() ) ); + connect( removePropertyButton, TQ_SIGNAL( clicked() ), propertyListView, TQ_SLOT( remove () ) ); //FIXME: We've got some sort of build issue... we get undefined references to CreatePropertyDialog without this dummy code here diff --git a/krecipes/src/dialogs/recipeinputdialog.cpp b/krecipes/src/dialogs/recipeinputdialog.cpp index b29443c..8e5df0a 100644 --- a/krecipes/src/dialogs/recipeinputdialog.cpp +++ b/krecipes/src/dialogs/recipeinputdialog.cpp @@ -417,7 +417,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox( ratingListDisplayWidget = new KWidgetListbox(ratingsTab); TQPushButton *addRatingButton = new TQPushButton(i18n("Add Rating..."),ratingsTab); - connect( addRatingButton, SIGNAL(clicked()), this, SLOT(slotAddRating()) ); + connect( addRatingButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddRating()) ); // ------- END OF Recipe Ratings Tab ----------- @@ -464,41 +464,41 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox( enableChangedSignal(); // Enables the signal "changed()" // Connect signals & Slots - connect( changePhotoButton, SIGNAL( clicked() ), this, SLOT( changePhoto() ) ); - connect( clearPhotoButton, SIGNAL( clicked() ), SLOT( clearPhoto() ) ); - connect( upButton, SIGNAL( clicked() ), this, SLOT( moveIngredientUp() ) ); - connect( downButton, SIGNAL( clicked() ), this, SLOT( moveIngredientDown() ) ); - connect( removeButton, SIGNAL( clicked() ), this, SLOT( removeIngredient() ) ); - connect( addButton, SIGNAL( clicked() ), ingInput, SLOT( addIngredient() ) ); - connect( ingParserButton, SIGNAL( clicked() ), this, SLOT( slotIngredientParser() ) ); - connect( photoLabel, SIGNAL( changed() ), this, SIGNAL( changed() ) ); - connect( this, SIGNAL( changed() ), this, SLOT( recipeChanged() ) ); - connect( yieldNumInput, SIGNAL( textChanged( const TQString & ) ), this, SLOT( recipeChanged() ) ); - connect( yieldTypeEdit, SIGNAL( textChanged( const TQString & ) ), this, SLOT( recipeChanged() ) ); - connect( prepTimeEdit, SIGNAL( valueChanged( const TQTime & ) ), SLOT( recipeChanged() ) ); - connect( titleEdit, SIGNAL( textChanged( const TQString& ) ), this, SLOT( recipeChanged( const TQString& ) ) ); - connect( instructionsEdit, SIGNAL( textChanged() ), this, SLOT( recipeChanged() ) ); - connect( addCategoryButton, SIGNAL( clicked() ), this, SLOT( addCategory() ) ); - connect( addAuthorButton, SIGNAL( clicked() ), this, SLOT( addAuthor() ) ); - connect( titleEdit, SIGNAL( textChanged( const TQString& ) ), this, SLOT( prepTitleChanged( const TQString& ) ) ); - connect( ingredientList, SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), SLOT( syncListView( TQListViewItem*, const TQString &, int ) ) ); - - connect ( ingInput, SIGNAL( ingredientEntered(const Ingredient&) ), this, SLOT( addIngredient(const Ingredient&) ) ); - connect ( ingInput, SIGNAL( headerEntered(const Element&) ), this, SLOT( addIngredientHeader(const Element&) ) ); - - connect( propertyStatusLed, SIGNAL(clicked()), SLOT(updatePropertyStatus()) ); - connect( propertyStatusDialog, SIGNAL(user1Clicked()), SLOT(updatePropertyStatus()) ); - connect( propertyStatusButton, SIGNAL(clicked()), propertyStatusDialog, SLOT(show()) ); + connect( changePhotoButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changePhoto() ) ); + connect( clearPhotoButton, TQ_SIGNAL( clicked() ), TQ_SLOT( clearPhoto() ) ); + connect( upButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveIngredientUp() ) ); + connect( downButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveIngredientDown() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeIngredient() ) ); + connect( addButton, TQ_SIGNAL( clicked() ), ingInput, TQ_SLOT( addIngredient() ) ); + connect( ingParserButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotIngredientParser() ) ); + connect( photoLabel, TQ_SIGNAL( changed() ), this, TQ_SIGNAL( changed() ) ); + connect( this, TQ_SIGNAL( changed() ), this, TQ_SLOT( recipeChanged() ) ); + connect( yieldNumInput, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( recipeChanged() ) ); + connect( yieldTypeEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( recipeChanged() ) ); + connect( prepTimeEdit, TQ_SIGNAL( valueChanged( const TQTime & ) ), TQ_SLOT( recipeChanged() ) ); + connect( titleEdit, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( recipeChanged( const TQString& ) ) ); + connect( instructionsEdit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( recipeChanged() ) ); + connect( addCategoryButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addCategory() ) ); + connect( addAuthorButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addAuthor() ) ); + connect( titleEdit, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( prepTitleChanged( const TQString& ) ) ); + connect( ingredientList, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), TQ_SLOT( syncListView( TQListViewItem*, const TQString &, int ) ) ); + + connect ( ingInput, TQ_SIGNAL( ingredientEntered(const Ingredient&) ), this, TQ_SLOT( addIngredient(const Ingredient&) ) ); + connect ( ingInput, TQ_SIGNAL( headerEntered(const Element&) ), this, TQ_SLOT( addIngredientHeader(const Element&) ) ); + + connect( propertyStatusLed, TQ_SIGNAL(clicked()), TQ_SLOT(updatePropertyStatus()) ); + connect( propertyStatusDialog, TQ_SIGNAL(user1Clicked()), TQ_SLOT(updatePropertyStatus()) ); + connect( propertyStatusButton, TQ_SIGNAL(clicked()), propertyStatusDialog, TQ_SLOT(show()) ); // Function buttons - connect ( saveButton, SIGNAL( clicked() ), this, SLOT( save() ) ); - connect ( closeButton, SIGNAL( clicked() ), this, SLOT( closeOptions() ) ); - connect ( showButton, SIGNAL( clicked() ), this, SLOT( showRecipe() ) ); - connect ( resizeButton, SIGNAL( clicked() ), this, SLOT( resizeRecipe() ) ); - connect ( spellCheckButton, SIGNAL( clicked() ), this, SLOT( spellCheck() ) ); - connect ( this, SIGNAL( enableSaveOption( bool ) ), this, SLOT( enableSaveButton( bool ) ) ); + connect ( saveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( save() ) ); + connect ( closeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeOptions() ) ); + connect ( showButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( showRecipe() ) ); + connect ( resizeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( resizeRecipe() ) ); + connect ( spellCheckButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( spellCheck() ) ); + connect ( this, TQ_SIGNAL( enableSaveOption( bool ) ), this, TQ_SLOT( enableSaveButton( bool ) ) ); - connect ( database, SIGNAL( recipeRemoved(int) ), this, SLOT( recipeRemoved(int) ) ); + connect ( database, TQ_SIGNAL( recipeRemoved(int) ), this, TQ_SLOT( recipeRemoved(int) ) ); delete il; @@ -1373,10 +1373,10 @@ void RecipeInputDialog::addRating( const Rating &rating, RatingDisplayWidget *it item->buttonEdit->disconnect(); item->buttonRemove->disconnect(); - connect(item->buttonEdit, SIGNAL(clicked()), - this, SLOT(slotEditRating())); - connect(item->buttonRemove, SIGNAL(clicked()), - this, SLOT(slotRemoveRating())); + connect(item->buttonEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditRating())); + connect(item->buttonRemove, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveRating())); } void RecipeInputDialog::slotEditRating() diff --git a/krecipes/src/dialogs/recipeviewdialog.cpp b/krecipes/src/dialogs/recipeviewdialog.cpp index 8918ac0..f68816f 100644 --- a/krecipes/src/dialogs/recipeviewdialog.cpp +++ b/krecipes/src/dialogs/recipeviewdialog.cpp @@ -40,7 +40,7 @@ RecipeViewDialog::RecipeViewDialog( TQWidget *parent, RecipeDB *db, int recipeID // Initialize UI Elements recipeView = new TDEHTMLPart( this ); - connect( database, SIGNAL(recipeRemoved(int)), SLOT(recipeRemoved(int)) ); + connect( database, TQ_SIGNAL(recipeRemoved(int)), TQ_SLOT(recipeRemoved(int)) ); tmp_filename = locateLocal( "tmp", "krecipes_recipe_view" ); diff --git a/krecipes/src/dialogs/refineshoppinglistdialog.cpp b/krecipes/src/dialogs/refineshoppinglistdialog.cpp index b3ad2c2..624840a 100644 --- a/krecipes/src/dialogs/refineshoppinglistdialog.cpp +++ b/krecipes/src/dialogs/refineshoppinglistdialog.cpp @@ -84,9 +84,9 @@ RefineShoppingListDialog::RefineShoppingListDialog( TQWidget* parent, RecipeDB * clearWState( WState_Polished ); - connect( addButton, SIGNAL( clicked() ), this, SLOT( addIngredient() ) ); - connect( removeButton, SIGNAL( clicked() ), this, SLOT( removeIngredient() ) ); - connect( ingListView->listView(), SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), SLOT( itemRenamed( TQListViewItem*, const TQString &, int ) ) ); + connect( addButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addIngredient() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeIngredient() ) ); + connect( ingListView->listView(), TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), TQ_SLOT( itemRenamed( TQListViewItem*, const TQString &, int ) ) ); TDEApplication::setOverrideCursor( KCursor::waitCursor() ); calculateShopping( recipeList, &ingredientList, database ); diff --git a/krecipes/src/dialogs/resizerecipedialog.cpp b/krecipes/src/dialogs/resizerecipedialog.cpp index 71cc3c9..252b90f 100644 --- a/krecipes/src/dialogs/resizerecipedialog.cpp +++ b/krecipes/src/dialogs/resizerecipedialog.cpp @@ -118,7 +118,7 @@ ResizeRecipeDialog::ResizeRecipeDialog( TQWidget *parent, Recipe *recipe ) } // signals and slots connections - connect( buttonGroup, SIGNAL( clicked( int ) ), this, SLOT( activateCurrentOption( int ) ) ); + connect( buttonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( activateCurrentOption( int ) ) ); } void ResizeRecipeDialog::languageChange() diff --git a/krecipes/src/dialogs/selectauthorsdialog.cpp b/krecipes/src/dialogs/selectauthorsdialog.cpp index aeb065a..53ea2da 100644 --- a/krecipes/src/dialogs/selectauthorsdialog.cpp +++ b/krecipes/src/dialogs/selectauthorsdialog.cpp @@ -71,8 +71,8 @@ SelectAuthorsDialog::SelectAuthorsDialog( TQWidget *parent, const ElementList &c resize(450, height()); // Connect signals & Slots - connect ( addAuthorButton, SIGNAL( clicked() ), this, SLOT( addAuthor() ) ); - connect ( removeAuthorButton, SIGNAL( clicked() ), this, SLOT( removeAuthor() ) ); + connect ( addAuthorButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addAuthor() ) ); + connect ( removeAuthorButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeAuthor() ) ); authorsCombo->setEditText(TQString::null); authorsCombo->lineEdit()->setFocus(); diff --git a/krecipes/src/dialogs/selectcategoriesdialog.cpp b/krecipes/src/dialogs/selectcategoriesdialog.cpp index 8e156d9..d861803 100644 --- a/krecipes/src/dialogs/selectcategoriesdialog.cpp +++ b/krecipes/src/dialogs/selectcategoriesdialog.cpp @@ -48,7 +48,7 @@ SelectCategoriesDialog::SelectCategoriesDialog( TQWidget *parent, const ElementL setSizeGripEnabled( true ); // Connect signals & Slots - connect ( newCatButton, SIGNAL( clicked() ), SLOT( createNewCategory() ) ); + connect ( newCatButton, TQ_SIGNAL( clicked() ), TQ_SLOT( createNewCategory() ) ); } SelectCategoriesDialog::~SelectCategoriesDialog() diff --git a/krecipes/src/dialogs/selectrecipedialog.cpp b/krecipes/src/dialogs/selectrecipedialog.cpp index 0b63d04..afadf23 100644 --- a/krecipes/src/dialogs/selectrecipedialog.cpp +++ b/krecipes/src/dialogs/selectrecipedialog.cpp @@ -125,41 +125,41 @@ SelectRecipeDialog::SelectRecipeDialog( TQWidget *parent, RecipeDB* db ) // Signals & Slots - connect( openButton, SIGNAL( clicked() ), actionHandler, SLOT( open() ) ); - connect( this, SIGNAL( recipeSelected( bool ) ), openButton, SLOT( setEnabled( bool ) ) ); - connect( editButton, SIGNAL( clicked() ), actionHandler, SLOT( edit() ) ); - connect( this, SIGNAL( recipeSelected( bool ) ), editButton, SLOT( setEnabled( bool ) ) ); - connect( removeButton, SIGNAL( clicked() ), actionHandler, SLOT( remove() ) ); - connect( this, SIGNAL( recipeSelected( bool ) ), removeButton, SLOT( setEnabled( bool ) ) ); + connect( openButton, TQ_SIGNAL( clicked() ), actionHandler, TQ_SLOT( open() ) ); + connect( this, TQ_SIGNAL( recipeSelected( bool ) ), openButton, TQ_SLOT( setEnabled( bool ) ) ); + connect( editButton, TQ_SIGNAL( clicked() ), actionHandler, TQ_SLOT( edit() ) ); + connect( this, TQ_SIGNAL( recipeSelected( bool ) ), editButton, TQ_SLOT( setEnabled( bool ) ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), actionHandler, TQ_SLOT( remove() ) ); + connect( this, TQ_SIGNAL( recipeSelected( bool ) ), removeButton, TQ_SLOT( setEnabled( bool ) ) ); - connect( clearSearchButton, SIGNAL( clicked() ), this, SLOT( clearSearch() ) ); + connect( clearSearchButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clearSearch() ) ); TDEConfig * config = kapp->config(); config->setGroup( "Performance" ); if ( config->readBoolEntry("SearchAsYouType",true) ) { - connect( searchBox, SIGNAL( returnPressed( const TQString& ) ), recipeFilter, SLOT( filter( const TQString& ) ) ); - connect( searchBox, SIGNAL( textChanged( const TQString& ) ), this, SLOT( ensurePopulated() ) ); - connect( searchBox, SIGNAL( textChanged( const TQString& ) ), recipeFilter, SLOT( filter( const TQString& ) ) ); + connect( searchBox, TQ_SIGNAL( returnPressed( const TQString& ) ), recipeFilter, TQ_SLOT( filter( const TQString& ) ) ); + connect( searchBox, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( ensurePopulated() ) ); + connect( searchBox, TQ_SIGNAL( textChanged( const TQString& ) ), recipeFilter, TQ_SLOT( filter( const TQString& ) ) ); } else { - connect( searchBox, SIGNAL( returnPressed( const TQString& ) ), this, SLOT( ensurePopulated() ) ); - connect( searchBox, SIGNAL( returnPressed( const TQString& ) ), recipeFilter, SLOT( filter( const TQString& ) ) ); + connect( searchBox, TQ_SIGNAL( returnPressed( const TQString& ) ), this, TQ_SLOT( ensurePopulated() ) ); + connect( searchBox, TQ_SIGNAL( returnPressed( const TQString& ) ), recipeFilter, TQ_SLOT( filter( const TQString& ) ) ); } - connect( recipeListView, SIGNAL( selectionChanged() ), this, SLOT( haveSelectedItems() ) ); + connect( recipeListView, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( haveSelectedItems() ) ); #ifdef ENABLE_SLOW - connect( recipeListView, SIGNAL( nextGroupLoaded() ), categoryBox, SLOT( loadNextGroup() ) ); - connect( recipeListView, SIGNAL( prevGroupLoaded() ), categoryBox, SLOT( loadPrevGroup() ) ); - connect( categoryBox, SIGNAL( activated( int ) ), this, SLOT( filterComboCategory( int ) ) ); + connect( recipeListView, TQ_SIGNAL( nextGroupLoaded() ), categoryBox, TQ_SLOT( loadNextGroup() ) ); + connect( recipeListView, TQ_SIGNAL( prevGroupLoaded() ), categoryBox, TQ_SLOT( loadPrevGroup() ) ); + connect( categoryBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( filterComboCategory( int ) ) ); #endif - connect( recipeListView, SIGNAL( nextGroupLoaded() ), SLOT( refilter() ) ); - connect( recipeListView, SIGNAL( prevGroupLoaded() ), SLOT( refilter() ) ); + connect( recipeListView, TQ_SIGNAL( nextGroupLoaded() ), TQ_SLOT( refilter() ) ); + connect( recipeListView, TQ_SIGNAL( prevGroupLoaded() ), TQ_SLOT( refilter() ) ); - connect( advancedSearch, SIGNAL( recipeSelected( int, int ) ), SIGNAL( recipeSelected( int, int ) ) ); - connect( advancedSearch, SIGNAL( recipesSelected( const TQValueList &, int ) ), SIGNAL( recipesSelected( const TQValueList &, int ) ) ); + connect( advancedSearch, TQ_SIGNAL( recipeSelected( int, int ) ), TQ_SIGNAL( recipeSelected( int, int ) ) ); + connect( advancedSearch, TQ_SIGNAL( recipesSelected( const TQValueList &, int ) ), TQ_SIGNAL( recipesSelected( const TQValueList &, int ) ) ); - connect( actionHandler, SIGNAL( recipeSelected( int, int ) ), SIGNAL( recipeSelected( int, int ) ) ); - connect( actionHandler, SIGNAL( recipesSelected( const TQValueList &, int ) ), SIGNAL( recipesSelected( const TQValueList &, int ) ) ); + connect( actionHandler, TQ_SIGNAL( recipeSelected( int, int ) ), TQ_SIGNAL( recipeSelected( int, int ) ) ); + connect( actionHandler, TQ_SIGNAL( recipesSelected( const TQValueList &, int ) ), TQ_SIGNAL( recipesSelected( const TQValueList &, int ) ) ); delete il; } diff --git a/krecipes/src/dialogs/setupdisplay.cpp b/krecipes/src/dialogs/setupdisplay.cpp index cf36f61..4eae8c5 100644 --- a/krecipes/src/dialogs/setupdisplay.cpp +++ b/krecipes/src/dialogs/setupdisplay.cpp @@ -62,7 +62,7 @@ SetupDisplay::SetupDisplay( const Recipe &sample, TQWidget *parent ) : TDEHTMLPa has_changes( false ), popup(0) { - connect( this, SIGNAL( popupMenu(const TQString &,const TQPoint &) ), SLOT( nodeClicked(const TQString &,const TQPoint &) ) ); + connect( this, TQ_SIGNAL( popupMenu(const TQString &,const TQPoint &) ), TQ_SLOT( nodeClicked(const TQString &,const TQPoint &) ) ); if ( sample.recipeID != -1 ) m_sample = sample; @@ -420,16 +420,16 @@ void SetupDisplay::nodeClicked(const TQString &/*url*/,const TQPoint &point) TDEIconLoader il; if ( properties & BackgroundColor ) - popup->insertItem( i18n( "Background Color..." ), this, SLOT( setBackgroundColor() ) ); + popup->insertItem( i18n( "Background Color..." ), this, TQ_SLOT( setBackgroundColor() ) ); if ( properties & TextColor ) - popup->insertItem( i18n( "Text Color..." ), this, SLOT( setTextColor() ) ); + popup->insertItem( i18n( "Text Color..." ), this, TQ_SLOT( setTextColor() ) ); if ( properties & Font ) - popup->insertItem( il.loadIconSet( "text", TDEIcon::Small, 16 ), i18n( "Font..." ), this, SLOT( setFont() ) ); + popup->insertItem( il.loadIconSet( "text", TDEIcon::Small, 16 ), i18n( "Font..." ), this, TQ_SLOT( setFont() ) ); if ( properties & Visibility ) { - int id = popup->insertItem( i18n( "Show" ), this, SLOT( setShown( int ) ) ); + int id = popup->insertItem( i18n( "Show" ), this, TQ_SLOT( setShown( int ) ) ); popup->setItemChecked( id, item->show ); } @@ -451,7 +451,7 @@ void SetupDisplay::nodeClicked(const TQString &/*url*/,const TQPoint &point) if ( align & TQt::AlignRight ) r_action->setOn(true); - connect( alignment_actions, SIGNAL( selected( TQAction* ) ), SLOT( setAlignment( TQAction* ) ) ); + connect( alignment_actions, TQ_SIGNAL( selected( TQAction* ) ), TQ_SLOT( setAlignment( TQAction* ) ) ); popup->insertItem( i18n( "Alignment" ), sub_popup ); @@ -459,10 +459,10 @@ void SetupDisplay::nodeClicked(const TQString &/*url*/,const TQPoint &point) } if ( properties & Border ) - popup->insertItem( i18n( "Border..." ), this, SLOT( setBorder() ) ); + popup->insertItem( i18n( "Border..." ), this, TQ_SLOT( setBorder() ) ); if ( properties & Columns ) - popup->insertItem( i18n( "Columns..." ), this, SLOT( setColumns() ) ); + popup->insertItem( i18n( "Columns..." ), this, TQ_SLOT( setColumns() ) ); popup->popup( point ); } diff --git a/krecipes/src/dialogs/shoppinglistdialog.cpp b/krecipes/src/dialogs/shoppinglistdialog.cpp index e18e846..a0ac00f 100644 --- a/krecipes/src/dialogs/shoppinglistdialog.cpp +++ b/krecipes/src/dialogs/shoppinglistdialog.cpp @@ -70,11 +70,11 @@ ShoppingListDialog::ShoppingListDialog( TQWidget *parent, RecipeDB *db ) : TQWid listview->setDragEnabled( true ); listview->setAcceptDrops( true ); listview->setDropVisualizer( false ); - connect( recipeListView, SIGNAL( textChanged(const TQString&) ), SLOT( ensurePopulated() ) ); - connect( listview, SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ), - this, SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) ); + connect( recipeListView, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( ensurePopulated() ) ); + connect( listview, TQ_SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ), + this, TQ_SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) ); recipeListView->setListView( listview ); - recipeListView->setCustomFilter( new RecipeFilter( recipeListView->listView() ), SLOT( filter( const TQString & ) ) ); + recipeListView->setCustomFilter( new RecipeFilter( recipeListView->listView() ), TQ_SLOT( filter( const TQString & ) ) ); recipeListView->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ); TQBoxLayout* vboxl = new TQVBoxLayout( KDialog::spacingHint() ); @@ -100,8 +100,8 @@ ShoppingListDialog::ShoppingListDialog( TQWidget *parent, RecipeDB *db ) : TQWid slistview->setDragEnabled( true ); slistview->setAcceptDrops( true ); slistview->setDropVisualizer( false ); - connect( slistview, SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ), - this, SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) ); + connect( slistview, TQ_SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ), + this, TQ_SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) ); shopRecipeListView->setListView( slistview ); layout->addWidget( shopRecipeListView, 0, 2 ); @@ -139,10 +139,10 @@ ShoppingListDialog::ShoppingListDialog( TQWidget *parent, RecipeDB *db ) : TQWid actionHandler = new RecipeActionsHandler( recipeListView->listView(), database, RecipeActionsHandler::ExpandAll | RecipeActionsHandler::CollapseAll ); // Connect signals & slots - connect( addRecipeButton, SIGNAL( clicked() ), this, SLOT( addRecipe() ) ); - connect( removeRecipeButton, SIGNAL( clicked() ), this, SLOT( removeRecipe() ) ); - connect( okButton, SIGNAL( clicked() ), this, SLOT( showShoppingList() ) ); - connect( clearButton, SIGNAL( clicked() ), this, SLOT( clear() ) ); + connect( addRecipeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addRecipe() ) ); + connect( removeRecipeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeRecipe() ) ); + connect( okButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( showShoppingList() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clear() ) ); } ShoppingListDialog::~ShoppingListDialog() diff --git a/krecipes/src/dialogs/shoppinglistviewdialog.cpp b/krecipes/src/dialogs/shoppinglistviewdialog.cpp index c84b6cd..33381e0 100644 --- a/krecipes/src/dialogs/shoppinglistviewdialog.cpp +++ b/krecipes/src/dialogs/shoppinglistviewdialog.cpp @@ -33,8 +33,8 @@ ShoppingListViewDialog::ShoppingListViewDialog( TQWidget *parent, const Ingredie setInitialSize( TQSize(350, 450) ); - connect ( this, SIGNAL( user1Clicked() ), this, SLOT( print() ) ); - connect ( this, SIGNAL( closeClicked() ), this, SLOT( accept() ) ); + connect ( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( print() ) ); + connect ( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( accept() ) ); //---------- Sort the list -------- IngredientList list_copy = ingredientList; diff --git a/krecipes/src/dialogs/similarcategoriesdialog.cpp b/krecipes/src/dialogs/similarcategoriesdialog.cpp index f81e4ba..e292967 100644 --- a/krecipes/src/dialogs/similarcategoriesdialog.cpp +++ b/krecipes/src/dialogs/similarcategoriesdialog.cpp @@ -113,11 +113,11 @@ SimilarCategoriesDialog::SimilarCategoriesDialog( ElementList &list, TQWidget* p resize( TQSize(573, 429).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); - connect( searchButton, SIGNAL(clicked()), this, SLOT(findMatches()) ); - connect( mergeButton, SIGNAL(clicked()), this, SLOT(mergeMatches()) ); - connect( cancelButton, SIGNAL(clicked()), this, SLOT(reject()) ); - connect( addButton, SIGNAL(clicked()), this, SLOT(addCategory()) ); - connect( removeButton, SIGNAL(clicked()), this, SLOT(removeCategory()) ); + connect( searchButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(findMatches()) ); + connect( mergeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(mergeMatches()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); + connect( addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCategory()) ); + connect( removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCategory()) ); } /* diff --git a/krecipes/src/dialogs/unitsdialog.cpp b/krecipes/src/dialogs/unitsdialog.cpp index c5f1994..c00d9d4 100644 --- a/krecipes/src/dialogs/unitsdialog.cpp +++ b/krecipes/src/dialogs/unitsdialog.cpp @@ -68,20 +68,20 @@ UnitsDialog::UnitsDialog( TQWidget *parent, RecipeDB *db ) : TQWidget( parent ) page_layout->addWidget( tabWidget ); // Connect signals & slots - connect( newUnitButton, SIGNAL( clicked() ), unitListView, SLOT( createNew() ) ); - connect( removeUnitButton, SIGNAL( clicked() ), unitListView, SLOT( remove() ) ); - connect( massConversionTable, SIGNAL( ratioChanged( int, int, double ) ), this, SLOT( saveRatio( int, int, double ) ) ); - connect( massConversionTable, SIGNAL( ratioRemoved( int, int ) ), this, SLOT( removeRatio( int, int ) ) ); - connect( volumeConversionTable, SIGNAL( ratioChanged( int, int, double ) ), this, SLOT( saveRatio( int, int, double ) ) ); - connect( volumeConversionTable, SIGNAL( ratioRemoved( int, int ) ), this, SLOT( removeRatio( int, int ) ) ); + connect( newUnitButton, TQ_SIGNAL( clicked() ), unitListView, TQ_SLOT( createNew() ) ); + connect( removeUnitButton, TQ_SIGNAL( clicked() ), unitListView, TQ_SLOT( remove() ) ); + connect( massConversionTable, TQ_SIGNAL( ratioChanged( int, int, double ) ), this, TQ_SLOT( saveRatio( int, int, double ) ) ); + connect( massConversionTable, TQ_SIGNAL( ratioRemoved( int, int ) ), this, TQ_SLOT( removeRatio( int, int ) ) ); + connect( volumeConversionTable, TQ_SIGNAL( ratioChanged( int, int, double ) ), this, TQ_SLOT( saveRatio( int, int, double ) ) ); + connect( volumeConversionTable, TQ_SIGNAL( ratioRemoved( int, int ) ), this, TQ_SLOT( removeRatio( int, int ) ) ); //TODO: I'm too lazy right now, so do a complete reload to keep in sync with db - connect( database, SIGNAL( unitCreated( const Unit& ) ), this, SLOT( loadConversionTables() ) ); - connect( database, SIGNAL( unitRemoved( int ) ), this, SLOT( loadConversionTables() ) ); + connect( database, TQ_SIGNAL( unitCreated( const Unit& ) ), this, TQ_SLOT( loadConversionTables() ) ); + connect( database, TQ_SIGNAL( unitRemoved( int ) ), this, TQ_SLOT( loadConversionTables() ) ); //this is for the above TODO, but it still has some bugs to be worked out - //connect(database,SIGNAL(unitCreated(const Element&)),conversionTable,SLOT(unitCreated(const Element&))); - //connect(database,SIGNAL(unitRemoved(int)),conversionTable,SLOT(unitRemoved(int))); + //connect(database,TQ_SIGNAL(unitCreated(const Element&)),conversionTable,TQ_SLOT(unitCreated(const Element&))); + //connect(database,TQ_SIGNAL(unitRemoved(int)),conversionTable,TQ_SLOT(unitRemoved(int))); //Populate data into the table loadConversionTables(); diff --git a/krecipes/src/dialogs/usdadatadialog.cpp b/krecipes/src/dialogs/usdadatadialog.cpp index dfdbfa8..e03ca11 100644 --- a/krecipes/src/dialogs/usdadatadialog.cpp +++ b/krecipes/src/dialogs/usdadatadialog.cpp @@ -51,7 +51,7 @@ USDADataDialog::USDADataDialog( const Element &ing, RecipeDB *db, TQWidget *pare loadDataFromFile(); - connect( listView, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( slotOk() ) ); + connect( listView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( slotOk() ) ); } USDADataDialog::~USDADataDialog() diff --git a/krecipes/src/krecipes.cpp b/krecipes/src/krecipes.cpp index 4d5e6e1..c6dcefe 100644 --- a/krecipes/src/krecipes.cpp +++ b/krecipes/src/krecipes.cpp @@ -95,20 +95,20 @@ Krecipes::Krecipes() // allow the view to change the statusbar and caption - connect( m_view, SIGNAL( signalChangeStatusbar( const TQString& ) ), - this, SLOT( changeStatusbar( const TQString& ) ) ); - connect( m_view, SIGNAL( signalChangeCaption( const TQString& ) ), - this, SLOT( changeCaption( const TQString& ) ) ); + connect( m_view, TQ_SIGNAL( signalChangeStatusbar( const TQString& ) ), + this, TQ_SLOT( changeStatusbar( const TQString& ) ) ); + connect( m_view, TQ_SIGNAL( signalChangeCaption( const TQString& ) ), + this, TQ_SLOT( changeCaption( const TQString& ) ) ); - connect( m_view, SIGNAL( panelShown( KrePanel, bool ) ), SLOT( updateActions( KrePanel, bool ) ) ); - connect( m_view, SIGNAL( panelShown( KrePanel, bool ) ), SLOT( updateActions( KrePanel, bool ) ) ); + connect( m_view, TQ_SIGNAL( panelShown( KrePanel, bool ) ), TQ_SLOT( updateActions( KrePanel, bool ) ) ); + connect( m_view, TQ_SIGNAL( panelShown( KrePanel, bool ) ), TQ_SLOT( updateActions( KrePanel, bool ) ) ); - connect( m_view, SIGNAL( recipeSelected(bool) ), SLOT( recipeSelected(bool) ) ); + connect( m_view, TQ_SIGNAL( recipeSelected(bool) ), TQ_SLOT( recipeSelected(bool) ) ); // Enable/Disable the Save Button (Initialize disabled, and connect signal) - connect( m_view, SIGNAL( enableSaveOption( bool ) ), this, SLOT( enableSaveOption( bool ) ) ); + connect( m_view, TQ_SIGNAL( enableSaveOption( bool ) ), this, TQ_SLOT( enableSaveOption( bool ) ) ); enableSaveOption( false ); // Disables saving initially recipeSelected( false ); //nothing is selected initially @@ -163,74 +163,74 @@ void Krecipes::recipeSelected( bool selected ) void Krecipes::setupActions() { - printAction = KStdAction::print( this, SLOT( filePrint() ), actionCollection() ); - reloadAction = new TDEAction( i18n( "Reloa&d" ), "reload", Key_F5, m_view, SLOT( reloadDisplay() ), actionCollection(), "reload_action" ); + printAction = KStdAction::print( this, TQ_SLOT( filePrint() ), actionCollection() ); + reloadAction = new TDEAction( i18n( "Reloa&d" ), "reload", Key_F5, m_view, TQ_SLOT( reloadDisplay() ), actionCollection(), "reload_action" ); editAction = new TDEAction( i18n( "&Edit Recipe" ), "edit", CTRL + Key_E, - m_view, SLOT( editRecipe() ), + m_view, TQ_SLOT( editRecipe() ), actionCollection(), "edit_action" ); (void) new TDEAction( i18n( "&Measurement Converter" ), "", CTRL + Key_M, - this, SLOT( conversionToolSlot() ), + this, TQ_SLOT( conversionToolSlot() ), actionCollection(), "converter_action" ); TDEConfig *config = TDEGlobal::config(); config->setGroup("Advanced"); if ( config->readBoolEntry("UnhideMergeTools",false) ) { ( void ) new TDEAction( i18n( "&Merge Similar Categories..." ), "categories", CTRL + Key_M, - this, SLOT( mergeSimilarCategories() ), + this, TQ_SLOT( mergeSimilarCategories() ), actionCollection(), "merge_categories_action" ); ( void ) new TDEAction( i18n( "&Merge Similar Ingredients..." ), "ingredients", CTRL + Key_M, - this, SLOT( mergeSimilarIngredients() ), + this, TQ_SLOT( mergeSimilarIngredients() ), actionCollection(), "merge_ingredients_action" ); } - TDEAction *action = KStdAction::openNew( this, SLOT( fileNew() ), actionCollection() ); + TDEAction *action = KStdAction::openNew( this, TQ_SLOT( fileNew() ), actionCollection() ); action->setText( i18n( "&New Recipe" ) ); - saveAction = KStdAction::save( this, SLOT( fileSave() ), actionCollection() ); + saveAction = KStdAction::save( this, TQ_SLOT( fileSave() ), actionCollection() ); - KStdAction::quit( kapp, SLOT( quit() ), actionCollection() ); + KStdAction::quit( kapp, TQ_SLOT( quit() ), actionCollection() ); - m_toolbarAction = KStdAction::showToolbar( this, SLOT( optionsShowToolbar() ), actionCollection() ); - m_statusbarAction = KStdAction::showStatusbar( this, SLOT( optionsShowStatusbar() ), actionCollection() ); + m_toolbarAction = KStdAction::showToolbar( this, TQ_SLOT( optionsShowToolbar() ), actionCollection() ); + m_statusbarAction = KStdAction::showStatusbar( this, TQ_SLOT( optionsShowStatusbar() ), actionCollection() ); - KStdAction::keyBindings( this, SLOT( optionsConfigureKeys() ), actionCollection() ); - KStdAction::configureToolbars( this, SLOT( optionsConfigureToolbars() ), actionCollection() ); - KStdAction::preferences( this, SLOT( optionsPreferences() ), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT( optionsConfigureKeys() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( optionsConfigureToolbars() ), actionCollection() ); + KStdAction::preferences( this, TQ_SLOT( optionsPreferences() ), actionCollection() ); ( void ) new TDEAction( i18n( "Import from File..." ), CTRL + Key_I, - this, SLOT( import() ), + this, TQ_SLOT( import() ), actionCollection(), "import_action" ); ( void ) new TDEAction( i18n( "Import from Database..." ), 0, - this, SLOT( kreDBImport() ), + this, TQ_SLOT( kreDBImport() ), actionCollection(), "import_db_action" ); exportAction = new TDEAction( i18n( "Export..." ), 0, - this, SLOT( fileExport() ), + this, TQ_SLOT( fileExport() ), actionCollection(), "export_action" ); copyToClipboardAction = new TDEAction( i18n( "&Copy to Clipboard" ), "edit-copy", CTRL + Key_C, - this, SLOT( fileToClipboard() ), + this, TQ_SLOT( fileToClipboard() ), actionCollection(), "copy_to_clipboard_action" ); ( void ) new TDEAction( i18n( "Page Setup..." ), 0, - this, SLOT( pageSetupSlot() ), + this, TQ_SLOT( pageSetupSlot() ), actionCollection(), "page_setup_action" ); ( void ) new TDEAction( i18n( "Print Setup..." ), 0, - this, SLOT( printSetupSlot() ), + this, TQ_SLOT( printSetupSlot() ), actionCollection(), "print_setup_action" ); ( void ) new TDEAction( i18n( "Backup..." ), "krecipes_file", 0, - this, SLOT( backupSlot() ), + this, TQ_SLOT( backupSlot() ), actionCollection(), "backup_action" ); ( void ) new TDEAction( i18n( "Restore..." ), 0, - this, SLOT( restoreSlot() ), + this, TQ_SLOT( restoreSlot() ), actionCollection(), "restore_action" ); updateActions( SelectP, true ); @@ -651,7 +651,7 @@ void Krecipes::optionsConfigureToolbars() #endif KEditToolbar dlg( actionCollection() ); - connect( &dlg, SIGNAL( newToolbarConfig() ), this, SLOT( newToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( newToolbarConfig() ) ); dlg.exec(); } diff --git a/krecipes/src/krecipesview.cpp b/krecipes/src/krecipesview.cpp index 17eb312..63f1cb4 100644 --- a/krecipes/src/krecipesview.cpp +++ b/krecipes/src/krecipesview.cpp @@ -243,43 +243,43 @@ KrecipesView::KrecipesView( TQWidget *parent ) // Connect Signals from Left Panel to slotSetPanel() - connect( leftPanel, SIGNAL( clicked( KrePanel ) ), this, SLOT( slotSetPanel( KrePanel ) ) ); + connect( leftPanel, TQ_SIGNAL( clicked( KrePanel ) ), this, TQ_SLOT( slotSetPanel( KrePanel ) ) ); - connect( contextButton, SIGNAL( clicked() ), SLOT( activateContextHelp() ) ); + connect( contextButton, TQ_SIGNAL( clicked() ), TQ_SLOT( activateContextHelp() ) ); - connect( leftPanel, SIGNAL( resized( int, int ) ), this, SLOT( resizeRightPane( int, int ) ) ); + connect( leftPanel, TQ_SIGNAL( resized( int, int ) ), this, TQ_SLOT( resizeRightPane( int, int ) ) ); // Retransmit signal to parent to Enable/Disable the Save Button - connect ( inputPanel, SIGNAL( enableSaveOption( bool ) ), this, SIGNAL( enableSaveOption( bool ) ) ); + connect ( inputPanel, TQ_SIGNAL( enableSaveOption( bool ) ), this, TQ_SIGNAL( enableSaveOption( bool ) ) ); // Create a new button when a recipe is unsaved - connect ( inputPanel, SIGNAL( createButton( TQWidget*, const TQString & ) ), this, SLOT( addRecipeButton( TQWidget*, const TQString & ) ) ); + connect ( inputPanel, TQ_SIGNAL( createButton( TQWidget*, const TQString & ) ), this, TQ_SLOT( addRecipeButton( TQWidget*, const TQString & ) ) ); // Connect Signals from selectPanel (SelectRecipeDialog) - connect ( selectPanel, SIGNAL( recipeSelected( int, int ) ), this, SLOT( actionRecipe( int, int ) ) ); - connect ( selectPanel, SIGNAL( recipesSelected( const TQValueList&, int ) ), this, SLOT( actionRecipes( const TQValueList&, int ) ) ); + connect ( selectPanel, TQ_SIGNAL( recipeSelected( int, int ) ), this, TQ_SLOT( actionRecipe( int, int ) ) ); + connect ( selectPanel, TQ_SIGNAL( recipesSelected( const TQValueList&, int ) ), this, TQ_SLOT( actionRecipes( const TQValueList&, int ) ) ); // Connect Signals from ingredientMatcherPanel (IngredientMatcherDialog) - connect ( ingredientMatcherPanel, SIGNAL( recipeSelected( int, int ) ), SLOT( actionRecipe( int, int ) ) ); + connect ( ingredientMatcherPanel, TQ_SIGNAL( recipeSelected( int, int ) ), TQ_SLOT( actionRecipe( int, int ) ) ); // Close a recipe when requested (just switch panels) - connect( inputPanel, SIGNAL( closeRecipe() ), this, SLOT( closeRecipe() ) ); + connect( inputPanel, TQ_SIGNAL( closeRecipe() ), this, TQ_SLOT( closeRecipe() ) ); // Show a recipe when requested (just switch panels) - connect( inputPanel, SIGNAL( showRecipe( int ) ), this, SLOT( showRecipe( int ) ) ); + connect( inputPanel, TQ_SIGNAL( showRecipe( int ) ), this, TQ_SLOT( showRecipe( int ) ) ); // Create a new shopping list when a new diet is generated and accepted - connect( dietPanel, SIGNAL( dietReady() ), this, SLOT( createShoppingListFromDiet() ) ); + connect( dietPanel, TQ_SIGNAL( dietReady() ), this, TQ_SLOT( createShoppingListFromDiet() ) ); // Place the Tip Button in correct position when the left pane is resized - connect( leftPanel, SIGNAL( resized( int, int ) ), this, SLOT( moveTipButton( int, int ) ) ); + connect( leftPanel, TQ_SIGNAL( resized( int, int ) ), this, TQ_SLOT( moveTipButton( int, int ) ) ); - connect( rightPanel, SIGNAL( panelRaised( TQWidget*, TQWidget* ) ), SLOT( panelRaised( TQWidget*, TQWidget* ) ) ); + connect( rightPanel, TQ_SIGNAL( panelRaised( TQWidget*, TQWidget* ) ), TQ_SLOT( panelRaised( TQWidget*, TQWidget* ) ) ); - connect( selectPanel, SIGNAL( recipeSelected(bool) ), SIGNAL( recipeSelected(bool) ) ); + connect( selectPanel, TQ_SIGNAL( recipeSelected(bool) ), TQ_SIGNAL( recipeSelected(bool) ) ); // Close Splash Screen delete start_logo; @@ -708,8 +708,8 @@ void KrecipesView::addRecipeButton( TQWidget *w, const TQString &title ) buttonsList->append( recipeButton ); leftPanel->highlightButton( recipeButton ); - connect( recipeButton, SIGNAL( clicked() ), this, SLOT( switchToRecipe() ) ); - connect( ( RecipeInputDialog * ) w, SIGNAL( titleChanged( const TQString& ) ), recipeButton, SLOT( setTitle( const TQString& ) ) ); + connect( recipeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( switchToRecipe() ) ); + connect( ( RecipeInputDialog * ) w, TQ_SIGNAL( titleChanged( const TQString& ) ), recipeButton, TQ_SLOT( setTitle( const TQString& ) ) ); } } diff --git a/krecipes/src/pref.cpp b/krecipes/src/pref.cpp index 4eb71b8..9776fd9 100644 --- a/krecipes/src/pref.cpp +++ b/krecipes/src/pref.cpp @@ -81,7 +81,7 @@ KrecipesPreferences::KrecipesPreferences( TQWidget *parent ) m_helpMap.insert(3,"configure-performance"); // Signals & Slots - connect ( this, SIGNAL( okClicked() ), this, SLOT( saveSettings() ) ); + connect ( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( saveSettings() ) ); } diff --git a/krecipes/src/recipeactionshandler.cpp b/krecipes/src/recipeactionshandler.cpp index 65720af..910c41a 100644 --- a/krecipes/src/recipeactionshandler.cpp +++ b/krecipes/src/recipeactionshandler.cpp @@ -48,40 +48,40 @@ RecipeActionsHandler::RecipeActionsHandler( TDEListView *_parentListView, Recipe kpop = new TDEPopupMenu( parentListView ); if ( actions & Open ) - kpop->insertItem( il->loadIcon( "ok", TDEIcon::NoGroup, 16 ), i18n( "&Open" ), this, SLOT( open() ), CTRL + Key_L ); + kpop->insertItem( il->loadIcon( "ok", TDEIcon::NoGroup, 16 ), i18n( "&Open" ), this, TQ_SLOT( open() ), CTRL + Key_L ); if ( actions & Edit ) - kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Edit" ), this, SLOT( edit() ), CTRL + Key_E ); + kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Edit" ), this, TQ_SLOT( edit() ), CTRL + Key_E ); if ( actions & Export ) - kpop->insertItem( il->loadIcon( "fileexport", TDEIcon::NoGroup, 16 ), i18n( "E&xport" ), this, SLOT( recipeExport() ), 0 ); + kpop->insertItem( il->loadIcon( "fileexport", TDEIcon::NoGroup, 16 ), i18n( "E&xport" ), this, TQ_SLOT( recipeExport() ), 0 ); if ( actions & RemoveFromCategory ) - remove_from_cat_item = kpop->insertItem( il->loadIcon( "editshred", TDEIcon::NoGroup, 16 ), i18n( "&Remove From Category" ), this, SLOT( removeFromCategory() ), CTRL + Key_R ); + remove_from_cat_item = kpop->insertItem( il->loadIcon( "editshred", TDEIcon::NoGroup, 16 ), i18n( "&Remove From Category" ), this, TQ_SLOT( removeFromCategory() ), CTRL + Key_R ); if ( actions & Remove ) - kpop->insertItem( il->loadIcon( "editshred", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove + kpop->insertItem( il->loadIcon( "editshred", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, TQ_SLOT( remove () ), Key_Delete ); if ( actions & AddToShoppingList ) - kpop->insertItem( il->loadIcon( "trolley", TDEIcon::NoGroup, 16 ), i18n( "&Add to Shopping List" ), this, SLOT( addToShoppingList() ), CTRL + Key_A ); + kpop->insertItem( il->loadIcon( "trolley", TDEIcon::NoGroup, 16 ), i18n( "&Add to Shopping List" ), this, TQ_SLOT( addToShoppingList() ), CTRL + Key_A ); if ( actions & CopyToClipboard ) - kpop->insertItem( il->loadIcon( "edit-copy", TDEIcon::NoGroup, 16 ), i18n( "&Copy to Clipboard" ), this, SLOT( recipesToClipboard() ), CTRL + Key_C ); + kpop->insertItem( il->loadIcon( "edit-copy", TDEIcon::NoGroup, 16 ), i18n( "&Copy to Clipboard" ), this, TQ_SLOT( recipesToClipboard() ), CTRL + Key_C ); if ( actions & Categorize ) - categorize_item = kpop->insertItem( il->loadIcon( "categories", TDEIcon::NoGroup, 16 ), i18n( "Ca&tegorize..." ), this, SLOT(categorize()), CTRL + Key_T ); + categorize_item = kpop->insertItem( il->loadIcon( "categories", TDEIcon::NoGroup, 16 ), i18n( "Ca&tegorize..." ), this, TQ_SLOT(categorize()), CTRL + Key_T ); kpop->polish(); catPop = new TDEPopupMenu( parentListView ); if ( actions & ExpandAll ) - catPop->insertItem( i18n( "&Expand All" ), this, SLOT( expandAll() ), CTRL + Key_Plus ); + catPop->insertItem( i18n( "&Expand All" ), this, TQ_SLOT( expandAll() ), CTRL + Key_Plus ); if ( actions & CollapseAll ) - catPop->insertItem( i18n( "&Collapse All" ), this, SLOT( collapseAll() ), CTRL + Key_Minus ); + catPop->insertItem( i18n( "&Collapse All" ), this, TQ_SLOT( collapseAll() ), CTRL + Key_Minus ); if ( actions & Export ) - catPop->insertItem( il->loadIcon( "fileexport", TDEIcon::NoGroup, 16 ), i18n( "E&xport" ), this, SLOT( recipeExport() ), 0 ); + catPop->insertItem( il->loadIcon( "fileexport", TDEIcon::NoGroup, 16 ), i18n( "E&xport" ), this, TQ_SLOT( recipeExport() ), 0 ); catPop->polish(); delete il; - connect( parentListView, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( parentListView, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), SLOT( open() ) ); + connect( parentListView, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), TQ_SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( parentListView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), TQ_SLOT( open() ) ); } void RecipeActionsHandler::exec( ItemType type, const TQPoint &p ) diff --git a/krecipes/src/setupwizard.cpp b/krecipes/src/setupwizard.cpp index ec179d5..1cc2f06 100644 --- a/krecipes/src/setupwizard.cpp +++ b/krecipes/src/setupwizard.cpp @@ -74,8 +74,8 @@ SetupWizard::SetupWizard( TQWidget *parent, const char *name, bool modal, WFlags showPages( SQLite ); #endif - connect( finishButton(), SIGNAL( clicked() ), this, SLOT( save() ) ); - connect( dbTypeSetupPage, SIGNAL( showPages( DBType ) ), this, SLOT( showPages( DBType ) ) ); + connect( finishButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( save() ) ); + connect( dbTypeSetupPage, TQ_SIGNAL( showPages( DBType ) ), this, TQ_SLOT( showPages( DBType ) ) ); } @@ -210,9 +210,9 @@ PermissionsSetupPage::PermissionsSetupPage( TQWidget *parent ) : TQWidget( paren // Connect Signals & slots - connect( rootCheckBox, SIGNAL( toggled( bool ) ), rootInfoGBox, SLOT( setEnabled( bool ) ) ); - connect( rootCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( rootCheckBoxChanged( bool ) ) ); - connect( noSetupCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( noSetupCheckBoxChanged( bool ) ) ); + connect( rootCheckBox, TQ_SIGNAL( toggled( bool ) ), rootInfoGBox, TQ_SLOT( setEnabled( bool ) ) ); + connect( rootCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( rootCheckBoxChanged( bool ) ) ); + connect( noSetupCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( noSetupCheckBoxChanged( bool ) ) ); } void PermissionsSetupPage::rootCheckBoxChanged( bool on ) @@ -318,9 +318,9 @@ PSqlPermissionsSetupPage::PSqlPermissionsSetupPage( TQWidget *parent ) : TQWidge // Connect Signals & slots - connect( rootCheckBox, SIGNAL( toggled( bool ) ), rootInfoGBox, SLOT( setEnabled( bool ) ) ); - connect( rootCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( rootCheckBoxChanged( bool ) ) ); - connect( noSetupCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( noSetupCheckBoxChanged( bool ) ) ); + connect( rootCheckBox, TQ_SIGNAL( toggled( bool ) ), rootInfoGBox, TQ_SLOT( setEnabled( bool ) ) ); + connect( rootCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( rootCheckBoxChanged( bool ) ) ); + connect( noSetupCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( noSetupCheckBoxChanged( bool ) ) ); } void PSqlPermissionsSetupPage::rootCheckBoxChanged( bool on ) @@ -478,7 +478,7 @@ ServerSetupPage::ServerSetupPage( TQWidget *parent ) : TQWidget( parent ) //layout->addItem( spacerRight, 7, 4 ); // Signals & Slots - connect( remoteServerCheckBox, SIGNAL( toggled( bool ) ), serverSettingsGBox, SLOT( setEnabled( bool ) ) ); + connect( remoteServerCheckBox, TQ_SIGNAL( toggled( bool ) ), serverSettingsGBox, TQ_SLOT( setEnabled( bool ) ) ); } @@ -569,7 +569,7 @@ SQLiteSetupPage::SQLiteSetupPage( TQWidget *parent ) : TQWidget( parent ) TQSpacerItem* bottomSpacer = new TQSpacerItem( 10, 10, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ); layout->addItem( bottomSpacer, 4, 1 ); - connect( file_select, SIGNAL( clicked() ), SLOT( selectFile() ) ); + connect( file_select, TQ_SIGNAL( clicked() ), TQ_SLOT( selectFile() ) ); } TQString SQLiteSetupPage::dbFile( void ) const @@ -810,7 +810,7 @@ DBTypeSetupPage::DBTypeSetupPage( TQWidget *parent ) : TQWidget( parent ) TQSpacerItem *spacer_bottom = new TQSpacerItem( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding ); layout->addItem( spacer_bottom, 4, 3 ); - connect( bg, SIGNAL( clicked( int ) ), this, SLOT( setPages( int ) ) ); + connect( bg, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( setPages( int ) ) ); } diff --git a/krecipes/src/widgets/amountunitinput.cpp b/krecipes/src/widgets/amountunitinput.cpp index b66b66c..2461240 100644 --- a/krecipes/src/widgets/amountunitinput.cpp +++ b/krecipes/src/widgets/amountunitinput.cpp @@ -25,9 +25,9 @@ AmountUnitInput::AmountUnitInput( TQWidget *parent, RecipeDB *database, Unit::Ty unitBox = new UnitComboBox(this,database,type); unitBox->reload(); - connect( amountInput, SIGNAL(valueChanged(const MixedNumber &)), SLOT(emitValueChanged()) ); - connect( unitBox, SIGNAL(activated(int)), SLOT(emitValueChanged()) ); - connect( amountInput, SIGNAL(returnPressed()), SIGNAL(doneEditing()) ); + connect( amountInput, TQ_SIGNAL(valueChanged(const MixedNumber &)), TQ_SLOT(emitValueChanged()) ); + connect( unitBox, TQ_SIGNAL(activated(int)), TQ_SLOT(emitValueChanged()) ); + connect( amountInput, TQ_SIGNAL(returnPressed()), TQ_SIGNAL(doneEditing()) ); } void AmountUnitInput::emitValueChanged() @@ -42,7 +42,7 @@ void AmountUnitInput::setAmount( const MixedNumber &amount ) amountInput->clear(); else amountInput->setValue( amount, 0 ); - connect( amountInput, SIGNAL(valueChanged(const MixedNumber &)), SLOT(emitValueChanged()) ); + connect( amountInput, TQ_SIGNAL(valueChanged(const MixedNumber &)), TQ_SLOT(emitValueChanged()) ); } void AmountUnitInput::setUnit( const Unit &unit ) diff --git a/krecipes/src/widgets/authorlistview.cpp b/krecipes/src/widgets/authorlistview.cpp index f92f90c..7ef696d 100644 --- a/krecipes/src/widgets/authorlistview.cpp +++ b/krecipes/src/widgets/authorlistview.cpp @@ -29,8 +29,8 @@ AuthorListView::AuthorListView( TQWidget *parent, RecipeDB *db ) : DBListViewBas void AuthorListView::init() { - connect( database, SIGNAL( authorCreated( const Element & ) ), SLOT( checkCreateAuthor( const Element & ) ) ); - connect( database, SIGNAL( authorRemoved( int ) ), SLOT( removeAuthor( int ) ) ); + connect( database, TQ_SIGNAL( authorCreated( const Element & ) ), TQ_SLOT( checkCreateAuthor( const Element & ) ) ); + connect( database, TQ_SIGNAL( authorRemoved( int ) ), TQ_SLOT( removeAuthor( int ) ) ); } void AuthorListView::load( int limit, int offset ) @@ -67,17 +67,17 @@ StdAuthorListView::StdAuthorListView( TQWidget *parent, RecipeDB *db, bool edita TDEIconLoader *il = new TDEIconLoader; kpop = new TDEPopupMenu( this ); - kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_N ); - kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove + kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, TQ_SLOT( createNew() ), CTRL + Key_N ); + kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, TQ_SLOT( remove () ), Key_Delete ); - kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R ); + kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, TQ_SLOT( rename() ), CTRL + Key_R ); kpop->polish(); delete il; - connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem* ) ), this, SLOT( modAuthor( TQListViewItem* ) ) ); - connect( this, SIGNAL( itemRenamed( TQListViewItem* ) ), this, SLOT( saveAuthor( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), TQ_SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), this, TQ_SLOT( modAuthor( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem* ) ), this, TQ_SLOT( saveAuthor( TQListViewItem* ) ) ); } } diff --git a/krecipes/src/widgets/categorycombobox.cpp b/krecipes/src/widgets/categorycombobox.cpp index ed9437d..2b97f56 100644 --- a/krecipes/src/widgets/categorycombobox.cpp +++ b/krecipes/src/widgets/categorycombobox.cpp @@ -27,10 +27,10 @@ CategoryComboBox::CategoryComboBox( TQWidget *parent, RecipeDB *db ) : KComboBox database( db ), m_offset(0) { - connect( database, SIGNAL( categoryCreated( const Element &, int ) ), SLOT( createCategory( const Element &, int ) ) ); - connect( database, SIGNAL( categoryRemoved( int ) ), SLOT( removeCategory( int ) ) ); - connect( database, SIGNAL( categoryModified( const Element & ) ), SLOT( modifyCategory( const Element & ) ) ); - connect( database, SIGNAL( categoriesMerged( int, int ) ), SLOT( mergeCategories( int, int ) ) ); + connect( database, TQ_SIGNAL( categoryCreated( const Element &, int ) ), TQ_SLOT( createCategory( const Element &, int ) ) ); + connect( database, TQ_SIGNAL( categoryRemoved( int ) ), TQ_SLOT( removeCategory( int ) ) ); + connect( database, TQ_SIGNAL( categoryModified( const Element & ) ), TQ_SLOT( modifyCategory( const Element & ) ) ); + connect( database, TQ_SIGNAL( categoriesMerged( int, int ) ), TQ_SLOT( mergeCategories( int, int ) ) ); // Insert default "All Categories" (row 0, which will be translated to -1 as category in the filtering process) // the rest of the items are loaded when needed in order to significantly speed up startup diff --git a/krecipes/src/widgets/categorylistview.cpp b/krecipes/src/widgets/categorylistview.cpp index 2807689..2ebe6e0 100644 --- a/krecipes/src/widgets/categorylistview.cpp +++ b/krecipes/src/widgets/categorylistview.cpp @@ -139,11 +139,11 @@ void CategoryListItem::setText( int column, const TQString &text ) CategoryListView::CategoryListView( TQWidget *parent, RecipeDB *db ) : DBListViewBase( parent, db, db->categoryTopLevelCount() ), m_item_to_delete(0) { - //connect( this, SIGNAL( spacePressed(TQListViewItem*) ), SLOT( open(TQListViewItem*) ) ); - //connect( this, SIGNAL( returnPressed(TQListViewItem*) ), SLOT( open(TQListViewItem*) ) ); - //connect( this, SIGNAL( executed(TQListViewItem*) ), SLOT( open(TQListViewItem*) ) ); + //connect( this, TQ_SIGNAL( spacePressed(TQListViewItem*) ), TQ_SLOT( open(TQListViewItem*) ) ); + //connect( this, TQ_SIGNAL( returnPressed(TQListViewItem*) ), TQ_SLOT( open(TQListViewItem*) ) ); + //connect( this, TQ_SIGNAL( executed(TQListViewItem*) ), TQ_SLOT( open(TQListViewItem*) ) ); - connect( this, SIGNAL( expanded(TQListViewItem*) ), SLOT( open(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( expanded(TQListViewItem*) ), TQ_SLOT( open(TQListViewItem*) ) ); setRootIsDecorated( true ); setAllColumnsShowFocus( true ); @@ -152,11 +152,11 @@ CategoryListView::CategoryListView( TQWidget *parent, RecipeDB *db ) : DBListVie void CategoryListView::init() { - connect( database, SIGNAL( categoryCreated( const Element &, int ) ), SLOT( checkCreateCategory( const Element &, int ) ) ); - connect( database, SIGNAL( categoryRemoved( int ) ), SLOT( removeCategory( int ) ) ); - connect( database, SIGNAL( categoryModified( const Element & ) ), SLOT( modifyCategory( const Element & ) ) ); - connect( database, SIGNAL( categoryModified( int, int ) ), SLOT( modifyCategory( int, int ) ) ); - connect( database, SIGNAL( categoriesMerged( int, int ) ), SLOT( mergeCategories( int, int ) ) ); + connect( database, TQ_SIGNAL( categoryCreated( const Element &, int ) ), TQ_SLOT( checkCreateCategory( const Element &, int ) ) ); + connect( database, TQ_SIGNAL( categoryRemoved( int ) ), TQ_SLOT( removeCategory( int ) ) ); + connect( database, TQ_SIGNAL( categoryModified( const Element & ) ), TQ_SLOT( modifyCategory( const Element & ) ) ); + connect( database, TQ_SIGNAL( categoryModified( int, int ) ), TQ_SLOT( modifyCategory( int, int ) ) ); + connect( database, TQ_SIGNAL( categoriesMerged( int, int ) ), TQ_SLOT( mergeCategories( int, int ) ) ); } // (Re)loads the data from the database @@ -314,23 +314,23 @@ StdCategoryListView::StdCategoryListView( TQWidget *parent, RecipeDB *db, bool e TDEIconLoader *il = new TDEIconLoader; kpop = new TDEPopupMenu( this ); - kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C ); - kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove + kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, TQ_SLOT( createNew() ), CTRL + Key_C ); + kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, TQ_SLOT( remove () ), Key_Delete ); - kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R ); + kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, TQ_SLOT( rename() ), CTRL + Key_R ); kpop->insertSeparator(); - kpop->insertItem( il->loadIcon( "edit-cut", TDEIcon::NoGroup, 16 ), i18n( "Cu&t" ), this, SLOT( cut() ), CTRL + Key_X ); - kpop->insertItem( il->loadIcon( "edit-paste", TDEIcon::NoGroup, 16 ), i18n( "&Paste" ), this, SLOT( paste() ), CTRL + Key_V ); - kpop->insertItem( il->loadIcon( "edit-paste", TDEIcon::NoGroup, 16 ), i18n( "Paste as Subcategory" ), this, SLOT( pasteAsSub() ), CTRL + SHIFT + Key_V ); + kpop->insertItem( il->loadIcon( "edit-cut", TDEIcon::NoGroup, 16 ), i18n( "Cu&t" ), this, TQ_SLOT( cut() ), CTRL + Key_X ); + kpop->insertItem( il->loadIcon( "edit-paste", TDEIcon::NoGroup, 16 ), i18n( "&Paste" ), this, TQ_SLOT( paste() ), CTRL + Key_V ); + kpop->insertItem( il->loadIcon( "edit-paste", TDEIcon::NoGroup, 16 ), i18n( "Paste as Subcategory" ), this, TQ_SLOT( pasteAsSub() ), CTRL + SHIFT + Key_V ); kpop->polish(); delete il; - connect( kpop, SIGNAL( aboutToShow() ), SLOT( preparePopup() ) ); - connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), SLOT( modCategory( TQListViewItem* ) ) ); - connect( this, SIGNAL( itemRenamed ( TQListViewItem* ) ), SLOT( saveCategory( TQListViewItem* ) ) ); - connect( this, SIGNAL( moved( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ), SLOT( changeCategoryParent( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ) ); + connect( kpop, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( preparePopup() ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), TQ_SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), TQ_SLOT( modCategory( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( itemRenamed ( TQListViewItem* ) ), TQ_SLOT( saveCategory( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( moved( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ), TQ_SLOT( changeCategoryParent( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ) ); } } @@ -470,9 +470,9 @@ void StdCategoryListView::changeCategoryParent( TQListViewItem *item, TQListView int cat_id = item->text( 1 ).toInt(); - disconnect( SIGNAL( moved( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ) ); + disconnect( TQ_SIGNAL( moved( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ) ); database->modCategory( cat_id, new_parent_id ); - connect( this, SIGNAL( moved( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ), SLOT( changeCategoryParent( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( moved( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ), TQ_SLOT( changeCategoryParent( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ) ); } void StdCategoryListView::removeCategory( int id ) diff --git a/krecipes/src/widgets/conversiontable.cpp b/krecipes/src/widgets/conversiontable.cpp index 5946147..7affdd7 100644 --- a/krecipes/src/widgets/conversiontable.cpp +++ b/krecipes/src/widgets/conversiontable.cpp @@ -203,9 +203,9 @@ void ConversionTable::createNewItem( int r, int c, double amount ) ci->setText( beautify( TDEGlobal::locale() ->formatNumber( amount, 5 ) ) ); setItem( r, c, ci ); // connect signal (forward) to know when it's actually changed - connect( ci, SIGNAL( ratioChanged( int, int, double ) ), this, SIGNAL( ratioChanged( int, int, double ) ) ); - connect( ci, SIGNAL( ratioRemoved( int, int ) ), this, SIGNAL( ratioRemoved( int, int ) ) ); - connect( ci, SIGNAL( signalRepaintCell( int, int ) ), this, SLOT( repaintCell( int, int ) ) ); + connect( ci, TQ_SIGNAL( ratioChanged( int, int, double ) ), this, TQ_SIGNAL( ratioChanged( int, int, double ) ) ); + connect( ci, TQ_SIGNAL( ratioRemoved( int, int ) ), this, TQ_SIGNAL( ratioRemoved( int, int ) ) ); + connect( ci, TQ_SIGNAL( signalRepaintCell( int, int ) ), this, TQ_SLOT( repaintCell( int, int ) ) ); } void ConversionTable::setUnitIDs( const IDList &idList ) diff --git a/krecipes/src/widgets/criteriacombobox.cpp b/krecipes/src/widgets/criteriacombobox.cpp index a5010e6..f04c522 100644 --- a/krecipes/src/widgets/criteriacombobox.cpp +++ b/krecipes/src/widgets/criteriacombobox.cpp @@ -18,7 +18,7 @@ CriteriaComboBox::CriteriaComboBox( bool b, TQWidget *parent, RecipeDB *db ) : KComboBox( b, parent ), database( db ) { - connect( db, SIGNAL(ratingCriteriaCreated(const Element &)), this, SLOT(addCriteria(const Element &)) ); + connect( db, TQ_SIGNAL(ratingCriteriaCreated(const Element &)), this, TQ_SLOT(addCriteria(const Element &)) ); } void CriteriaComboBox::addCriteria( const Element &criteria ) diff --git a/krecipes/src/widgets/dblistviewbase.cpp b/krecipes/src/widgets/dblistviewbase.cpp index c09e56f..4a22330 100644 --- a/krecipes/src/widgets/dblistviewbase.cpp +++ b/krecipes/src/widgets/dblistviewbase.cpp @@ -69,7 +69,7 @@ DBListViewBase::DBListViewBase( TQWidget *parent, RecipeDB *db, int t ) : TDELis curr_limit = config->readNumEntry( "Limit", -1 ); } - connect(this,SIGNAL(executed(TQListViewItem*)),SLOT(slotDoubleClicked(TQListViewItem*))); + connect(this,TQ_SIGNAL(executed(TQListViewItem*)),TQ_SLOT(slotDoubleClicked(TQListViewItem*))); } DBListViewBase::~DBListViewBase() diff --git a/krecipes/src/widgets/fractioninput.cpp b/krecipes/src/widgets/fractioninput.cpp index c6cd186..a643f7e 100644 --- a/krecipes/src/widgets/fractioninput.cpp +++ b/krecipes/src/widgets/fractioninput.cpp @@ -23,8 +23,8 @@ FractionInput::FractionInput( TQWidget *parent, MixedNumber::Format format ) : K { setAlignment( TQt::AlignRight ); - connect( this, SIGNAL(textChanged(const TQString&)), this, SLOT(slotStartValidateTimer()) ); - connect( m_validateTimer, SIGNAL(timeout()), this, SLOT(validate()) ); + connect( this, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotStartValidateTimer()) ); + connect( m_validateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(validate()) ); } FractionInput::~FractionInput() diff --git a/krecipes/src/widgets/headerlistview.cpp b/krecipes/src/widgets/headerlistview.cpp index fe65348..51e9d4c 100644 --- a/krecipes/src/widgets/headerlistview.cpp +++ b/krecipes/src/widgets/headerlistview.cpp @@ -31,8 +31,8 @@ HeaderListView::HeaderListView( TQWidget *parent, RecipeDB *db ) : DBListViewBas void HeaderListView::init() { - connect( database, SIGNAL( ingGroupCreated( const Element & ) ), SLOT( checkCreateHeader( const Element & ) ) ); - connect( database, SIGNAL( ingGroupRemoved( int ) ), SLOT( removeHeader( int ) ) ); + connect( database, TQ_SIGNAL( ingGroupCreated( const Element & ) ), TQ_SLOT( checkCreateHeader( const Element & ) ) ); + connect( database, TQ_SIGNAL( ingGroupRemoved( int ) ), TQ_SLOT( removeHeader( int ) ) ); } void HeaderListView::load( int /*limit*/, int /*offset*/ ) @@ -70,17 +70,17 @@ StdHeaderListView::StdHeaderListView( TQWidget *parent, RecipeDB *db, bool edita TDEIconLoader *il = new TDEIconLoader; kpop = new TDEPopupMenu( this ); - kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C ); - kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove + kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, TQ_SLOT( createNew() ), CTRL + Key_C ); + kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, TQ_SLOT( remove () ), Key_Delete ); - kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R ); + kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, TQ_SLOT( rename() ), CTRL + Key_R ); kpop->polish(); delete il; - connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( modHeader( TQListViewItem*, const TQPoint &, int ) ) ); - connect( this, SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), this, SLOT( saveHeader( TQListViewItem*, const TQString &, int ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), TQ_SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( modHeader( TQListViewItem*, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), this, TQ_SLOT( saveHeader( TQListViewItem*, const TQString &, int ) ) ); } } diff --git a/krecipes/src/widgets/ingredientcombobox.cpp b/krecipes/src/widgets/ingredientcombobox.cpp index a8492e5..f2a7bb5 100644 --- a/krecipes/src/widgets/ingredientcombobox.cpp +++ b/krecipes/src/widgets/ingredientcombobox.cpp @@ -24,7 +24,7 @@ IngredientComboBox::IngredientComboBox( bool b, TQWidget *parent, RecipeDB *db, const TQString &specialItem ) : KComboBox( b, parent ), database( db ), loading_at(0), load_timer(new TQTimer(this)), m_specialItem(specialItem) { - connect( load_timer, SIGNAL(timeout()), SLOT(loadMore()) ); + connect( load_timer, TQ_SIGNAL(timeout()), TQ_SLOT(loadMore()) ); completionObject()->setIgnoreCase(true); } @@ -56,8 +56,8 @@ void IngredientComboBox::reload() setEditText( remember_text ); database->disconnect( this ); - connect( database, SIGNAL( ingredientCreated( const Element & ) ), SLOT( createIngredient( const Element & ) ) ); - connect( database, SIGNAL( ingredientRemoved( int ) ), SLOT( removeIngredient( int ) ) ); + connect( database, TQ_SIGNAL( ingredientCreated( const Element & ) ), TQ_SLOT( createIngredient( const Element & ) ) ); + connect( database, TQ_SIGNAL( ingredientRemoved( int ) ), TQ_SLOT( removeIngredient( int ) ) ); } void IngredientComboBox::loadMore() @@ -101,8 +101,8 @@ void IngredientComboBox::endLoad() load_timer->stop(); //now we're ready to receive ingredient created/removed events from the database - connect( database, SIGNAL( ingredientCreated( const Element & ) ), SLOT( createIngredient( const Element & ) ) ); - connect( database, SIGNAL( ingredientRemoved( int ) ), SLOT( removeIngredient( int ) ) ); + connect( database, TQ_SIGNAL( ingredientCreated( const Element & ) ), TQ_SLOT( createIngredient( const Element & ) ) ); + connect( database, TQ_SIGNAL( ingredientRemoved( int ) ), TQ_SLOT( removeIngredient( int ) ) ); } int IngredientComboBox::id( int row ) diff --git a/krecipes/src/widgets/ingredientinputwidget.cpp b/krecipes/src/widgets/ingredientinputwidget.cpp index 9a21f6c..df5880e 100644 --- a/krecipes/src/widgets/ingredientinputwidget.cpp +++ b/krecipes/src/widgets/ingredientinputwidget.cpp @@ -52,7 +52,7 @@ IngredientInput::IngredientInput( RecipeDB *db, TQWidget *parent, bool allowHead typeButtonGrp->insert( headerRadioButton, 1 ); typeButtonGrp->setButton( 0 ); - connect( typeButtonGrp, SIGNAL( clicked( int ) ), SLOT( typeButtonClicked( int ) ) ); + connect( typeButtonGrp, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( typeButtonClicked( int ) ) ); } else { (void) new TQLabel( i18n( "Ingredient:" ), typeHBox ); @@ -98,17 +98,17 @@ IngredientInput::IngredientInput( RecipeDB *db, TQWidget *parent, bool allowHead setStretchFactor( unitVBox, 2 ); setStretchFactor( prepMethodVBox, 3 ); - connect( ingredientBox, SIGNAL( activated( int ) ), this, SLOT( loadUnitListCombo() ) ); - connect( ingredientBox->lineEdit(), SIGNAL( lostFocus() ), this, SLOT( slotIngredientBoxLostFocus() ) ); - connect( unitBox->lineEdit(), SIGNAL( lostFocus() ), this, SLOT( slotUnitBoxLostFocus() ) ); - connect( prepMethodBox->lineEdit(), SIGNAL( lostFocus() ), this, SLOT( slotPrepMethodBoxLostFocus() ) ); - connect( orButton, SIGNAL( toggled(bool) ), this, SLOT( orToggled(bool) ) ); + connect( ingredientBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( loadUnitListCombo() ) ); + connect( ingredientBox->lineEdit(), TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotIngredientBoxLostFocus() ) ); + connect( unitBox->lineEdit(), TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUnitBoxLostFocus() ) ); + connect( prepMethodBox->lineEdit(), TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotPrepMethodBoxLostFocus() ) ); + connect( orButton, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( orToggled(bool) ) ); - connect( unitBox->lineEdit(), SIGNAL( returnPressed() ), this, SLOT( signalIngredient() ) ); - connect( ingredientBox->lineEdit(), SIGNAL( returnPressed() ), this, SLOT( signalIngredient() ) ); - connect( headerBox->lineEdit(), SIGNAL( returnPressed() ), this, SLOT( signalIngredient() ) ); - connect( prepMethodBox->lineEdit(), SIGNAL( returnPressed() ), this, SLOT( signalIngredient() ) ); - connect( amountEdit, SIGNAL( returnPressed( const TQString & ) ), this, SLOT( signalIngredient() ) ); + connect( unitBox->lineEdit(), TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( signalIngredient() ) ); + connect( ingredientBox->lineEdit(), TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( signalIngredient() ) ); + connect( headerBox->lineEdit(), TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( signalIngredient() ) ); + connect( prepMethodBox->lineEdit(), TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( signalIngredient() ) ); + connect( amountEdit, TQ_SIGNAL( returnPressed( const TQString & ) ), this, TQ_SLOT( signalIngredient() ) ); unitComboList = new UnitList; @@ -358,8 +358,8 @@ IngredientInputWidget::IngredientInputWidget( RecipeDB *db, TQWidget *parent ) : m_ingInputs.append(new IngredientInput(database,this)); // Connect signals & Slots - connect( m_ingInputs[0], SIGNAL(addIngredient()), this, SLOT(addIngredient()) ); - connect( m_ingInputs[0], SIGNAL(orToggled(bool,IngredientInput*)), this, SLOT(updateInputs(bool,IngredientInput*)) ); + connect( m_ingInputs[0], TQ_SIGNAL(addIngredient()), this, TQ_SLOT(addIngredient()) ); + connect( m_ingInputs[0], TQ_SIGNAL(orToggled(bool,IngredientInput*)), this, TQ_SLOT(updateInputs(bool,IngredientInput*)) ); reloadCombos(); } @@ -387,8 +387,8 @@ void IngredientInputWidget::updateInputs(bool on, IngredientInput* input) TQWidget::setTabOrder( prev_input, new_input ); new_input->updateTabOrder(); - connect( new_input, SIGNAL(addIngredient()), this, SLOT(addIngredient()) ); - connect( new_input, SIGNAL(orToggled(bool,IngredientInput*)), this, SLOT(updateInputs(bool,IngredientInput*)) ); + connect( new_input, TQ_SIGNAL(addIngredient()), this, TQ_SLOT(addIngredient()) ); + connect( new_input, TQ_SIGNAL(orToggled(bool,IngredientInput*)), this, TQ_SLOT(updateInputs(bool,IngredientInput*)) ); new_input->show(); m_ingInputs.insert(curr,new_input); diff --git a/krecipes/src/widgets/ingredientlistview.cpp b/krecipes/src/widgets/ingredientlistview.cpp index 4cc52d6..1343530 100644 --- a/krecipes/src/widgets/ingredientlistview.cpp +++ b/krecipes/src/widgets/ingredientlistview.cpp @@ -81,8 +81,8 @@ IngredientListView::IngredientListView( TQWidget *parent, RecipeDB *db ) : DBLis void IngredientListView::init() { - connect( database, SIGNAL( ingredientCreated( const Element & ) ), SLOT( checkCreateIngredient( const Element & ) ) ); - connect( database, SIGNAL( ingredientRemoved( int ) ), SLOT( removeIngredient( int ) ) ); + connect( database, TQ_SIGNAL( ingredientCreated( const Element & ) ), TQ_SLOT( checkCreateIngredient( const Element & ) ) ); + connect( database, TQ_SIGNAL( ingredientRemoved( int ) ), TQ_SLOT( removeIngredient( int ) ) ); } void IngredientListView::load( int limit, int offset ) @@ -119,17 +119,17 @@ StdIngredientListView::StdIngredientListView( TQWidget *parent, RecipeDB *db, bo TDEIconLoader *il = new TDEIconLoader; kpop = new TDEPopupMenu( this ); - kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C ); - kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove + kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, TQ_SLOT( createNew() ), CTRL + Key_C ); + kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, TQ_SLOT( remove () ), Key_Delete ); - kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R ); + kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, TQ_SLOT( rename() ), CTRL + Key_R ); kpop->polish(); delete il; - connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem* ) ), this, SLOT( modIngredient( TQListViewItem* ) ) ); - connect( this, SIGNAL( itemRenamed( TQListViewItem* ) ), this, SLOT( saveIngredient( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), TQ_SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), this, TQ_SLOT( modIngredient( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem* ) ), this, TQ_SLOT( saveIngredient( TQListViewItem* ) ) ); } } diff --git a/krecipes/src/widgets/kdateedit.cpp b/krecipes/src/widgets/kdateedit.cpp index 489cc3c..dd2b3b1 100644 --- a/krecipes/src/widgets/kdateedit.cpp +++ b/krecipes/src/widgets/kdateedit.cpp @@ -98,17 +98,17 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) changeItem( today, 0 ); setMinimumSize( sizeHint() ); - connect( lineEdit(), SIGNAL( returnPressed() ), - this, SLOT( lineEnterPressed() ) ); - connect( this, SIGNAL( textChanged( const TQString& ) ), - SLOT( slotTextChanged( const TQString& ) ) ); + connect( lineEdit(), TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( lineEnterPressed() ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); mPopup = new KDatePickerPopup( KDatePickerPopup::DatePicker | KDatePickerPopup::Words ); mPopup->hide(); mPopup->installEventFilter( this ); - connect( mPopup, SIGNAL( dateChanged( TQDate ) ), - SLOT( dateSelected( TQDate ) ) ); + connect( mPopup, TQ_SIGNAL( dateChanged( TQDate ) ), + TQ_SLOT( dateSelected( TQDate ) ) ); // handle keyword entry setupKeywords(); diff --git a/krecipes/src/widgets/kdatepickerpopup.cpp b/krecipes/src/widgets/kdatepickerpopup.cpp index cec3425..7dfad4a 100644 --- a/krecipes/src/widgets/kdatepickerpopup.cpp +++ b/krecipes/src/widgets/kdatepickerpopup.cpp @@ -35,10 +35,10 @@ KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *par mDatePicker = new KDatePicker( this ); mDatePicker->setCloseButton( false ); - connect( mDatePicker, SIGNAL( dateEntered( TQDate ) ), - SLOT( slotDateChanged( TQDate ) ) ); - connect( mDatePicker, SIGNAL( dateSelected( TQDate ) ), - SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateEntered( TQDate ) ), + TQ_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateSelected( TQDate ) ), + TQ_SLOT( slotDateChanged( TQDate ) ) ); mDatePicker->setDate( date ); @@ -58,17 +58,17 @@ void KDatePickerPopup::buildMenu() } if ( mItems & Words ) { - insertItem( i18n("&Today"), this, SLOT( slotToday() ) ); - insertItem( i18n("&Yesterday"), this, SLOT( slotYesterday() ) ); - insertItem( i18n("Last &Week"), this, SLOT( slotLastWeek() ) ); - insertItem( i18n("Last M&onth"), this, SLOT( slotLastMonth() ) ); + insertItem( i18n("&Today"), this, TQ_SLOT( slotToday() ) ); + insertItem( i18n("&Yesterday"), this, TQ_SLOT( slotYesterday() ) ); + insertItem( i18n("Last &Week"), this, TQ_SLOT( slotLastWeek() ) ); + insertItem( i18n("Last M&onth"), this, TQ_SLOT( slotLastMonth() ) ); if ( mItems & NoDate ) insertSeparator(); } if ( mItems & NoDate ) - insertItem( i18n("No Date"), this, SLOT( slotNoDate() ) ); + insertItem( i18n("No Date"), this, TQ_SLOT( slotNoDate() ) ); } KDatePicker *KDatePickerPopup::datePicker() const diff --git a/krecipes/src/widgets/krelistview.cpp b/krecipes/src/widgets/krelistview.cpp index 07cc9f7..3c06216 100644 --- a/krecipes/src/widgets/krelistview.cpp +++ b/krecipes/src/widgets/krelistview.cpp @@ -60,8 +60,8 @@ KreListView::KreListView( TQWidget *parent, const TQString &title, bool filter, embeddedWidget->reparent( header, TQPoint( 0, 0 ) ); //Connect Signals & Slots if ( filter ) { - connect( filterEdit, SIGNAL( textChanged( const TQString& ) ), SIGNAL( textChanged(const TQString&) ) ); - connect( this, SIGNAL( textChanged( const TQString& ) ), SLOT( filter( const TQString& ) ) ); + connect( filterEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( textChanged(const TQString&) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( filter( const TQString& ) ) ); } } @@ -101,15 +101,15 @@ void KreListView::refilter() void KreListView::setCustomFilter( TQObject *receiver, const char *slot ) { - connect( this, SIGNAL( textChanged( const TQString& ) ), receiver, slot ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), receiver, slot ); } void KreListView::setListView( DBListViewBase *list_view ) { delete list; - connect( list_view, SIGNAL( nextGroupLoaded() ), SLOT( refilter() ) ); - connect( list_view, SIGNAL( prevGroupLoaded() ), SLOT( refilter() ) ); + connect( list_view, TQ_SIGNAL( nextGroupLoaded() ), TQ_SLOT( refilter() ) ); + connect( list_view, TQ_SIGNAL( prevGroupLoaded() ), TQ_SLOT( refilter() ) ); list = list_view; } diff --git a/krecipes/src/widgets/kremenu.cpp b/krecipes/src/widgets/kremenu.cpp index 51ae2fb..85581b9 100644 --- a/krecipes/src/widgets/kremenu.cpp +++ b/krecipes/src/widgets/kremenu.cpp @@ -78,7 +78,7 @@ void KreMenu::childEvent ( TQChildEvent *e ) else button->show(); - connect ( button, SIGNAL( clicked( KreMenuButton* ) ), this, SLOT( collectClicks( KreMenuButton* ) ) ); + connect ( button, TQ_SIGNAL( clicked( KreMenuButton* ) ), this, TQ_SLOT( collectClicks( KreMenuButton* ) ) ); } } else if ( e->type() == TQChildEvent::ChildRemoved ) { @@ -139,8 +139,8 @@ MenuId KreMenu::createSubMenu( const TQString &title, const TQString &icon ) newSubMenuButton->setTitle( i18n( "Up" ) ); newSubMenuButton->setIconSet( il.loadIconSet( "1uparrow", TDEIcon::Panel ) ); - connect( newMenuButton, SIGNAL( clicked( MenuId ) ), this, SLOT( showMenu( MenuId ) ) ); - connect( newSubMenuButton, SIGNAL( clicked( MenuId ) ), this, SLOT( showMenu( MenuId ) ) ); + connect( newMenuButton, TQ_SIGNAL( clicked( MenuId ) ), this, TQ_SLOT( showMenu( MenuId ) ) ); + connect( newSubMenuButton, TQ_SIGNAL( clicked( MenuId ) ), this, TQ_SLOT( showMenu( MenuId ) ) ); return id; @@ -344,8 +344,8 @@ KreMenuButton::KreMenuButton( KreMenu *parent, KrePanel _panel, MenuId id, const subMenuId = 0; // By default it's not a submenu button resize( parent->size().width(), 55 ); - connect ( parent, SIGNAL( resized( int, int ) ), this, SLOT( rescale() ) ); - connect( this, SIGNAL( clicked() ), this, SLOT( forwardClicks() ) ); + connect ( parent, TQ_SIGNAL( resized( int, int ) ), this, TQ_SLOT( rescale() ) ); + connect( this, TQ_SIGNAL( clicked() ), this, TQ_SLOT( forwardClicks() ) ); setCursor( TQCursor( KCursor::handCursor() ) ); } diff --git a/krecipes/src/widgets/kreruler.cpp b/krecipes/src/widgets/kreruler.cpp index 8454699..01b005d 100644 --- a/krecipes/src/widgets/kreruler.cpp +++ b/krecipes/src/widgets/kreruler.cpp @@ -136,7 +136,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Orientation _orientation setupMenu(); // For compatibility, emitting doubleClicked shall emit openPageLayoutDia - connect( this, SIGNAL( doubleClicked() ), this, SIGNAL( openPageLayoutDia() ) ); + connect( this, TQ_SIGNAL( doubleClicked() ), this, TQ_SIGNAL( openPageLayoutDia() ) ); } /*================================================================*/ @@ -864,13 +864,13 @@ void KoRuler::setupMenu() if ( m_unit == unit ) d->rb_menu->setItemChecked( i, true ); } - connect( d->rb_menu, SIGNAL( activated( int ) ), SLOT( slotMenuActivated( int ) ) ); + connect( d->rb_menu, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMenuActivated( int ) ) ); d->rb_menu->insertSeparator(); - d->mPageLayout=d->rb_menu->insertItem(i18n("Page Layout..."), this, SLOT(pageLayoutDia())); + d->mPageLayout=d->rb_menu->insertItem(i18n("Page Layout..."), this, TQ_SLOT(pageLayoutDia())); #if 0 d->rb_menu->insertSeparator(); - d->mRemoveTab=d->rb_menu->insertItem(i18n("Remove Tabulator"), this, SLOT(rbRemoveTab())); + d->mRemoveTab=d->rb_menu->insertItem(i18n("Remove Tabulator"), this, TQ_SLOT(rbRemoveTab())); d->rb_menu->setItemEnabled( d->mRemoveTab, false ); #endif } diff --git a/krecipes/src/widgets/kretextedit.cpp b/krecipes/src/widgets/kretextedit.cpp index 61eebea..cf5e5ca 100644 --- a/krecipes/src/widgets/kretextedit.cpp +++ b/krecipes/src/widgets/kretextedit.cpp @@ -22,7 +22,7 @@ KreTextEdit::KreTextEdit( TQWidget *parent ) : KTextEdit( parent ), TDECompletio completing = false; - connect( this, SIGNAL( clicked( int, int ) ), SLOT( haltCompletion() ) ); + connect( this, TQ_SIGNAL( clicked( int, int ) ), TQ_SLOT( haltCompletion() ) ); } void KreTextEdit::haltCompletion() diff --git a/krecipes/src/widgets/kwidgetlistbox.cpp b/krecipes/src/widgets/kwidgetlistbox.cpp index 8037886..a05ddcb 100644 --- a/krecipes/src/widgets/kwidgetlistbox.cpp +++ b/krecipes/src/widgets/kwidgetlistbox.cpp @@ -36,8 +36,8 @@ KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name) verticalHeader()->hide(); setSelectionMode(TQTable::NoSelection); setFocusStyle(TQTable::FollowStyle); - connect(this, SIGNAL(currentChanged(int, int)), - this, SLOT(selectionChanged(int, int))); + connect(this, TQ_SIGNAL(currentChanged(int, int)), + this, TQ_SLOT(selectionChanged(int, int))); setHScrollBarMode(TQScrollView::AlwaysOff); setVScrollBarMode(TQScrollView::Auto); } diff --git a/krecipes/src/widgets/prepmethodcombobox.cpp b/krecipes/src/widgets/prepmethodcombobox.cpp index 0063d32..1cedbfc 100644 --- a/krecipes/src/widgets/prepmethodcombobox.cpp +++ b/krecipes/src/widgets/prepmethodcombobox.cpp @@ -87,8 +87,8 @@ void PrepMethodComboBox::reload() lineEdit()->setText( remember_text ); database->disconnect( this ); - connect( database, SIGNAL( prepMethodCreated( const Element & ) ), SLOT( createPrepMethod( const Element & ) ) ); - connect( database, SIGNAL( prepMethodRemoved( int ) ), SLOT( removePrepMethod( int ) ) ); + connect( database, TQ_SIGNAL( prepMethodCreated( const Element & ) ), TQ_SLOT( createPrepMethod( const Element & ) ) ); + connect( database, TQ_SIGNAL( prepMethodRemoved( int ) ), TQ_SLOT( removePrepMethod( int ) ) ); } int PrepMethodComboBox::id( int row ) diff --git a/krecipes/src/widgets/prepmethodlistview.cpp b/krecipes/src/widgets/prepmethodlistview.cpp index 341fc65..1f1939b 100644 --- a/krecipes/src/widgets/prepmethodlistview.cpp +++ b/krecipes/src/widgets/prepmethodlistview.cpp @@ -29,8 +29,8 @@ PrepMethodListView::PrepMethodListView( TQWidget *parent, RecipeDB *db ) : DBLis void PrepMethodListView::init() { - connect( database, SIGNAL( prepMethodCreated( const Element & ) ), SLOT( checkCreatePrepMethod( const Element & ) ) ); - connect( database, SIGNAL( prepMethodRemoved( int ) ), SLOT( removePrepMethod( int ) ) ); + connect( database, TQ_SIGNAL( prepMethodCreated( const Element & ) ), TQ_SLOT( checkCreatePrepMethod( const Element & ) ) ); + connect( database, TQ_SIGNAL( prepMethodRemoved( int ) ), TQ_SLOT( removePrepMethod( int ) ) ); } void PrepMethodListView::load( int limit, int offset ) @@ -67,17 +67,17 @@ StdPrepMethodListView::StdPrepMethodListView( TQWidget *parent, RecipeDB *db, bo TDEIconLoader *il = new TDEIconLoader; kpop = new TDEPopupMenu( this ); - kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C ); - kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove + kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, TQ_SLOT( createNew() ), CTRL + Key_C ); + kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, TQ_SLOT( remove () ), Key_Delete ); - kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R ); + kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, TQ_SLOT( rename() ), CTRL + Key_R ); kpop->polish(); delete il; - connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem* ) ), this, SLOT( modPrepMethod( TQListViewItem* ) ) ); - connect( this, SIGNAL( itemRenamed( TQListViewItem* ) ), this, SLOT( savePrepMethod( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), TQ_SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), this, TQ_SLOT( modPrepMethod( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem* ) ), this, TQ_SLOT( savePrepMethod( TQListViewItem* ) ) ); } } diff --git a/krecipes/src/widgets/propertylistview.cpp b/krecipes/src/widgets/propertylistview.cpp index f86bed6..29a3321 100644 --- a/krecipes/src/widgets/propertylistview.cpp +++ b/krecipes/src/widgets/propertylistview.cpp @@ -89,8 +89,8 @@ PropertyListView::PropertyListView( TQWidget *parent, RecipeDB *db ) : TDEListVi setAllColumnsShowFocus( true ); setDefaultRenameAction( TQListView::Reject ); - connect( db, SIGNAL( propertyCreated( const IngredientProperty & ) ), SLOT( createProperty( const IngredientProperty & ) ) ); - connect( db, SIGNAL( propertyRemoved( int ) ), SLOT( removeProperty( int ) ) ); + connect( db, TQ_SIGNAL( propertyCreated( const IngredientProperty & ) ), TQ_SLOT( createProperty( const IngredientProperty & ) ) ); + connect( db, TQ_SIGNAL( propertyRemoved( int ) ), TQ_SLOT( removeProperty( int ) ) ); } void PropertyListView::reload() @@ -130,17 +130,17 @@ StdPropertyListView::StdPropertyListView( TQWidget *parent, RecipeDB *db, bool e TDEIconLoader *il = new TDEIconLoader; kpop = new TDEPopupMenu( this ); - kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C ); - kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove + kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, TQ_SLOT( createNew() ), CTRL + Key_C ); + kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, TQ_SLOT( remove () ), Key_Delete ); - kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R ); + kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, TQ_SLOT( rename() ), CTRL + Key_R ); kpop->polish(); delete il; - connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem* ) ), this, SLOT( modProperty( TQListViewItem* ) ) ); - connect( this, SIGNAL( itemRenamed( TQListViewItem* ) ), this, SLOT( saveProperty( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), TQ_SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), this, TQ_SLOT( modProperty( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem* ) ), this, TQ_SLOT( saveProperty( TQListViewItem* ) ) ); } } diff --git a/krecipes/src/widgets/recipelistview.cpp b/krecipes/src/widgets/recipelistview.cpp index f193fce..c6ca440 100644 --- a/krecipes/src/widgets/recipelistview.cpp +++ b/krecipes/src/widgets/recipelistview.cpp @@ -112,10 +112,10 @@ RecipeListView::RecipeListView( TQWidget *parent, RecipeDB *db ) : StdCategoryLi void RecipeListView::init() { - connect( database, SIGNAL( recipeCreated( const Element &, const ElementList & ) ), SLOT( createRecipe( const Element &, const ElementList & ) ) ); - connect( database, SIGNAL( recipeRemoved( int ) ), SLOT( removeRecipe( int ) ) ); - connect( database, SIGNAL( recipeRemoved( int, int ) ), SLOT( removeRecipe( int, int ) ) ); - connect( database, SIGNAL( recipeModified( const Element &, const ElementList & ) ), SLOT( modifyRecipe( const Element &, const ElementList & ) ) ); + connect( database, TQ_SIGNAL( recipeCreated( const Element &, const ElementList & ) ), TQ_SLOT( createRecipe( const Element &, const ElementList & ) ) ); + connect( database, TQ_SIGNAL( recipeRemoved( int ) ), TQ_SLOT( removeRecipe( int ) ) ); + connect( database, TQ_SIGNAL( recipeRemoved( int, int ) ), TQ_SLOT( removeRecipe( int, int ) ) ); + connect( database, TQ_SIGNAL( recipeModified( const Element &, const ElementList & ) ), TQ_SLOT( modifyRecipe( const Element &, const ElementList & ) ) ); StdCategoryListView::init(); } diff --git a/krecipes/src/widgets/unitcombobox.cpp b/krecipes/src/widgets/unitcombobox.cpp index ec4494d..40b5272 100644 --- a/krecipes/src/widgets/unitcombobox.cpp +++ b/krecipes/src/widgets/unitcombobox.cpp @@ -22,8 +22,8 @@ UnitComboBox::UnitComboBox( TQWidget *parent, RecipeDB *db, Unit::Type type ) : KComboBox( parent ), database( db ), m_type(type) { - connect( database, SIGNAL( unitCreated( const Unit & ) ), SLOT( createUnit( const Unit & ) ) ); - connect( database, SIGNAL( unitRemoved( int ) ), SLOT( removeUnit( int ) ) ); + connect( database, TQ_SIGNAL( unitCreated( const Unit & ) ), TQ_SLOT( createUnit( const Unit & ) ) ); + connect( database, TQ_SIGNAL( unitRemoved( int ) ), TQ_SLOT( removeUnit( int ) ) ); } void UnitComboBox::popup() diff --git a/krecipes/src/widgets/unitlistview.cpp b/krecipes/src/widgets/unitlistview.cpp index e903fc7..a8dc8ad 100644 --- a/krecipes/src/widgets/unitlistview.cpp +++ b/krecipes/src/widgets/unitlistview.cpp @@ -88,8 +88,8 @@ UnitListView::UnitListView( TQWidget *parent, RecipeDB *db ) : DBListViewBase( p void UnitListView::init() { - connect( database, SIGNAL( unitCreated( const Unit & ) ), SLOT( checkCreateUnit( const Unit & ) ) ); - connect( database, SIGNAL( unitRemoved( int ) ), SLOT( removeUnit( int ) ) ); + connect( database, TQ_SIGNAL( unitCreated( const Unit & ) ), TQ_SLOT( checkCreateUnit( const Unit & ) ) ); + connect( database, TQ_SIGNAL( unitRemoved( int ) ), TQ_SLOT( removeUnit( int ) ) ); } void UnitListView::load( int limit, int offset ) @@ -134,10 +134,10 @@ StdUnitListView::StdUnitListView( TQWidget *parent, RecipeDB *db, bool editable TDEIconLoader il; kpop = new TDEPopupMenu( this ); - kpop->insertItem( il.loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C ); - kpop->insertItem( il.loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove + kpop->insertItem( il.loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, TQ_SLOT( createNew() ), CTRL + Key_C ); + kpop->insertItem( il.loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, TQ_SLOT( remove () ), Key_Delete ); - kpop->insertItem( il.loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R ); + kpop->insertItem( il.loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, TQ_SLOT( rename() ), CTRL + Key_R ); kpop->polish(); typeComboBox = new TQComboBox( false, viewport() ); @@ -147,12 +147,12 @@ StdUnitListView::StdUnitListView( TQWidget *parent, RecipeDB *db, bool editable addChild( typeComboBox ); typeComboBox->hide(); - connect( typeComboBox, SIGNAL( activated(int) ), SLOT( updateType(int) ) ); - connect( this, SIGNAL( selectionChanged() ), SLOT( hideTypeCombo() ) ); + connect( typeComboBox, TQ_SIGNAL( activated(int) ), TQ_SLOT( updateType(int) ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( hideTypeCombo() ) ); - connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( modUnit( TQListViewItem*, const TQPoint &, int ) ) ); - connect( this, SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), this, SLOT( saveUnit( TQListViewItem*, const TQString &, int ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), TQ_SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( modUnit( TQListViewItem*, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), this, TQ_SLOT( saveUnit( TQListViewItem*, const TQString &, int ) ) ); } } diff --git a/krecipes/src/widgets/weightinput.cpp b/krecipes/src/widgets/weightinput.cpp index be2c162..17d3d0a 100644 --- a/krecipes/src/widgets/weightinput.cpp +++ b/krecipes/src/widgets/weightinput.cpp @@ -24,7 +24,7 @@ WeightInput::WeightInput( TQWidget *parent, RecipeDB *database, Unit::Type type, prepMethodBox = new PrepMethodComboBox(false,this,database,i18n("-No Preparation-")); prepMethodBox->reload(); - connect( prepMethodBox, SIGNAL(activated(int)), SLOT(emitValueChanged()) ); + connect( prepMethodBox, TQ_SIGNAL(activated(int)), TQ_SLOT(emitValueChanged()) ); } void WeightInput::emitValueChanged() -- cgit v1.2.3