From kde-commits Sat Sep 15 11:27:24 2018 From: Yuri Chornoivan Date: Sat, 15 Sep 2018 11:27:24 +0000 To: kde-commits Subject: [krecipes] src: Normalize SIGNAL and SLOT signatures Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=153701086107281 Git commit 8d68913743015f8f06e7605385f0e35d8e96e106 by Yuri Chornoivan. Committed on 15/09/2018 at 11:27. Pushed by yurchor into branch 'master'. Normalize SIGNAL and SLOT signatures M +6 -6 src/actionshandlers/actionshandlerbase.cpp M +1 -1 src/actionshandlers/krecategoryactionshandler.cpp M +4 -4 src/actionshandlers/kregenericactionshandler.cpp M +8 -8 src/actionshandlers/krerecipeactionshandler.cpp M +9 -9 src/actionshandlers/recipeactionshandler.cpp M +1 -1 src/backends/progressinterface.cpp M +50 -50 src/dialogs/advancedsearchdialog.cpp M +2 -2 src/dialogs/authorsdialog.cpp M +5 -5 src/dialogs/borderdialog.cpp M +2 -2 src/dialogs/categorieseditordialog.cpp M +2 -2 src/dialogs/conversiondialog.cpp M +1 -1 src/dialogs/createelementdialog.cpp M +1 -1 src/dialogs/createingredientweightdialog.cpp M +1 -1 src/dialogs/createunitdialog.cpp M +1 -1 src/dialogs/dbimportdialog.cpp M +3 -3 src/dialogs/dietwizard/dietviewdialog.cpp M +5 -5 src/dialogs/dietwizard/dietwizarddialog.cpp M +5 -5 src/dialogs/dietwizard/dishinput.cpp M +3 -3 src/dialogs/dietwizard/mealinput.cpp M +12 -12 src/dialogs/editpropertiesdialog.cpp M +2 -2 src/dialogs/ingredientgroupsdialog.cpp M +8 -8 src/dialogs/ingredientmatcherdialog.cpp M +3 -3 src/dialogs/ingredientsdialog.cpp M +7 -7 src/dialogs/pagesetupdialog.cpp M +2 -2 src/dialogs/preferences/krecipespreferences.cpp M +4 -4 src/dialogs/prepmethodsdialog.cpp M +2 -2 src/dialogs/propertiesdialog.cpp M +2 -2 src/dialogs/recipeinput/editratingdialog.cpp M +8 -8 src/dialogs/recipeinput/ingredientnamedelegate.cpp M +2 -2 src/dialogs/recipeinput/ingredientparserdialog.cpp M +17 -17 src/dialogs/recipeinput/ingredientseditor.cpp M +2 -2 src/dialogs/recipeinput/nutrientinfodetailsdialog.cpp M +5 -5 src/dialogs/recipeinput/recipegeneralinfoeditor.cpp M +11 -11 src/dialogs/recipeinput/recipeinputdialog.cpp M +2 -2 src/dialogs/recipeinput/resizerecipedialog.cpp M +4 -4 src/dialogs/recipeinput/selectauthorsdialog.cpp M +1 -1 src/dialogs/recipeinput/selectcategoriesdialog.cpp M +2 -2 src/dialogs/recipeinput/unitdelegate.cpp M +2 -2 src/dialogs/recipeviewdialog.cpp M +3 -3 src/dialogs/refineshoppinglistdialog.cpp M +15 -15 src/dialogs/selectrecipedialog.cpp M +3 -3 src/dialogs/setupassistant/dbtypesetuppage.cpp M +3 -3 src/dialogs/setupassistant/permissionssetuppage.cpp M +3 -3 src/dialogs/setupassistant/psqlpermissionssetuppage.cpp M +1 -1 src/dialogs/setupassistant/serversetuppage.cpp M +1 -1 src/dialogs/setupassistant/setupassistant.cpp M +1 -1 src/dialogs/setupassistant/sqlitesetuppage.cpp M +8 -8 src/dialogs/setupdisplay.cpp M +4 -4 src/dialogs/shoppinglistdialog.cpp M +2 -2 src/dialogs/shoppinglistviewdialog.cpp M +9 -9 src/dialogs/unitsdialog.cpp M +41 -41 src/krecipes.cpp M +19 -19 src/krecipesview.cpp M +6 -6 src/models/kreallingheadersmodels.cpp M +6 -6 src/models/kreallingredientsmodels.cpp M +2 -2 src/widgets/amountunitinput.cpp M +4 -4 src/widgets/categorycombobox.cpp M +9 -9 src/widgets/categorylistview.cpp M +1 -1 src/widgets/criteriacombobox.cpp M +4 -4 src/widgets/headercombobox.cpp M +4 -4 src/widgets/ingredientcombobox.cpp M +2 -2 src/widgets/ingredientlistview.cpp M +6 -6 src/widgets/kdateedit.cpp M +9 -9 src/widgets/kdatepickerpopup.cpp M +6 -6 src/widgets/kreauthorlistwidget.cpp M +11 -11 src/widgets/krecategorieslistwidget.cpp M +5 -5 src/widgets/kreconversiontable.cpp M +8 -8 src/widgets/kregenericlistwidget.cpp M +4 -4 src/widgets/kreheaderlistwidget.cpp M +4 -4 src/widgets/kreingredientlistwidget.cpp M +11 -11 src/widgets/krelistview.cpp M +5 -5 src/widgets/kremenu.cpp M +2 -2 src/widgets/kreprepmethodlistwidget.cpp M +4 -4 src/widgets/krepropertylistwidget.cpp M +12 -12 src/widgets/krerecipeslistwidget.cpp M +1 -1 src/widgets/kretextedit.cpp M +4 -4 src/widgets/kreunitlistwidget.cpp M +2 -2 src/widgets/prepmethodcombobox.cpp M +2 -2 src/widgets/propertylistview.cpp M +2 -2 src/widgets/unitcombobox.cpp https://commits.kde.org/krecipes/8d68913743015f8f06e7605385f0e35d8e96e106 diff --git a/src/actionshandlers/actionshandlerbase.cpp b/src/actionshandle= rs/actionshandlerbase.cpp index b5942402..968bb967 100644 --- a/src/actionshandlers/actionshandlerbase.cpp +++ b/src/actionshandlers/actionshandlerbase.cpp @@ -34,16 +34,16 @@ ActionsHandlerBase::ActionsHandlerBase( DBListViewBase = *_parentListView, RecipeD = kpop =3D new KMenu( parentListView ); connect( parentListView, - SIGNAL( contextMenu( K3ListView *, Q3ListViewItem *, const QPoint & ) ), - SLOT( showPopup( K3ListView *, Q3ListViewItem *, const QPoint & ) ) + SIGNAL(contextMenu(K3ListView*,Q3ListViewItem*,QPoint)), + SLOT(showPopup(K3ListView*,Q3ListViewItem*,QPoint)) ); connect( parentListView, - SIGNAL( doubleClicked( Q3ListViewItem*, const QPoint &, int ) ), - SLOT( renameElement( Q3ListViewItem*, const QPoint &, int ) ) + SIGNAL(doubleClicked(Q3ListViewItem*,QPoint,int)), + SLOT(renameElement(Q3ListViewItem*,QPoint,int)) ); connect( parentListView, - SIGNAL( itemRenamed( Q3ListViewItem* ) ), - SLOT( saveElement( Q3ListViewItem* ) ) + SIGNAL(itemRenamed(Q3ListViewItem*)), + SLOT(saveElement(Q3ListViewItem*)) ); } = diff --git a/src/actionshandlers/krecategoryactionshandler.cpp b/src/action= shandlers/krecategoryactionshandler.cpp index 3efb8172..8680ad73 100644 --- a/src/actionshandlers/krecategoryactionshandler.cpp +++ b/src/actionshandlers/krecategoryactionshandler.cpp @@ -33,7 +33,7 @@ KreCategoryActionsHandler::KreCategoryActionsHandler( Kre= CategoriesListWidget * m_pasteAction( 0 ), m_pasteAsSubAction( 0 ) { - connect( m_contextMenu, SIGNAL( aboutToShow() ), SLOT( preparePopup() ) ); + connect( m_contextMenu, SIGNAL(aboutToShow()), SLOT(preparePopup()) ); } = void KreCategoryActionsHandler::setCategoryPasteAction( KAction * action ) diff --git a/src/actionshandlers/kregenericactionshandler.cpp b/src/actions= handlers/kregenericactionshandler.cpp index 5509dcd4..5f5ddb46 100644 --- a/src/actionshandlers/kregenericactionshandler.cpp +++ b/src/actionshandlers/kregenericactionshandler.cpp @@ -34,12 +34,12 @@ KreGenericActionsHandler::KreGenericActionsHandler( Kre= GenericListWidget * listW = m_contextMenu =3D new KMenu( listWidget ); connect( listWidget, - SIGNAL( contextMenuRequested( const QModelIndex &, const QPoint & ) ), - SLOT( showPopup( const QModelIndex &, const QPoint & ) ) + SIGNAL(contextMenuRequested(QModelIndex,QPoint)), + SLOT(showPopup(QModelIndex,QPoint)) ); connect( listWidget, - SIGNAL( itemsChanged( const QModelIndex &, const QModelIndex & ) ), - SLOT( saveElement( const QModelIndex &, const QModelIndex &) ) + SIGNAL(itemsChanged(QModelIndex,QModelIndex)), + SLOT(saveElement(QModelIndex,QModelIndex)) ); } = diff --git a/src/actionshandlers/krerecipeactionshandler.cpp b/src/actionsh= andlers/krerecipeactionshandler.cpp index 0f3eb17d..272a79b4 100644 --- a/src/actionshandlers/krerecipeactionshandler.cpp +++ b/src/actionshandlers/krerecipeactionshandler.cpp @@ -55,14 +55,14 @@ KreRecipeActionsHandler::KreRecipeActionsHandler( KreRe= cipesListWidget * listWid m_recipesMenu =3D m_contextMenu; //Re-use the menu from the base class m_categoriesMenu =3D new KMenu( listWidget ); = - connect( listWidget, SIGNAL( selectionChanged() ), - this, SLOT( selectionChangedSlot() ) ); + connect( listWidget, SIGNAL(selectionChanged()), + this, SLOT(selectionChangedSlot()) ); = - connect( listWidget, SIGNAL( doubleClicked(const QModelIndex &) ), - this, SLOT( open() ) ); + connect( listWidget, SIGNAL(doubleClicked(QModelIndex)), + this, SLOT(open()) ); = - connect( this, SIGNAL( printDone() ), = - this, SLOT( printDoneSlot() ), Qt::QueuedConnection ); + connect( this, SIGNAL(printDone()), = + this, SLOT(printDoneSlot()), Qt::QueuedConnection ); } = void KreRecipeActionsHandler::addRecipeAction( KAction * action ) @@ -358,8 +358,8 @@ void KreRecipeActionsHandler::print(bool ok) QPrinter printer; QPointer previewdlg =3D new QPrintPreviewDialog(&pri= nter); //Show the print preview dialog. - connect(previewdlg, SIGNAL(paintRequested(QPrinter *)), - m_printPage->mainFrame(), SLOT(print(QPrinter *))); + connect(previewdlg, SIGNAL(paintRequested(QPrinter*)), + m_printPage->mainFrame(), SLOT(print(QPrinter*))); previewdlg->exec(); delete previewdlg; //Remove the temporary directory which stores the HTML and free memory. diff --git a/src/actionshandlers/recipeactionshandler.cpp b/src/actionshand= lers/recipeactionshandler.cpp index dff0f59a..8f126553 100644 --- a/src/actionshandlers/recipeactionshandler.cpp +++ b/src/actionshandlers/recipeactionshandler.cpp @@ -61,18 +61,18 @@ RecipeActionsHandler::RecipeActionsHandler( K3ListView = *_parentListView, RecipeD catPop =3D new KMenu( parentListView ); = connect( parentListView, - SIGNAL( contextMenu( K3ListView *, Q3ListViewItem *, const QPoint & ) ), - SLOT( showPopup( K3ListView *, Q3ListViewItem *, const QPoint & ) ) + SIGNAL(contextMenu(K3ListView*,Q3ListViewItem*,QPoint)), + SLOT(showPopup(K3ListView*,Q3ListViewItem*,QPoint)) ); connect( parentListView, - SIGNAL( doubleClicked( Q3ListViewItem*, const QPoint &, int ) ), - SLOT( open() ) + SIGNAL(doubleClicked(Q3ListViewItem*,QPoint,int)), + SLOT(open()) ); connect( parentListView, - SIGNAL( selectionChanged() ), SLOT( selectionChangedSlot() ) ); + SIGNAL(selectionChanged()), SLOT(selectionChangedSlot()) ); = - connect( this, SIGNAL( printDone() ), = - this, SLOT( printDoneSlot() ), Qt::QueuedConnection ); + connect( this, SIGNAL(printDone()), = + this, SLOT(printDoneSlot()), Qt::QueuedConnection ); } = void RecipeActionsHandler::addRecipeAction( KAction * action ) @@ -474,8 +474,8 @@ void RecipeActionsHandler::print(bool ok) QPrinter printer; QPointer previewdlg =3D new QPrintPreviewDialog(&pri= nter); //Show the print preview dialog. - connect(previewdlg, SIGNAL(paintRequested(QPrinter *)), - m_printPage->mainFrame(), SLOT(print(QPrinter *))); + connect(previewdlg, SIGNAL(paintRequested(QPrinter*)), + m_printPage->mainFrame(), SLOT(print(QPrinter*))); previewdlg->exec(); delete previewdlg; //Remove the temporary directory which stores the HTML and free memory. diff --git a/src/backends/progressinterface.cpp b/src/backends/progressinte= rface.cpp index 1e2de051..d913e746 100644 --- a/src/backends/progressinterface.cpp +++ b/src/backends/progressinterface.cpp @@ -66,7 +66,7 @@ void ProgressInterface::listenOn( RecipeDB *db ) database->disconnect(slot_obj); = if ( db ) { - slot_obj->connect( db, SIGNAL(progressBegin(int,const QString&,const QSt= ring&,int)), slot_obj, SLOT(progressBegin(int,const QString&,const QString&= ,int)) ); + slot_obj->connect( db, SIGNAL(progressBegin(int,QString,QString,int)), s= lot_obj, SLOT(progressBegin(int,QString,QString,int)) ); slot_obj->connect( db, SIGNAL(progressDone()), slot_obj, SLOT(progressDo= ne()) ); slot_obj->connect( db, SIGNAL(progress()), slot_obj, SLOT(progress()) ); } diff --git a/src/dialogs/advancedsearchdialog.cpp b/src/dialogs/advancedsea= rchdialog.cpp index 5e4f57e7..4595691c 100644 --- a/src/dialogs/advancedsearchdialog.cpp +++ b/src/dialogs/advancedsearchdialog.cpp @@ -546,52 +546,52 @@ AdvancedSearchDialog::AdvancedSearchDialog( QWidget *= parent, RecipeDB *db ) : QW = actionHandler =3D new KreRecipeActionsHandler( resultsListWidget, databas= e ); = - 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 ) ), servingsSpinB= ox, SLOT( setEnabled( bool ) ) ); - connect( enableServingsCheckBox, SIGNAL( toggled( bool ) ), servingsCombo= Box, SLOT( setEnabled( bool ) ) ); - connect( enablePrepTimeCheckBox, SIGNAL( toggled( bool ) ), prepTimeEdit,= SLOT( setEnabled( bool ) ) ); - connect( enablePrepTimeCheckBox, SIGNAL( toggled( bool ) ), prepTimeCombo= Box, SLOT( setEnabled( bool ) ) ); - - connect( titleButton, SIGNAL( toggled( bool ) ), titleFrame, SLOT( setSho= wn( bool ) ) ); - connect( ingredientButton, SIGNAL( toggled( bool ) ), ingredientFrame, SL= OT( setShown( bool ) ) ); - connect( authorsButton, SIGNAL( toggled( bool ) ), authorsFrame, SLOT( se= tShown( 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, SLO= T( setShown( bool ) ) ); - - connect( titleButton, SIGNAL( toggled( bool ) ), SLOT( titleButtonSwitche= d( bool ) ) ); - connect( ingredientButton, SIGNAL( toggled( bool ) ), SLOT( ingredientBut= tonSwitched( bool ) ) ); - connect( authorsButton, SIGNAL( toggled( bool ) ), SLOT( authorsButtonSwi= tched( bool ) ) ); - connect( categoriesButton, SIGNAL( toggled( bool ) ), SLOT( categoriesBut= tonSwitched( bool ) ) ); - connect( servingsButton, SIGNAL( toggled( bool ) ), SLOT( servingsButtonS= witched( bool ) ) ); - connect( prepTimeButton, SIGNAL( toggled( bool ) ), SLOT( prepTimeButtonS= witched( bool ) ) ); - connect( instructionsButton, SIGNAL( toggled( bool ) ), SLOT( instruction= sButtonSwitched( bool ) ) ); - connect( metaDataButton, SIGNAL( toggled( bool ) ), SLOT( metaDataButtonS= witched( bool ) ) ); - connect( ratingsButton, SIGNAL( toggled( bool ) ), SLOT( ratingsButtonSwi= tched( bool ) ) ); - - connect( ratingAvgRadioButton, SIGNAL( clicked() ), this, SLOT( activateR= atingOptionAvg() ) ); - connect( criterionRadioButton, SIGNAL( clicked() ), this, SLOT( activateR= atingOptionCriterion() ) ); - - connect( addCriteriaButton, SIGNAL( clicked() ), this, SLOT( slotAddRatin= gCriteria() ) ); - connect( removeCriteriaButton, SIGNAL( clicked() ), this, SLOT( slotRemov= eRatingCriteria() ) ); + 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, SLO= T(setEnabled(bool)) ); + connect( enablePrepTimeCheckBox, SIGNAL(toggled(bool)), prepTimeComboBox,= SLOT(setEnabled(bool)) ); + + connect( titleButton, SIGNAL(toggled(bool)), titleFrame, SLOT(setShown(bo= ol)) ); + connect( ingredientButton, SIGNAL(toggled(bool)), ingredientFrame, SLOT(s= etShown(bool)) ); + connect( authorsButton, SIGNAL(toggled(bool)), authorsFrame, SLOT(setShow= n(bool)) ); + connect( categoriesButton, SIGNAL(toggled(bool)), categoryFrame, SLOT(set= Shown(bool)) ); + connect( servingsButton, SIGNAL(toggled(bool)), servingsFrame, SLOT(setSh= own(bool)) ); + connect( prepTimeButton, SIGNAL(toggled(bool)), prepTimeFrame, SLOT(setSh= own(bool)) ); + connect( instructionsButton, SIGNAL(toggled(bool)), instructionsFrame, SL= OT(setShown(bool)) ); + connect( metaDataButton, SIGNAL(toggled(bool)), metaDataFrame, SLOT(setSh= own(bool)) ); + connect( ratingsButton, SIGNAL(toggled(bool)), ratingButtonGroup, SLOT(se= tShown(bool)) ); + + connect( titleButton, SIGNAL(toggled(bool)), SLOT(titleButtonSwitched(boo= l)) ); + connect( ingredientButton, SIGNAL(toggled(bool)), SLOT(ingredientButtonSw= itched(bool)) ); + connect( authorsButton, SIGNAL(toggled(bool)), SLOT(authorsButtonSwitched= (bool)) ); + connect( categoriesButton, SIGNAL(toggled(bool)), SLOT(categoriesButtonSw= itched(bool)) ); + connect( servingsButton, SIGNAL(toggled(bool)), SLOT(servingsButtonSwitch= ed(bool)) ); + connect( prepTimeButton, SIGNAL(toggled(bool)), SLOT(prepTimeButtonSwitch= ed(bool)) ); + connect( instructionsButton, SIGNAL(toggled(bool)), SLOT(instructionsButt= onSwitched(bool)) ); + connect( metaDataButton, SIGNAL(toggled(bool)), SLOT(metaDataButtonSwitch= ed(bool)) ); + connect( ratingsButton, SIGNAL(toggled(bool)), SLOT(ratingsButtonSwitched= (bool)) ); + + connect( ratingAvgRadioButton, SIGNAL(clicked()), this, SLOT(activateRati= ngOptionAvg()) ); + connect( criterionRadioButton, SIGNAL(clicked()), this, SLOT(activateRati= ngOptionCriterion()) ); + + connect( addCriteriaButton, SIGNAL(clicked()), this, SLOT(slotAddRatingCr= iteria()) ); + connect( removeCriteriaButton, SIGNAL(clicked()), this, SLOT(slotRemoveRa= tingCriteria()) ); = titleFrame->setVisible(false); ingredientFrame->setVisible(false); @@ -603,10 +603,10 @@ AdvancedSearchDialog::AdvancedSearchDialog( QWidget *= parent, RecipeDB *db ) : QW metaDataFrame->setVisible(false); ratingButtonGroup->setVisible(false); = - //connect( resultsListView, SIGNAL( selectionChanged() ), this, SLOT( hav= eSelectedItems() ) ); - connect( actionHandler, SIGNAL( recipeSelected( bool ) ), SIGNAL( recipeS= elected( bool ) ) ); - connect( actionHandler, SIGNAL( recipeSelected( int, int ) ), SIGNAL( rec= ipeSelected( int, int ) ) ); - connect( actionHandler, SIGNAL( recipesSelected( const QList &, int = ) ), SIGNAL( recipesSelected( const QList &, int ) ) ); + //connect( resultsListView, SIGNAL(selectionChanged()), this, SLOT(haveSe= lectedItems()) ); + connect( actionHandler, SIGNAL(recipeSelected(bool)), SIGNAL(recipeSelect= ed(bool)) ); + connect( actionHandler, SIGNAL(recipeSelected(int,int)), SIGNAL(recipeSel= ected(int,int)) ); + connect( actionHandler, SIGNAL(recipesSelected(QList,int)), SIGNAL(r= ecipesSelected(QList,int)) ); = clear(); } diff --git a/src/dialogs/authorsdialog.cpp b/src/dialogs/authorsdialog.cpp index f47dd182..0be8b59c 100644 --- a/src/dialogs/authorsdialog.cpp +++ b/src/dialogs/authorsdialog.cpp @@ -56,8 +56,8 @@ AuthorsDialog::AuthorsDialog( QWidget* parent, RecipeDB *= db ) = //Connect Signals & Slots = - connect ( newAuthorButton, SIGNAL( clicked() ), authorActionsHandler, SLO= T( createNew() ) ); - connect ( removeAuthorButton, SIGNAL( clicked() ), authorActionsHandler, = SLOT( remove() ) ); + connect ( newAuthorButton, SIGNAL(clicked()), authorActionsHandler, SLOT(= createNew()) ); + connect ( removeAuthorButton, SIGNAL(clicked()), authorActionsHandler, SL= OT(remove()) ); } = AuthorsDialog::~AuthorsDialog() diff --git a/src/dialogs/borderdialog.cpp b/src/dialogs/borderdialog.cpp index c22a0604..8774787d 100644 --- a/src/dialogs/borderdialog.cpp +++ b/src/dialogs/borderdialog.cpp @@ -77,11 +77,11 @@ BorderDialog::BorderDialog( const KreBorder &border, QW= idget* parent, const char color_hbox->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Mi= nimumExpanding ); hsSelector =3D new KHueSaturationSelector( color_hbox ); hsSelector->setMinimumSize( 140, 70 ); - connect( hsSelector, SIGNAL( valueChanged( int, int ) ), SLOT( slotHSChan= ged( int, int ) ) ); + connect( hsSelector, SIGNAL(valueChanged(int,int)), SLOT(slotHSChanged(in= t,int)) ); = valuePal =3D new KColorValueSelector( color_hbox ); valuePal->setMinimumSize( 26, 70 ); - connect( valuePal, SIGNAL( valueChanged( int ) ), SLOT( slotVChanged( int= ) ) ); + connect( valuePal, SIGNAL(valueChanged(int)), SLOT(slotVChanged(int)) ); = layout2->addWidget( color_hbox ); layout4->addLayout( layout2 ); @@ -111,9 +111,9 @@ BorderDialog::BorderDialog( const KreBorder &border, QW= idget* parent, const char = 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, SIGNAL(valueChanged(int)), SLOT(updatePreview()) ); + connect( widthListBox, SIGNAL(highlighted(int)), SLOT(updateSpinBox(int))= ); + connect( styleListBox, SIGNAL(highlighted(int)), SLOT(updatePreview()) ); = initListBoxs(); loadBorder( border ); diff --git a/src/dialogs/categorieseditordialog.cpp b/src/dialogs/categorie= seditordialog.cpp index 2a0f01e4..737b8ba0 100644 --- a/src/dialogs/categorieseditordialog.cpp +++ b/src/dialogs/categorieseditordialog.cpp @@ -56,8 +56,8 @@ CategoriesEditorDialog::CategoriesEditorDialog( QWidget* = parent, RecipeDB *db ) = //Connect Signals & Slots = - connect ( newCategoryButton, SIGNAL( clicked() ), categoryActionsHandler,= SLOT( createNew() ) ); - connect ( removeCategoryButton, SIGNAL( clicked() ), categoryActionsHandl= er, SLOT( remove() ) ); + connect ( newCategoryButton, SIGNAL(clicked()), categoryActionsHandler, S= LOT(createNew()) ); + connect ( removeCategoryButton, SIGNAL(clicked()), categoryActionsHandler= , SLOT(remove()) ); } = CategoriesEditorDialog::~CategoriesEditorDialog() diff --git a/src/dialogs/conversiondialog.cpp b/src/dialogs/conversiondialo= g.cpp index 94310e57..00323ba6 100644 --- a/src/dialogs/conversiondialog.cpp +++ b/src/dialogs/conversiondialog.cpp @@ -83,8 +83,8 @@ ConversionDialog::ConversionDialog( QWidget* parent, Reci= peDB *db, const char* n setInitialSize( QSize(300, 200).expandedTo(minimumSizeHint()) ); = // signals and slots connections - connect ( this, SIGNAL( closeClicked() ), this, SLOT( accept() ) ); - connect( this, SIGNAL( user1Clicked() ), this, SLOT( convert() ) ); + connect ( this, SIGNAL(closeClicked()), this, SLOT(accept()) ); + connect( this, SIGNAL(user1Clicked()), this, SLOT(convert()) ); } = ConversionDialog::~ConversionDialog() diff --git a/src/dialogs/createelementdialog.cpp b/src/dialogs/createelemen= tdialog.cpp index 7fab9ab5..2b14e36b 100644 --- a/src/dialogs/createelementdialog.cpp +++ b/src/dialogs/createelementdialog.cpp @@ -43,7 +43,7 @@ CreateElementDialog::CreateElementDialog( QWidget *parent= , const QString &text ) setFixedHeight( size().height() ); = elementEdit->setFocus(); - connect( elementEdit, SIGNAL( textChanged(const QString& ) ), this, SLOT= ( slotTextChanged( const QString& ) ) ); + connect( elementEdit, SIGNAL(textChanged(QString)), this, SLOT(slotTextC= hanged(QString)) ); enableButtonOk( false ); } = diff --git a/src/dialogs/createingredientweightdialog.cpp b/src/dialogs/cre= ateingredientweightdialog.cpp index 04c44a2d..498a7bf6 100644 --- a/src/dialogs/createingredientweightdialog.cpp +++ b/src/dialogs/createingredientweightdialog.cpp @@ -81,7 +81,7 @@ CreateIngredientWeightDialog::CreateIngredientWeightDialo= g( QWidget* parent, Rec //clearWState( WState_Polished ); = weightEdit->setFocus(); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); + connect( this, SIGNAL(okClicked()), this, SLOT(slotOk()) ); } = CreateIngredientWeightDialog::~CreateIngredientWeightDialog() diff --git a/src/dialogs/createunitdialog.cpp b/src/dialogs/createunitdialo= g.cpp index d3d9f9cf..bf9ea9be 100644 --- a/src/dialogs/createunitdialog.cpp +++ b/src/dialogs/createunitdialog.cpp @@ -65,7 +65,7 @@ CreateUnitDialog::CreateUnitDialog( QWidget *parent, cons= t QString &name, const resize( 400, size().height() ); setFixedHeight( size().height() ); = - connect( nameAbbrevEdit, SIGNAL(textChanged(const QString&)), SLOT(nameAb= brevTextChanged(const QString &)) ); + connect( nameAbbrevEdit, SIGNAL(textChanged(QString)), SLOT(nameAbbrevTex= tChanged(QString)) ); = if ( name.isEmpty() ) nameEdit->setFocus(); diff --git a/src/dialogs/dbimportdialog.cpp b/src/dialogs/dbimportdialog.cpp index fa4b1dce..3bc47ba3 100644 --- a/src/dialogs/dbimportdialog.cpp +++ b/src/dialogs/dbimportdialog.cpp @@ -143,7 +143,7 @@ DBImportDialog::DBImportDialog( QWidget *parent, const = char *name ) languageChange(); = // signals and slots connections - connect( dbButtonGroup, SIGNAL( clicked( int ) ), this, SLOT( switchDBPag= e( int ) ) ); + connect( dbButtonGroup, SIGNAL(clicked(int)), this, SLOT(switchDBPage(int= )) ); } = void DBImportDialog::languageChange() diff --git a/src/dialogs/dietwizard/dietviewdialog.cpp b/src/dialogs/dietwi= zard/dietviewdialog.cpp index 1c3f4b5d..53b28c81 100644 --- a/src/dialogs/dietwizard/dietviewdialog.cpp +++ b/src/dialogs/dietwizard/dietviewdialog.cpp @@ -38,9 +38,9 @@ DietViewDialog::DietViewDialog( QWidget *parent, const Re= cipeList &recipeList, i = 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, SIGNAL(user2Clicked()), this, SLOT(slotOk()) ); + connect ( this, SIGNAL(closeClicked()), this, SLOT(close()) ); + connect ( this, SIGNAL(user1Clicked()), this, SLOT(print()) ); = // Show the diet showDiet( recipeList, dayNumber, mealNumber, dishNumbers ); diff --git a/src/dialogs/dietwizard/dietwizarddialog.cpp b/src/dialogs/diet= wizard/dietwizarddialog.cpp index 66dd579d..1910e624 100644 --- a/src/dialogs/dietwizard/dietwizarddialog.cpp +++ b/src/dialogs/dietwizard/dietwizarddialog.cpp @@ -123,10 +123,10 @@ DietWizardDialog::DietWizardDialog( QWidget *parent, = RecipeDB *db ) : KVBox( par mealTabs->setCurrentIndex( mealTabs->indexOf( mealTab ) ); = // Signals & Slots - connect( mealNumberSelector, SIGNAL( valueChanged( int ) ), this, SLOT( c= hangeMealNumber( int ) ) ); - connect( dayNumberSelector, SIGNAL( valueChanged( int ) ), this, SLOT( ch= angeDayNumber( int ) ) ); - connect( okButton, SIGNAL( clicked() ), this, SLOT( createDiet() ) ); - connect( clearButton, SIGNAL( clicked() ), this, SLOT( clear() ) ); + connect( mealNumberSelector, SIGNAL(valueChanged(int)), this, SLOT(change= MealNumber(int)) ); + connect( dayNumberSelector, SIGNAL(valueChanged(int)), this, SLOT(changeD= ayNumber(int)) ); + connect( okButton, SIGNAL(clicked()), this, SLOT(createDiet()) ); + connect( clearButton, SIGNAL(clicked()), this, SLOT(clear()) ); } = = @@ -267,7 +267,7 @@ void DietWizardDialog::createDiet( void ) = // display the list QPointer dietDisplay =3D new DietViewDialog( this, *diet= RList, dayNumber, mealNumber, dishNumbers ); - connect( dietDisplay, SIGNAL( signalOk() ), this, SLOT( createShoppingLi= st() ) ); + connect( dietDisplay, SIGNAL(signalOk()), this, SLOT(createShoppingList(= )) ); dietDisplay->exec(); delete dietDisplay; } diff --git a/src/dialogs/dietwizard/dishinput.cpp b/src/dialogs/dietwizard/= dishinput.cpp index 7721f971..934b2a3a 100644 --- a/src/dialogs/dietwizard/dishinput.cpp +++ b/src/dialogs/dietwizard/dishinput.cpp @@ -80,11 +80,11 @@ DishInput::DishInput( QWidget* parent, RecipeDB *db, co= nst QString &title ) : QW = = // Connect Signals & Slots - connect( constraintsView, SIGNAL( executed( Q3ListViewItem* ) ), this, SL= OT( insertConstraintsEditBoxes( Q3ListViewItem* ) ) ); - connect( constraintsView, SIGNAL( selectionChanged() ), this, SLOT( hideC= onstraintInputs() ) ); - connect( constraintsEditBox1, SIGNAL( valueChanged( double ) ), this, SLO= T( setMinValue( double ) ) ); - connect( constraintsEditBox2, SIGNAL( valueChanged( double ) ), this, SLO= T( setMaxValue( double ) ) ); - connect( categoriesEnabledBox, SIGNAL( toggled( bool ) ), this, SLOT( ena= bleCategories( bool ) ) ); + connect( constraintsView, SIGNAL(executed(Q3ListViewItem*)), this, SLOT(i= nsertConstraintsEditBoxes(Q3ListViewItem*)) ); + connect( constraintsView, SIGNAL(selectionChanged()), this, SLOT(hideCons= traintInputs()) ); + connect( constraintsEditBox1, SIGNAL(valueChanged(double)), this, SLOT(se= tMinValue(double)) ); + connect( constraintsEditBox2, SIGNAL(valueChanged(double)), this, SLOT(se= tMaxValue(double)) ); + connect( categoriesEnabledBox, SIGNAL(toggled(bool)), this, SLOT(enableCa= tegories(bool)) ); } = DishInput::~DishInput() diff --git a/src/dialogs/dietwizard/mealinput.cpp b/src/dialogs/dietwizard/= mealinput.cpp index 5c027a01..5815f0fe 100644 --- a/src/dialogs/dietwizard/mealinput.cpp +++ b/src/dialogs/dietwizard/mealinput.cpp @@ -76,9 +76,9 @@ MealInput::MealInput( QWidget *parent, RecipeDB *db ) : Q= Widget( parent ), dishNumberInput->setValue( dishNumber ); = // Signals & Slots - connect( dishNumberInput, SIGNAL( valueChanged( int ) ), this, SLOT( chan= geDishNumber( int ) ) ); - connect( buttonPrev, SIGNAL( clicked() ), this, SLOT( prevDish() ) ); - connect( buttonNext, SIGNAL( clicked() ), this, SLOT( nextDish() ) ); + connect( dishNumberInput, SIGNAL(valueChanged(int)), this, SLOT(changeDis= hNumber(int)) ); + connect( buttonPrev, SIGNAL(clicked()), this, SLOT(prevDish()) ); + connect( buttonNext, SIGNAL(clicked()), this, SLOT(nextDish()) ); = } = diff --git a/src/dialogs/editpropertiesdialog.cpp b/src/dialogs/editpropert= iesdialog.cpp index 72683d02..8e1b5382 100644 --- a/src/dialogs/editpropertiesdialog.cpp +++ b/src/dialogs/editpropertiesdialog.cpp @@ -220,22 +220,22 @@ EditPropertiesDialog::EditPropertiesDialog( int ingID= , const QString &ingName, R inputBox->setValidator( doubleValidator ); inputBox->hide(); = - connect( weightAddButton, SIGNAL( clicked() ), this, SLOT( addWeight() ) = ); - connect( weightRemoveButton, SIGNAL( clicked() ), this, SLOT( removeWeigh= t() ) ); - connect( propertyAddButton, SIGNAL( clicked() ), this, SLOT( addPropertyT= oIngredient() ) ); - connect( propertyRemoveButton, SIGNAL( clicked() ), this, SLOT( removePro= pertyFromIngredient() ) ); - connect( propertyListView, SIGNAL( executed( Q3ListViewItem* ) ), this, S= LOT( insertPropertyEditBox( Q3ListViewItem* ) ) ); - connect( propertyListView, SIGNAL( selectionChanged() ), inputBox, SLOT( = hide() ) ); + connect( weightAddButton, SIGNAL(clicked()), this, SLOT(addWeight()) ); + connect( weightRemoveButton, SIGNAL(clicked()), this, SLOT(removeWeight()= ) ); + connect( propertyAddButton, SIGNAL(clicked()), this, SLOT(addPropertyToIn= gredient()) ); + connect( propertyRemoveButton, SIGNAL(clicked()), this, SLOT(removeProper= tyFromIngredient()) ); + connect( propertyListView, SIGNAL(executed(Q3ListViewItem*)), this, SLOT(= insertPropertyEditBox(Q3ListViewItem*)) ); + connect( propertyListView, SIGNAL(selectionChanged()), inputBox, SLOT(hid= e()) ); = removeEventFilter( inputBox ); - connect( inputBox, SIGNAL( returnPressed( const QString & ) ), - this, SLOT( setPropertyAmount( const QString &) ) ); - connect( inputBox, SIGNAL( returnPressed( const QString & ) ), - inputBox, SLOT( hide() ) ); + connect( inputBox, SIGNAL(returnPressed(QString)), + this, SLOT(setPropertyAmount(QString)) ); + connect( inputBox, SIGNAL(returnPressed(QString)), + inputBox, SLOT(hide()) ); = - connect( weightListView, SIGNAL( doubleClicked( Q3ListViewItem*, const QP= oint &, int ) ), SLOT( itemRenamed( Q3ListViewItem*, const QPoint &, int ) = ) ); + connect( weightListView, SIGNAL(doubleClicked(Q3ListViewItem*,QPoint,int)= ), SLOT(itemRenamed(Q3ListViewItem*,QPoint,int)) ); = - connect( loadButton, SIGNAL( clicked() ), this, SLOT( loadUSDAData() ) ); + connect( loadButton, SIGNAL(clicked()), this, SLOT(loadUSDAData()) ); = updateLists(); } diff --git a/src/dialogs/ingredientgroupsdialog.cpp b/src/dialogs/ingredien= tgroupsdialog.cpp index 3ccdbd5d..d551b06d 100644 --- a/src/dialogs/ingredientgroupsdialog.cpp +++ b/src/dialogs/ingredientgroupsdialog.cpp @@ -47,8 +47,8 @@ IngredientGroupsDialog::IngredientGroupsDialog( RecipeDB = *db, QWidget *parent, c layout->addLayout(buttonLayout); setLayout( layout ); = - connect( addHeaderButton, SIGNAL( clicked() ), headerActionsHandler, SLOT= ( createNew() ) ); - connect( removeHeaderButton, SIGNAL( clicked() ), headerActionsHandler, S= LOT( remove() ) ); + connect( addHeaderButton, SIGNAL(clicked()), headerActionsHandler, SLOT(c= reateNew()) ); + connect( removeHeaderButton, SIGNAL(clicked()), headerActionsHandler, SLO= T(remove()) ); } = void IngredientGroupsDialog::reload( ReloadFlags flag ) diff --git a/src/dialogs/ingredientmatcherdialog.cpp b/src/dialogs/ingredie= ntmatcherdialog.cpp index 35d5090b..6ad560c7 100644 --- a/src/dialogs/ingredientmatcherdialog.cpp +++ b/src/dialogs/ingredientmatcherdialog.cpp @@ -138,14 +138,14 @@ IngredientMatcherDialog::IngredientMatcherDialog( QWi= dget *parent, RecipeDB *db addWidget( lowerBox ); = // Connect signals & slots - connect ( okButton, SIGNAL( clicked() ), this, SLOT( findRecipes() ) ); - connect ( clearButton, SIGNAL( clicked() ), recipeListView->listView(), S= LOT( clear() ) ); - connect ( clearButton, SIGNAL( clicked() ), this, SLOT( unselectIngredien= ts() ) ); - connect( recipeListView->listView(), SIGNAL( selectionChanged() ), this, = SLOT( haveSelectedItems() ) ); - connect ( actionHandler, SIGNAL( recipeSelected( int, int ) ), SIGNAL( re= cipeSelected( int, int ) ) ); - connect( addButton, SIGNAL( clicked() ), this, SLOT( addIngredient() ) ); - connect( removeButton, SIGNAL( clicked() ), this, SLOT( removeIngredient(= ) ) ); - connect( ingListView->listView(), SIGNAL( doubleClicked( Q3ListViewItem*,= const QPoint &, int ) ), SLOT( itemRenamed( Q3ListViewItem*, const QPoint = &, int ) ) ); + connect ( okButton, SIGNAL(clicked()), this, SLOT(findRecipes()) ); + connect ( clearButton, SIGNAL(clicked()), recipeListView->listView(), SLO= T(clear()) ); + connect ( clearButton, SIGNAL(clicked()), this, SLOT(unselectIngredients(= )) ); + connect( recipeListView->listView(), SIGNAL(selectionChanged()), this, SL= OT(haveSelectedItems()) ); + connect ( actionHandler, SIGNAL(recipeSelected(int,int)), SIGNAL(recipeSe= lected(int,int)) ); + connect( addButton, SIGNAL(clicked()), this, SLOT(addIngredient()) ); + connect( removeButton, SIGNAL(clicked()), this, SLOT(removeIngredient()) = ); + connect( ingListView->listView(), SIGNAL(doubleClicked(Q3ListViewItem*,QP= oint,int)), SLOT(itemRenamed(Q3ListViewItem*,QPoint,int)) ); } = IngredientMatcherDialog::~IngredientMatcherDialog() diff --git a/src/dialogs/ingredientsdialog.cpp b/src/dialogs/ingredientsdia= log.cpp index df63d33c..90401093 100644 --- a/src/dialogs/ingredientsdialog.cpp +++ b/src/dialogs/ingredientsdialog.cpp @@ -84,9 +84,9 @@ IngredientsDialog::IngredientsDialog( QWidget* parent, Re= cipeDB *db ) : QWidget( page_layout->addWidget( tabWidget ); = // Signals & Slots - connect( addIngredientButton, SIGNAL( clicked() ), ingredientActionsHandl= er, SLOT( createNew() ) ); - connect( removeIngredientButton, SIGNAL( clicked() ), ingredientActionsHa= ndler, SLOT( remove() ) ); - connect( propertyButton, SIGNAL( clicked() ), this, SLOT( showPropertyEdi= t() ) ); + connect( addIngredientButton, SIGNAL(clicked()), ingredientActionsHandler= , SLOT(createNew()) ); + connect( removeIngredientButton, SIGNAL(clicked()), ingredientActionsHand= ler, SLOT(remove()) ); + connect( propertyButton, SIGNAL(clicked()), this, SLOT(showPropertyEdit()= ) ); = } = diff --git a/src/dialogs/pagesetupdialog.cpp b/src/dialogs/pagesetupdialog.= cpp index 0597370c..3470ee94 100644 --- a/src/dialogs/pagesetupdialog.cpp +++ b/src/dialogs/pagesetupdialog.cpp @@ -51,9 +51,9 @@ PageSetupDialog::PageSetupDialog( QWidget *parent, const = Recipe &sample, const Q setCaption( i18n("Page Setup") ); = toolbar->addAction( KStandardAction::open( this, SLOT(loadFile()), action= Collection ) ); - toolbar->addAction( KStandardAction::save( this, SLOT( saveLayout() ), ac= tionCollection ) ); - toolbar->addAction( KStandardAction::saveAs( this, SLOT( saveAsLayout() )= , actionCollection ) ); - toolbar->addAction( KStandardAction::revert( this, SLOT( selectNoLayout()= ), actionCollection ) ); + toolbar->addAction( KStandardAction::save( this, SLOT(saveLayout()), acti= onCollection ) ); + toolbar->addAction( KStandardAction::saveAs( this, SLOT(saveAsLayout()), = actionCollection ) ); + toolbar->addAction( KStandardAction::revert( this, SLOT(selectNoLayout())= , actionCollection ) ); = = //KDE4 port do the last arguments of the KToolBarPopupAction and line 67 = duplicate information ? @@ -71,7 +71,7 @@ PageSetupDialog::PageSetupDialog( QWidget *parent, const = Recipe &sample, const Q = KHBox *viewBox =3D new KHBox( this ); ThumbBarView *thumbBar =3D new ThumbBarView(viewBox,Qt::Horizontal); - connect(thumbBar,SIGNAL(signalURLSelected(const QString&)), this, SLOT(lo= adTemplate(const QString&))); + connect(thumbBar,SIGNAL(signalURLSelected(QString)), this, SLOT(loadTempl= ate(QString))); QDir included_templates( getIncludedLayoutDir(), "*.xsl", QDir::Name | QD= ir::IgnoreCase, QDir::Files ); for ( uint i =3D 0; i < included_templates.count(); i++ ) { new ThumbBarItem(thumbBar,included_templates.path() + '/' +included_temp= lates[ i ]); @@ -91,8 +91,8 @@ PageSetupDialog::PageSetupDialog( QWidget *parent, const = Recipe &sample, const Q 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( okButton, SIGNAL(clicked()), SLOT(accept()) ); + connect( cancelButton, SIGNAL(clicked()), SLOT(reject()) ); = KConfigGroup config =3D KGlobal::config()->group( "Page Setup" ); QSize defaultSize(722,502); @@ -174,7 +174,7 @@ void PageSetupDialog::initShownItems() if ( properties[item] & SetupDisplay::Visibility ) { int new_id =3D 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, SLOT(setItemShown(int)) ); = popup_widget_map.insert( new_id, item ); widget_popup_map.insert( item, new_id ); diff --git a/src/dialogs/preferences/krecipespreferences.cpp b/src/dialogs/= preferences/krecipespreferences.cpp index 1861345f..030ce345 100644 --- a/src/dialogs/preferences/krecipespreferences.cpp +++ b/src/dialogs/preferences/krecipespreferences.cpp @@ -89,8 +89,8 @@ KrecipesPreferences::KrecipesPreferences( QWidget *parent= ) = = // Signals & Slots - connect ( this, SIGNAL( okClicked() ), this, SLOT( saveSettings() ) ); - connect ( this, SIGNAL( helpClicked() ), this, SLOT( slotHelp() ) = ); + connect ( this, SIGNAL(okClicked()), this, SLOT(saveSettings()) ); + connect ( this, SIGNAL(helpClicked()), this, SLOT(slotHelp()) ); } = void KrecipesPreferences::saveSettings( void ) diff --git a/src/dialogs/prepmethodsdialog.cpp b/src/dialogs/prepmethodsdia= log.cpp index 16b92901..c7f37df2 100644 --- a/src/dialogs/prepmethodsdialog.cpp +++ b/src/dialogs/prepmethodsdialog.cpp @@ -55,10 +55,10 @@ PrepMethodsDialog::PrepMethodsDialog( QWidget* parent, = RecipeDB *db ) : QWidget( = //Connect Signals & Slots = - connect ( newPrepMethodButton, SIGNAL( clicked() ), - prepMethodActionsHandler, SLOT( createNew() ) ); - connect ( removePrepMethodButton, SIGNAL( clicked() ), - prepMethodActionsHandler, SLOT( remove() ) ); + connect ( newPrepMethodButton, SIGNAL(clicked()), + prepMethodActionsHandler, SLOT(createNew()) ); + connect ( removePrepMethodButton, SIGNAL(clicked()), + prepMethodActionsHandler, SLOT(remove()) ); } = PrepMethodsDialog::~PrepMethodsDialog() diff --git a/src/dialogs/propertiesdialog.cpp b/src/dialogs/propertiesdialo= g.cpp index 6b557e5d..3d9c7387 100644 --- a/src/dialogs/propertiesdialog.cpp +++ b/src/dialogs/propertiesdialog.cpp @@ -56,8 +56,8 @@ PropertiesDialog::PropertiesDialog( QWidget *parent, Reci= peDB *db ) : QWidget( p layout->addLayout( vboxl ); = // Connect signals & slots - connect( addPropertyButton, SIGNAL( clicked() ), propertyActionsHandler, = SLOT( createNew() ) ); - connect( removePropertyButton, SIGNAL( clicked() ), propertyActionsHandle= r, SLOT( remove() ) ); + connect( addPropertyButton, SIGNAL(clicked()), propertyActionsHandler, SL= OT(createNew()) ); + connect( removePropertyButton, SIGNAL(clicked()), propertyActionsHandler,= SLOT(remove()) ); = } = diff --git a/src/dialogs/recipeinput/editratingdialog.cpp b/src/dialogs/rec= ipeinput/editratingdialog.cpp index 6a0a3c65..efc2b35c 100644 --- a/src/dialogs/recipeinput/editratingdialog.cpp +++ b/src/dialogs/recipeinput/editratingdialog.cpp @@ -130,13 +130,13 @@ void EditRatingDialog::init( const ElementList &crite= riaList ) resize( QSize(358, 331).expandedTo(minimumSizeHint()) ); //clearWState( WState_Polished ); = - connect( criteriaListView, SIGNAL(itemRenamed(Q3ListViewItem*,const QStri= ng &,int)), this, SLOT(itemRenamed(Q3ListViewItem*,const QString &,int)) ); + connect( criteriaListView, SIGNAL(itemRenamed(Q3ListViewItem*,QString,int= )), this, SLOT(itemRenamed(Q3ListViewItem*,QString,int)) ); connect( addButton, SIGNAL(clicked()), this, SLOT(slotAddRatingCriteria()= ) ); connect( removeButton, SIGNAL(clicked()), this, SLOT(slotRemoveRatingCrit= eria()) ); = KIconLoader *il =3D KIconLoader::global(); KMenu *kpop =3D new KMenu( criteriaListView ); - kpop->addAction( il->loadIcon( "edit-delete-shred", KIconLoader::NoGroup,= 16 ), i18nc( "@action:button", "&Delete" ), this, SLOT( slotRemoveRatingCr= iteria() ), Qt::Key_Delete ); + kpop->addAction( il->loadIcon( "edit-delete-shred", KIconLoader::NoGroup,= 16 ), i18nc( "@action:button", "&Delete" ), this, SLOT(slotRemoveRatingCri= teria()), Qt::Key_Delete ); = for ( ElementList::const_iterator criteria_it =3D criteriaList.begin(); c= riteria_it !=3D criteriaList.end(); ++criteria_it ) { criteriaComboBox->insertItem( criteriaComboBox->count(), ( *criteria_it = ).name ); diff --git a/src/dialogs/recipeinput/ingredientnamedelegate.cpp b/src/dialo= gs/recipeinput/ingredientnamedelegate.cpp index 8e93eedd..3db75b94 100644 --- a/src/dialogs/recipeinput/ingredientnamedelegate.cpp +++ b/src/dialogs/recipeinput/ingredientnamedelegate.cpp @@ -33,10 +33,10 @@ void IngredientNameDelegate::loadAllIngredientsList( Re= cipeDB * database ) //FIXME: This doesn't respect the limits configured in the program database->loadIngredientMaps( &m_idToIngredientMap, &m_ingredientNameToId= Map ); = - connect( database, SIGNAL(ingredientCreated(const Element&)), - this, SLOT(ingredientCreatedSlot(const Element&)) ); - connect( database, SIGNAL(ingredientModified(const Ingredient&)), - this, SLOT(ingredientModifiedSlot(const Ingredient&)) ); + connect( database, SIGNAL(ingredientCreated(Element)), + this, SLOT(ingredientCreatedSlot(Element)) ); + connect( database, SIGNAL(ingredientModified(Ingredient)), + this, SLOT(ingredientModifiedSlot(Ingredient)) ); connect( database, SIGNAL(ingredientRemoved(int)), this, SLOT(ingredientRemovedSlot(int)) ); } @@ -46,10 +46,10 @@ void IngredientNameDelegate::loadAllHeadersList( Recipe= DB * database ) //FIXME: This doesn't respect the limits configured in the program database->loadIngredientGroupMaps( &m_idToHeaderMap, &m_headerNameToIdMap= ); = - connect( database, SIGNAL(ingGroupCreated(const Element&)), - this, SLOT(headerCreatedSlot(const Element&)) ); - connect( database, SIGNAL(ingGroupModified(const Element&)), - this, SLOT(headerModifiedSlot(const Element &)) ); + connect( database, SIGNAL(ingGroupCreated(Element)), + this, SLOT(headerCreatedSlot(Element)) ); + connect( database, SIGNAL(ingGroupModified(Element)), + this, SLOT(headerModifiedSlot(Element)) ); connect( database, SIGNAL(ingGroupRemoved(int)), this, SLOT(headerRemovedSlot(int)) ); } diff --git a/src/dialogs/recipeinput/ingredientparserdialog.cpp b/src/dialo= gs/recipeinput/ingredientparserdialog.cpp index 7027c6e6..437f34a6 100644 --- a/src/dialogs/recipeinput/ingredientparserdialog.cpp +++ b/src/dialogs/recipeinput/ingredientparserdialog.cpp @@ -91,8 +91,8 @@ IngredientParserDialog::IngredientParserDialog( const Uni= tList &units, QWidget* buttonBox->addItem( horizontalSpacing ); = KMenu *kpop =3D new KMenu( previewIngView ); - kpop->addAction( i18nc( "@item:inmenu", "&Delete" ), this, SLOT( removeIn= gredient() ), Qt::Key_Delete ); - kpop->addAction( i18nc( "@item:inmenu", "Set &Header") , this, SLOT( conv= ertToHeader() ) ); + kpop->addAction( i18nc( "@item:inmenu", "&Delete" ), this, SLOT(removeIng= redient()), Qt::Key_Delete ); + kpop->addAction( i18nc( "@item:inmenu", "Set &Header") , this, SLOT(conve= rtToHeader()) ); = connect( parseButton, SIGNAL(clicked()), this, SLOT(parseText()) ); connect( buttonGroup, SIGNAL(clicked()), this, SLOT(convertToHeader()) ); diff --git a/src/dialogs/recipeinput/ingredientseditor.cpp b/src/dialogs/re= cipeinput/ingredientseditor.cpp index 5589ba43..bdc3dc35 100644 --- a/src/dialogs/recipeinput/ingredientseditor.cpp +++ b/src/dialogs/recipeinput/ingredientseditor.cpp @@ -72,7 +72,7 @@ IngredientsEditor::IngredientsEditor( QWidget * parent) = connect( m_sourceModel, SIGNAL(itemChanged(QStandardItem*)), this, SIGNAL(changed()) ); - connect( ui->m_treeView, SIGNAL(doubleClicked(const QModelIndex&)), + connect( ui->m_treeView, SIGNAL(doubleClicked(QModelIndex)), this, SIGNAL(changed()) ); = connect( m_sourceModel, SIGNAL(itemChanged(QStandardItem*)), @@ -137,34 +137,34 @@ void IngredientsEditor::setDatabase( RecipeDB * datab= ase ) //Connect signals from new database = //Ingredients - connect( m_database, SIGNAL(ingredientCreated(const Element &)), - this, SLOT(ingredientCreatedDBSlot(const Element &)) ); - connect( m_database, SIGNAL(ingredientModified(const Ingredient &)), - this, SLOT(ingredientModifiedDBSlot(const Ingredient &)) ); + connect( m_database, SIGNAL(ingredientCreated(Element)), + this, SLOT(ingredientCreatedDBSlot(Element)) ); + connect( m_database, SIGNAL(ingredientModified(Ingredient)), + this, SLOT(ingredientModifiedDBSlot(Ingredient)) ); connect( m_database, SIGNAL(ingredientRemoved(int)), this, SLOT(ingredientRemovedDBSlot(int)) ); = //Units - connect( m_database, SIGNAL(unitCreated(const Unit &)), - this, SLOT(unitCreatedDBSlot(const Unit &)) ); - connect( m_database, SIGNAL(unitModified(const Unit &)), - this, SLOT(unitModifiedDBSlot(const Unit &)) ); + connect( m_database, SIGNAL(unitCreated(Unit)), + this, SLOT(unitCreatedDBSlot(Unit)) ); + connect( m_database, SIGNAL(unitModified(Unit)), + this, SLOT(unitModifiedDBSlot(Unit)) ); connect( m_database, SIGNAL(unitRemoved(int)), this, SLOT(unitRemovedDBSlot(int)) ); = //Preparation methods - connect( m_database, SIGNAL(prepMethodCreated(const Element &)), - this, SLOT(prepMethodCreatedDBSlot(const Element &)) ); - connect( m_database, SIGNAL(prepMethodModified(const Element &)), - this, SLOT(prepMethodModifiedDBSlot(const Element &)) ); + connect( m_database, SIGNAL(prepMethodCreated(Element)), + this, SLOT(prepMethodCreatedDBSlot(Element)) ); + connect( m_database, SIGNAL(prepMethodModified(Element)), + this, SLOT(prepMethodModifiedDBSlot(Element)) ); connect( m_database, SIGNAL(prepMethodRemoved(int)), this, SLOT(prepMethodRemovedDBSlot(int)) ); = //Headers - connect( m_database, SIGNAL(ingGroupCreated(const Element &)), - this, SLOT(headerCreatedDBSlot(const Element &)) ); - connect( m_database, SIGNAL(ingGroupModified(const Element &)), - this, SLOT(headerModifiedDBSlot(const Element &)) ); + connect( m_database, SIGNAL(ingGroupCreated(Element)), + this, SLOT(headerCreatedDBSlot(Element)) ); + connect( m_database, SIGNAL(ingGroupModified(Element)), + this, SLOT(headerModifiedDBSlot(Element)) ); connect( m_database, SIGNAL(ingGroupRemoved(int)), this, SLOT(headerRemovedDBSlot(int)) ); } diff --git a/src/dialogs/recipeinput/nutrientinfodetailsdialog.cpp b/src/di= alogs/recipeinput/nutrientinfodetailsdialog.cpp index 3748a5d6..2aee3ef0 100644 --- a/src/dialogs/recipeinput/nutrientinfodetailsdialog.cpp +++ b/src/dialogs/recipeinput/nutrientinfodetailsdialog.cpp @@ -33,8 +33,8 @@ NutrientInfoDetailsDialog::NutrientInfoDetailsDialog( QWi= dget *parent ) setLayout( mainLayout ); mainLayout->addWidget( mainWidget ); = - connect( ui->m_textBrowser, SIGNAL(anchorClicked(const QUrl &)), - this, SLOT(linkClickedSlot(const QUrl &)) ); + connect( ui->m_textBrowser, SIGNAL(anchorClicked(QUrl)), + this, SLOT(linkClickedSlot(QUrl)) ); = connect( ui->m_updateButton, SIGNAL(clicked()), this, SIGNAL(updateRequested()) ); diff --git a/src/dialogs/recipeinput/recipegeneralinfoeditor.cpp b/src/dial= ogs/recipeinput/recipegeneralinfoeditor.cpp index 17582d23..03be3373 100644 --- a/src/dialogs/recipeinput/recipegeneralinfoeditor.cpp +++ b/src/dialogs/recipeinput/recipegeneralinfoeditor.cpp @@ -32,18 +32,18 @@ RecipeGeneralInfoEditor::RecipeGeneralInfoEditor( QWidg= et * parent, RecipeDB * d ui->setupUi( this ); = //Connect signals/slots to detect changes - connect( ui->m_titleEdit, SIGNAL(textChanged(const QString&)), - this, SLOT(titleChangedSlot(const QString&)) ); + connect( ui->m_titleEdit, SIGNAL(textChanged(QString)), + this, SLOT(titleChangedSlot(QString)) ); = connect( ui->m_photoLabel, SIGNAL(changed()), this, SIGNAL(changed()) ); = - connect( ui->m_yieldNumInput, SIGNAL( textChanged(const QString &) ), + connect( ui->m_yieldNumInput, SIGNAL(textChanged(QString)), this, SIGNAL(changed()) ); - connect( ui->m_yieldTypeEdit, SIGNAL( textChanged(const QString &) ), + connect( ui->m_yieldTypeEdit, SIGNAL(textChanged(QString)), this, SIGNAL(changed()) ); = - connect( ui->m_prepTimeEdit, SIGNAL( timeChanged(const QTime &) ), + connect( ui->m_prepTimeEdit, SIGNAL(timeChanged(QTime)), this, SIGNAL(changed()) ); = //Connect signals/slots to perform changes diff --git a/src/dialogs/recipeinput/recipeinputdialog.cpp b/src/dialogs/re= cipeinput/recipeinputdialog.cpp index 466954c8..bb7f1f95 100644 --- a/src/dialogs/recipeinput/recipeinputdialog.cpp +++ b/src/dialogs/recipeinput/recipeinputdialog.cpp @@ -135,23 +135,23 @@ RecipeInputDialog::RecipeInputDialog( QWidget* parent= , RecipeDB *db ) : KVBox( p enableChangedSignal(); // Enables the signal "changed()" = // Connect signals & Slots - connect( m_recipeGeneralInfoEditor , SIGNAL( titleChanged( const QString&= ) ), - this, SLOT( recipeChanged( const QString& ) ) ); - connect( m_recipeGeneralInfoEditor, SIGNAL( changed() ), this, SIGNAL( ch= anged() ) ); + connect( m_recipeGeneralInfoEditor , SIGNAL(titleChanged(QString)), + this, SLOT(recipeChanged(QString)) ); + connect( m_recipeGeneralInfoEditor, SIGNAL(changed()), this, SIGNAL(chang= ed()) ); = connect( ingredientsEditor, SIGNAL(changed()), this, SLOT(recipeChanged()= ) ); = - connect( this, SIGNAL( changed() ), this, SLOT( recipeChanged() ) ); - connect( instructionsEdit, SIGNAL( textChanged() ), this, SLOT( recipeCha= nged() ) ); + connect( this, SIGNAL(changed()), this, SLOT(recipeChanged()) ); + connect( instructionsEdit, SIGNAL(textChanged()), this, SLOT(recipeChange= d()) ); = // 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 ( this, SIGNAL( enableSaveOption( bool ) ), this, SLOT( enableSav= eButton( bool ) ) ); + 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 ( this, SIGNAL(enableSaveOption(bool)), this, SLOT(enableSaveButt= on(bool)) ); = - connect ( database, SIGNAL( recipeRemoved(int) ), this, SLOT( recipeRemov= ed(int) ) ); + connect ( database, SIGNAL(recipeRemoved(int)), this, SLOT(recipeRemoved(= int)) ); = } = diff --git a/src/dialogs/recipeinput/resizerecipedialog.cpp b/src/dialogs/r= ecipeinput/resizerecipedialog.cpp index 536ceed2..d76d9cac 100644 --- a/src/dialogs/recipeinput/resizerecipedialog.cpp +++ b/src/dialogs/recipeinput/resizerecipedialog.cpp @@ -53,8 +53,8 @@ ResizeRecipeDialog::ResizeRecipeDialog( QWidget *parent, = Recipe *recipe ) } = // signals and slots connections - connect( ui->m_buttonGroup, SIGNAL( changed( int ) ), - this, SLOT( activateCurrentOption( int ) ) ); + connect( ui->m_buttonGroup, SIGNAL(changed(int)), + this, SLOT(activateCurrentOption(int)) ); } = void ResizeRecipeDialog::activateCurrentOption( int button_id ) diff --git a/src/dialogs/recipeinput/selectauthorsdialog.cpp b/src/dialogs/= recipeinput/selectauthorsdialog.cpp index 318d8181..a1d45479 100644 --- a/src/dialogs/recipeinput/selectauthorsdialog.cpp +++ b/src/dialogs/recipeinput/selectauthorsdialog.cpp @@ -50,8 +50,8 @@ SelectAuthorsDialog::SelectAuthorsDialog( QWidget *parent= , const ElementList &cu authorsCombo->completionObject() ->setCompletionMode( KGlobalSettings::Co= mpletionPopupAuto ); authorsCombo->lineEdit() ->disconnect( authorsCombo ); //so hitting enter= doesn't enter the item into the box = - connect( authorsCombo->lineEdit(), SIGNAL( returnPressed() ), - this, SLOT( addAuthor() ) ); + connect( authorsCombo->lineEdit(), SIGNAL(returnPressed()), + this, SLOT(addAuthor()) ); = // Add/Remove buttons = @@ -92,8 +92,8 @@ SelectAuthorsDialog::SelectAuthorsDialog( QWidget *parent= , const ElementList &cu resize(450, height()); = // Connect signals & Slots - connect ( addAuthorButton, SIGNAL( clicked() ), this, SLOT( addAuthor() )= ); - connect ( removeAuthorButton, SIGNAL( clicked() ), this, SLOT( removeAuth= or() ) ); + connect ( addAuthorButton, SIGNAL(clicked()), this, SLOT(addAuthor()) ); + connect ( removeAuthorButton, SIGNAL(clicked()), this, SLOT(removeAuthor(= )) ); = authorsCombo->setEditText(QString()); authorsCombo->lineEdit()->setFocus(); diff --git a/src/dialogs/recipeinput/selectcategoriesdialog.cpp b/src/dialo= gs/recipeinput/selectcategoriesdialog.cpp index 9fd6d271..23a3674c 100644 --- a/src/dialogs/recipeinput/selectcategoriesdialog.cpp +++ b/src/dialogs/recipeinput/selectcategoriesdialog.cpp @@ -46,7 +46,7 @@ SelectCategoriesDialog::SelectCategoriesDialog( QWidget *= parent, const ElementLi newCatButton->setIcon( KIcon( "list-add" ) ); = // Connect signals & Slots - connect ( newCatButton, SIGNAL( clicked() ), SLOT( createNewCategory() ) = ); + connect ( newCatButton, SIGNAL(clicked()), SLOT(createNewCategory()) ); } = SelectCategoriesDialog::~SelectCategoriesDialog() diff --git a/src/dialogs/recipeinput/unitdelegate.cpp b/src/dialogs/recipei= nput/unitdelegate.cpp index a96e3460..eb15a6d6 100644 --- a/src/dialogs/recipeinput/unitdelegate.cpp +++ b/src/dialogs/recipeinput/unitdelegate.cpp @@ -36,8 +36,8 @@ void UnitDelegate::loadAllUnitsList( RecipeDB * database ) ++it; } //TODO: connect database signals - /*connect( database, SIGNAL(ingredientCreated(const Element&)), - this, SLOT(ingredientCreatedSlot(const Element&)) ); + /*connect( database, SIGNAL(ingredientCreated(Element)), + this, SLOT(ingredientCreatedSlot(Element)) ); connect( database, SIGNAL(ingredientRemoved(int)), this, SLOT(ingredientRemovedSlot(int)) );*/ = diff --git a/src/dialogs/recipeviewdialog.cpp b/src/dialogs/recipeviewdialo= g.cpp index 65ddae8b..4a3adba2 100644 --- a/src/dialogs/recipeviewdialog.cpp +++ b/src/dialogs/recipeviewdialog.cpp @@ -80,8 +80,8 @@ RecipeViewDialog::RecipeViewDialog( QWidget *parent, Reci= peDB *db, int recipeID functionsLayout->addWidget( closeButton ); = //Connect the signals. - connect ( editButton, SIGNAL( clicked() ), this, SIGNAL( editRecipe() ) ); - connect ( closeButton, SIGNAL( clicked() ), this, SIGNAL( closeRecipeView= () ) ); + connect ( editButton, SIGNAL(clicked()), this, SIGNAL(editRecipe()) ); + connect ( closeButton, SIGNAL(clicked()), this, SIGNAL(closeRecipeView())= ); = //----------Load the recipe -------- if ( recipeID !=3D -1 ) diff --git a/src/dialogs/refineshoppinglistdialog.cpp b/src/dialogs/refines= hoppinglistdialog.cpp index 71704b98..d149091c 100644 --- a/src/dialogs/refineshoppinglistdialog.cpp +++ b/src/dialogs/refineshoppinglistdialog.cpp @@ -102,9 +102,9 @@ RefineShoppingListDialog::RefineShoppingListDialog( QWi= dget* parent, RecipeDB *d = //clearWState( WState_Polished ); = - connect( addButton, SIGNAL( clicked() ), this, SLOT( addIngredient() ) ); - connect( removeButton, SIGNAL( clicked() ), this, SLOT( removeIngredient(= ) ) ); - connect( ingListView->listView(), SIGNAL( itemRenamed( Q3ListViewItem*, c= onst QString &, int ) ), SLOT( itemRenamed( Q3ListViewItem*, const QString = &, int ) ) ); + connect( addButton, SIGNAL(clicked()), this, SLOT(addIngredient()) ); + connect( removeButton, SIGNAL(clicked()), this, SLOT(removeIngredient()) = ); + connect( ingListView->listView(), SIGNAL(itemRenamed(Q3ListViewItem*,QStr= ing,int)), SLOT(itemRenamed(Q3ListViewItem*,QString,int)) ); = KApplication::setOverrideCursor( Qt::WaitCursor ); calculateShopping( recipeList, &ingredientList, database ); diff --git a/src/dialogs/selectrecipedialog.cpp b/src/dialogs/selectreciped= ialog.cpp index 42658b0b..7a15ad11 100644 --- a/src/dialogs/selectrecipedialog.cpp +++ b/src/dialogs/selectrecipedialog.cpp @@ -104,25 +104,25 @@ SelectRecipeDialog::SelectRecipeDialog( QWidget *pare= nt, RecipeDB* db ) = = // Signals & Slots - connect( openButton, SIGNAL( clicked() ), actionHandler, SLOT( open() ) ); - connect( this, SIGNAL( recipeSelected( bool ) ), openButton, SLOT( setEna= bled( bool ) ) ); - connect( editButton, SIGNAL( clicked() ), actionHandler, SLOT( edit() ) ); - connect( this, SIGNAL( recipeSelected( bool ) ), editButton, SLOT( setEna= bled( bool ) ) ); - connect( removeButton, SIGNAL( clicked() ), actionHandler, SLOT( remove()= ) ); - connect( this, SIGNAL( recipeSelected( bool ) ), removeButton, SLOT( setE= nabled( bool ) ) ); + 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(setEnable= d(bool)) ); = = - connect( recipeListWidget, SIGNAL( selectionChanged() ), this, SLOT( have= SelectedItems() ) ); - connect( recipeListWidget, SIGNAL( elementSelected(const QList &, co= nst QList &) ), = - this, SLOT( selectionChanged(const QList &, const QList &) ) ); + connect( recipeListWidget, SIGNAL(selectionChanged()), this, SLOT(haveSel= ectedItems()) ); + connect( recipeListWidget, SIGNAL(elementSelected(QList,QList))= , = + this, SLOT(selectionChanged(QList,QList)) ); = - connect( advancedSearch, SIGNAL( recipeSelected( bool ) ), SIGNAL( recipe= Selected( bool ) ) ); - connect( advancedSearch, SIGNAL( recipeSelected( int, int ) ), SIGNAL( re= cipeSelected( int, int ) ) ); - connect( advancedSearch, SIGNAL( recipesSelected( const QList &, int= ) ), SIGNAL( recipesSelected( const QList &, int ) ) ); + connect( advancedSearch, SIGNAL(recipeSelected(bool)), SIGNAL(recipeSelec= ted(bool)) ); + connect( advancedSearch, SIGNAL(recipeSelected(int,int)), SIGNAL(recipeSe= lected(int,int)) ); + connect( advancedSearch, SIGNAL(recipesSelected(QList,int)), SIGNAL(= recipesSelected(QList,int)) ); = - connect( actionHandler, SIGNAL( recipeSelected( bool ) ), SIGNAL( recipeS= elected( bool ) ) ); - connect( actionHandler, SIGNAL( recipeSelected( int, int ) ), SIGNAL( rec= ipeSelected( int, int ) ) ); - connect( actionHandler, SIGNAL( recipesSelected( const QList &, int = ) ), SIGNAL( recipesSelected( const QList &, int ) ) ); + connect( actionHandler, SIGNAL(recipeSelected(bool)), SIGNAL(recipeSelect= ed(bool)) ); + connect( actionHandler, SIGNAL(recipeSelected(int,int)), SIGNAL(recipeSel= ected(int,int)) ); + connect( actionHandler, SIGNAL(recipesSelected(QList,int)), SIGNAL(r= ecipesSelected(QList,int)) ); } = SelectRecipeDialog::~SelectRecipeDialog() diff --git a/src/dialogs/setupassistant/dbtypesetuppage.cpp b/src/dialogs/s= etupassistant/dbtypesetuppage.cpp index ef231ce4..41cf7ee7 100644 --- a/src/dialogs/setupassistant/dbtypesetuppage.cpp +++ b/src/dialogs/setupassistant/dbtypesetuppage.cpp @@ -81,9 +81,9 @@ DBTypeSetupPage::DBTypeSetupPage( QWidget *parent ) : QWi= dget( parent ) QSpacerItem *spacer_bottom =3D new QSpacerItem( 10, 10, QSizePolicy::Fixe= d, QSizePolicy::MinimumExpanding ); layout->addItem( spacer_bottom, 4, 3 ); = - connect( liteCheckBox, SIGNAL( clicked() ), this, SLOT( setSQLitePages() = ) ); - connect( mysqlCheckBox, SIGNAL( clicked() ), this, SLOT( setMySQLPages() = ) ); - connect( psqlCheckBox, SIGNAL( clicked() ), this, SLOT( setPostgreSQLPage= s() ) ); + connect( liteCheckBox, SIGNAL(clicked()), this, SLOT(setSQLitePages()) ); + connect( mysqlCheckBox, SIGNAL(clicked()), this, SLOT(setMySQLPages()) ); + connect( psqlCheckBox, SIGNAL(clicked()), this, SLOT(setPostgreSQLPages()= ) ); = } = diff --git a/src/dialogs/setupassistant/permissionssetuppage.cpp b/src/dial= ogs/setupassistant/permissionssetuppage.cpp index 5fb0ad3f..6b1a80d2 100644 --- a/src/dialogs/setupassistant/permissionssetuppage.cpp +++ b/src/dialogs/setupassistant/permissionssetuppage.cpp @@ -116,9 +116,9 @@ PermissionsSetupPage::PermissionsSetupPage( QWidget *pa= rent ) : QWidget( parent = // Connect Signals & slots = - connect( rootCheckBox, SIGNAL( toggled( bool ) ), rootInfoGBox, SLOT( set= Enabled( bool ) ) ); - connect( rootCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( rootCheckBo= xChanged( bool ) ) ); - connect( noSetupCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( noSetupC= heckBoxChanged( bool ) ) ); + connect( rootCheckBox, SIGNAL(toggled(bool)), rootInfoGBox, SLOT(setEnabl= ed(bool)) ); + connect( rootCheckBox, SIGNAL(toggled(bool)), this, SLOT(rootCheckBoxChan= ged(bool)) ); + connect( noSetupCheckBox, SIGNAL(toggled(bool)), this, SLOT(noSetupCheckB= oxChanged(bool)) ); } = void PermissionsSetupPage::rootCheckBoxChanged( bool on ) diff --git a/src/dialogs/setupassistant/psqlpermissionssetuppage.cpp b/src/= dialogs/setupassistant/psqlpermissionssetuppage.cpp index e78770b6..c63b64d1 100644 --- a/src/dialogs/setupassistant/psqlpermissionssetuppage.cpp +++ b/src/dialogs/setupassistant/psqlpermissionssetuppage.cpp @@ -121,9 +121,9 @@ PSqlPermissionsSetupPage::PSqlPermissionsSetupPage( QWi= dget *parent ) : QWidget( = // Connect Signals & slots = - connect( rootCheckBox, SIGNAL( toggled( bool ) ), rootInfoGBox, SLOT( set= Enabled( bool ) ) ); - connect( rootCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( rootCheckBo= xChanged( bool ) ) ); - connect( noSetupCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( noSetupC= heckBoxChanged( bool ) ) ); + connect( rootCheckBox, SIGNAL(toggled(bool)), rootInfoGBox, SLOT(setEnabl= ed(bool)) ); + connect( rootCheckBox, SIGNAL(toggled(bool)), this, SLOT(rootCheckBoxChan= ged(bool)) ); + connect( noSetupCheckBox, SIGNAL(toggled(bool)), this, SLOT(noSetupCheckB= oxChanged(bool)) ); } = void PSqlPermissionsSetupPage::rootCheckBoxChanged( bool on ) diff --git a/src/dialogs/setupassistant/serversetuppage.cpp b/src/dialogs/s= etupassistant/serversetuppage.cpp index bd93ebb4..20496bc5 100644 --- a/src/dialogs/setupassistant/serversetuppage.cpp +++ b/src/dialogs/setupassistant/serversetuppage.cpp @@ -149,7 +149,7 @@ ServerSetupPage::ServerSetupPage( QWidget *parent ) : Q= Widget( parent ) //layout->addItem( spacerRight, 7, 4 ); = // Signals & Slots - connect( remoteServerCheckBox, SIGNAL( toggled( bool ) ), serverSettingsG= Box, SLOT( setEnabled( bool ) ) ); + connect( remoteServerCheckBox, SIGNAL(toggled(bool)), serverSettingsGBox,= SLOT(setEnabled(bool)) ); = } = diff --git a/src/dialogs/setupassistant/setupassistant.cpp b/src/dialogs/se= tupassistant/setupassistant.cpp index 0fe04418..949f925e 100644 --- a/src/dialogs/setupassistant/setupassistant.cpp +++ b/src/dialogs/setupassistant/setupassistant.cpp @@ -72,7 +72,7 @@ SetupAssistant::SetupAssistant( QWidget *parent, Qt::WFla= gs f ) : KAssistantDial = showPages( SQLite ); = - connect( dbTypeSetupPage, SIGNAL( showPages( DBType ) ), this, SLOT( show= Pages( DBType ) ) ); + connect( dbTypeSetupPage, SIGNAL(showPages(DBType)), this, SLOT(showPages= (DBType)) ); } = = diff --git a/src/dialogs/setupassistant/sqlitesetuppage.cpp b/src/dialogs/s= etupassistant/sqlitesetuppage.cpp index debf7e90..286eb4b5 100644 --- a/src/dialogs/setupassistant/sqlitesetuppage.cpp +++ b/src/dialogs/setupassistant/sqlitesetuppage.cpp @@ -80,7 +80,7 @@ SQLiteSetupPage::SQLiteSetupPage( QWidget *parent ) : QWi= dget( parent ) QSpacerItem* bottomSpacer =3D new QSpacerItem( 10, 10, QSizePolicy::Minim= um, QSizePolicy::MinimumExpanding ); layout->addItem( bottomSpacer, 4, 1 ); = - connect( file_select, SIGNAL( clicked() ), SLOT( selectFile() ) ); + connect( file_select, SIGNAL(clicked()), SLOT(selectFile()) ); } = QString SQLiteSetupPage::dbFile( void ) const diff --git a/src/dialogs/setupdisplay.cpp b/src/dialogs/setupdisplay.cpp index eb058744..b5b1fe60 100644 --- a/src/dialogs/setupdisplay.cpp +++ b/src/dialogs/setupdisplay.cpp @@ -61,7 +61,7 @@ SetupDisplay::SetupDisplay( const Recipe &sample, QWidget= *parent ) : KHTMLPart( has_changes( false ), popup(0) { - connect( this, SIGNAL( popupMenu(const QString &,const QPoint &) ), SLOT(= nodeClicked(const QString &,const QPoint &) ) ); + connect( this, SIGNAL(popupMenu(QString,QPoint)), SLOT(nodeClicked(QStrin= g,QPoint)) ); = if ( sample.recipeID !=3D -1 ) m_sample =3D sample; @@ -434,16 +434,16 @@ void SetupDisplay::nodeClicked(const QString &/*url*/= ,const QPoint &point) } = if ( properties & BackgroundColor ) - popup->addAction( i18n( "Background Color..." ), this, SLOT( setBackgrou= ndColor() ) ); + popup->addAction( i18n( "Background Color..." ), this, SLOT(setBackgroun= dColor()) ); = if ( properties & TextColor ) - popup->addAction( i18n( "Text Color..." ), this, SLOT( setTextColor() ) = ); + popup->addAction( i18n( "Text Color..." ), this, SLOT(setTextColor()) ); = if ( properties & Font ) - popup->addAction( KIcon( "list-add-font" ), i18n( "Font..." ), this, SLO= T( setFont() ) ); + popup->addAction( KIcon( "list-add-font" ), i18n( "Font..." ), this, SLO= T(setFont()) ); = if ( properties & Visibility ) { - int id =3D popup->insertItem( i18n( "Show" ), this, SLOT( setShown( int = ) ) ); + int id =3D popup->insertItem( i18n( "Show" ), this, SLOT(setShown(int)) = ); popup->setItemChecked( id, item->show ); } = @@ -467,7 +467,7 @@ void SetupDisplay::nodeClicked(const QString &/*url*/,c= onst QPoint &point) if ( align & Qt::AlignRight ) r_action->setChecked(true); = - connect( alignment_actions, SIGNAL( selected( QAction* ) ), SLOT( setAli= gnment( QAction* ) ) ); + connect( alignment_actions, SIGNAL(selected(QAction*)), SLOT(setAlignmen= t(QAction*)) ); = popup->insertItem( i18n( "Alignment" ), sub_popup ); = @@ -475,10 +475,10 @@ void SetupDisplay::nodeClicked(const QString &/*url*/= ,const QPoint &point) } = if ( properties & Border ) - popup->addAction( i18n( "Border..." ), this, SLOT( setBorder() ) ); + popup->addAction( i18n( "Border..." ), this, SLOT(setBorder()) ); = if ( properties & Columns ) - popup->addAction( i18n( "Columns..." ), this, SLOT( setColumns() ) ); + popup->addAction( i18n( "Columns..." ), this, SLOT(setColumns()) ); = popup->popup( point ); } diff --git a/src/dialogs/shoppinglistdialog.cpp b/src/dialogs/shoppinglistd= ialog.cpp index 363387d1..078d19c5 100644 --- a/src/dialogs/shoppinglistdialog.cpp +++ b/src/dialogs/shoppinglistdialog.cpp @@ -79,10 +79,10 @@ ShoppingListDialog::ShoppingListDialog( QWidget *parent= , RecipeDB *db ) : QWidge clearButton->setIcon( KIcon( "edit-clear" ) ); = // Connect signals & slots - connect( addRecipeButton, SIGNAL( clicked() ), this, SLOT( addRecipe() ) = ); - connect( removeRecipeButton, SIGNAL( clicked() ), this, SLOT( removeRecip= e() ) ); - connect( okButton, SIGNAL( clicked() ), this, SLOT( showShoppingList() ) = ); - connect( clearButton, SIGNAL( clicked() ), this, SLOT( clear() ) ); + 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()) ); } = ShoppingListDialog::~ShoppingListDialog() diff --git a/src/dialogs/shoppinglistviewdialog.cpp b/src/dialogs/shoppingl= istviewdialog.cpp index 1195b0c6..7457ea3b 100644 --- a/src/dialogs/shoppinglistviewdialog.cpp +++ b/src/dialogs/shoppinglistviewdialog.cpp @@ -43,8 +43,8 @@ ShoppingListViewDialog::ShoppingListViewDialog( QWidget *= parent, const Ingredien = setInitialSize( QSize(350, 450) ); = - connect ( this, SIGNAL( user1Clicked() ), this, SLOT( print() ) ); - connect ( this, SIGNAL( closeClicked() ), this, SLOT( accept() ) ); + connect ( this, SIGNAL(user1Clicked()), this, SLOT(print()) ); + connect ( this, SIGNAL(closeClicked()), this, SLOT(accept()) ); = //---------- Sort the list -------- IngredientList list_copy =3D ingredientList; diff --git a/src/dialogs/unitsdialog.cpp b/src/dialogs/unitsdialog.cpp index 2c8579f9..d914216a 100644 --- a/src/dialogs/unitsdialog.cpp +++ b/src/dialogs/unitsdialog.cpp @@ -73,19 +73,19 @@ UnitsDialog::UnitsDialog( QWidget *parent, RecipeDB *db= ) : QWidget( parent ) page_layout->addWidget( tabWidget ); = // Connect signals & slots - connect( newUnitButton, SIGNAL( clicked() ), unitActionsHandler, SLOT( cr= eateNew() ) ); - connect( removeUnitButton, SIGNAL( clicked() ), unitActionsHandler, SLOT(= remove() ) ); - connect( massConversionTable, SIGNAL( ratioChanged( int, int, double ) ),= this, SLOT( saveRatio( int, int, double ) ) ); - connect( massConversionTable, SIGNAL( ratioRemoved( int, int ) ), this, S= LOT( 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, SIGNAL(clicked()), unitActionsHandler, SLOT(creat= eNew()) ); + connect( removeUnitButton, SIGNAL(clicked()), unitActionsHandler, SLOT(re= move()) ); + connect( massConversionTable, SIGNAL(ratioChanged(int,int,double)), this,= SLOT(saveRatio(int,int,double)) ); + connect( massConversionTable, SIGNAL(ratioRemoved(int,int)), this, SLOT(r= emoveRatio(int,int)) ); + connect( volumeConversionTable, SIGNAL(ratioChanged(int,int,double)), thi= s, SLOT(saveRatio(int,int,double)) ); + connect( volumeConversionTable, SIGNAL(ratioRemoved(int,int)), this, SLOT= (removeRatio(int,int)) ); = //TODO: I'm too lazy right now, so do a complete reload to keep in sync w= ith db - connect( database, SIGNAL( unitCreated( const Unit& ) ), this, SLOT( load= ConversionTables() ) ); - connect( database, SIGNAL( unitRemoved( int ) ), this, SLOT( loadConversi= onTables() ) ); + connect( database, SIGNAL(unitCreated(Unit)), this, SLOT(loadConversionTa= bles()) ); + connect( database, SIGNAL(unitRemoved(int)), this, SLOT(loadConversionTab= les()) ); = //this is for the above TODO, but it still has some bugs to be worked out - //connect(database,SIGNAL(unitCreated(const Element&)),conversionTable,SL= OT(unitCreated(const Element&))); + //connect(database,SIGNAL(unitCreated(Element)),conversionTable,SLOT(unit= Created(Element))); //connect(database,SIGNAL(unitRemoved(int)),conversionTable,SLOT(unitRemo= ved(int))); = //Populate data into the table diff --git a/src/krecipes.cpp b/src/krecipes.cpp index b717202a..0e7a58d5 100644 --- a/src/krecipes.cpp +++ b/src/krecipes.cpp @@ -97,19 +97,19 @@ Krecipes::Krecipes(): KXmlGuiWindow( 0 ) = = // allow the view to change the statusbar and caption - connect( m_view, SIGNAL( signalChangeStatusbar( const QString& ) ), - this, SLOT( changeStatusbar( const QString& ) ) ); - connect( m_view, SIGNAL( signalChangeCaption( const QString& ) ), - this, SLOT( changeCaption( const QString& ) ) ); + connect( m_view, SIGNAL(signalChangeStatusbar(QString)), + this, SLOT(changeStatusbar(QString)) ); + connect( m_view, SIGNAL(signalChangeCaption(QString)), + this, SLOT(changeCaption(QString)) ); = - connect( m_view, SIGNAL( panelShown( KrePanel, bool ) ), SLOT( updateActi= ons( KrePanel, bool ) ) ); + connect( m_view, SIGNAL(panelShown(KrePanel,bool)), SLOT(updateActions(Kr= ePanel,bool)) ); = - connect( m_view, SIGNAL( recipeSelected(bool) ), SLOT( recipeSelected(boo= l) ) ); + connect( m_view, SIGNAL(recipeSelected(bool)), SLOT(recipeSelected(bool))= ); = = // Enable/Disable the Save Button (Initialize disabled, and connect signa= l) = - connect( m_view, SIGNAL( enableSaveOption( bool ) ), this, SLOT( enableSa= veOption( bool ) ) ); + connect( m_view, SIGNAL(enableSaveOption(bool)), this, SLOT(enableSaveOpt= ion(bool)) ); = enableSaveOption( false ); // Disables saving initially recipeSelected( false ); //nothing is selected initially @@ -188,27 +188,27 @@ void Krecipes::recipeSelected( bool selected ) void Krecipes::setupActions() { = - printAction =3D KStandardAction::print( this, SLOT( filePrint() ), actio= nCollection() ); + printAction =3D KStandardAction::print( this, SLOT(filePrint()), actionC= ollection() ); = reloadAction =3D new KAction( this ); reloadAction->setText( i18nc("@action:inmenu Reload Recipe", "Reloa&d" ) = ); reloadAction->setIcon( KIcon( "view-refresh" ) ); reloadAction->setShortcut( Qt::Key_F5 ); actionCollection()->addAction( "reload_action" , reloadAction ); - connect( reloadAction, SIGNAL(triggered(bool)), m_view, SLOT( reloadDispl= ay() ) ); + connect( reloadAction, SIGNAL(triggered(bool)), m_view, SLOT(reloadDispla= y()) ); = editAction =3D new KAction( this ); editAction->setText( i18n( "&Edit Recipe" ) ); editAction->setIcon( KIcon( "document-edit" ) ); editAction->setShortcut( Qt::CTRL + Qt::Key_E ); actionCollection()->addAction( "edit_action" , editAction ); - connect( editAction, SIGNAL(triggered(bool)), m_view, SLOT( editRecipe() = ) ); + connect( editAction, SIGNAL(triggered(bool)), m_view, SLOT(editRecipe()) = ); = converterAction =3D new KAction( this ); converterAction->setText( i18n( "&Measurement Converter" ) ); converterAction->setShortcut( Qt::CTRL + Qt::Key_M ); actionCollection()->addAction( "converter_action" , converterAction ); - connect( converterAction, SIGNAL(triggered(bool)), this , SLOT( conversio= nToolSlot() ) ); + connect( converterAction, SIGNAL(triggered(bool)), this , SLOT(conversion= ToolSlot()) ); = KConfigGroup grp(KGlobal::config(),"Advanced"); = @@ -219,129 +219,129 @@ void Krecipes::setupActions() mergeCategoriesAction->setText( i18n( "&Merge Similar Categories..." ) ); //mergeCategoriesAction->setShortcut( Qt::CTRL + Qt::Key_M ); actionCollection()->addAction( "merge_categories_action", mergeCategorie= sAction ); - connect( mergeCategoriesAction, SIGNAL(triggered(bool)), this, SLOT( mer= geSimilarCategories() ) ); + connect( mergeCategoriesAction, SIGNAL(triggered(bool)), this, SLOT(merg= eSimilarCategories()) ); = mergeIngredientsAction =3D new KAction( this ); mergeIngredientsAction->setIcon( KIcon( "ingredients" ) ); mergeIngredientsAction->setText( i18n( "&Merge Similar Ingredients..." )= ); //=C2=BAmergeIngredientsAction->setShortcut( Qt::CTRL + Qt::Key_M ); actionCollection()->addAction( "merge_ingredients_action", mergeIngredie= ntsAction ); - connect( mergeIngredientsAction, SIGNAL(triggered(bool)), this, SLOT( me= rgeSimilarIngredients() ) ); + connect( mergeIngredientsAction, SIGNAL(triggered(bool)), this, SLOT(mer= geSimilarIngredients()) ); = } = - KAction *action =3D KStandardAction::openNew( this, SLOT( fileNew() ), ac= tionCollection() ); + KAction *action =3D KStandardAction::openNew( this, SLOT(fileNew()), acti= onCollection() ); action->setText( i18n( "&New Recipe" ) ); action->setToolTip( i18n( "&New Recipe" ) ); = - saveAction =3D KStandardAction::save( this, SLOT( fileSave() ), actionCol= lection() ); + saveAction =3D KStandardAction::save( this, SLOT(fileSave()), actionColle= ction() ); = - KStandardAction::quit( kapp, SLOT( quit() ), actionCollection() ); + KStandardAction::quit( kapp, SLOT(quit()), actionCollection() ); = - m_statusbarAction =3D KStandardAction::showStatusbar( this, SLOT( options= ShowStatusbar() ), actionCollection() ); + m_statusbarAction =3D KStandardAction::showStatusbar( this, SLOT(optionsS= howStatusbar()), actionCollection() ); = - KStandardAction::keyBindings( this, SLOT( optionsConfigureKeys() ), actio= nCollection() ); - KStandardAction::configureToolbars( this, SLOT( optionsConfigureToolbars(= ) ), actionCollection() ); - KStandardAction::preferences( this, SLOT( optionsPreferences() ), actionC= ollection() ); + KStandardAction::keyBindings( this, SLOT(optionsConfigureKeys()), actionC= ollection() ); + KStandardAction::configureToolbars( this, SLOT(optionsConfigureToolbars()= ), actionCollection() ); + KStandardAction::preferences( this, SLOT(optionsPreferences()), actionCol= lection() ); = importAction =3D new KAction( this ); importAction->setText( i18n( "Import from File..." ) ); importAction->setIcon( KIcon( "document-import" ) ); importAction->setShortcut( Qt::CTRL + Qt::Key_I ); actionCollection()->addAction( "import_action" , importAction ); - connect( importAction, SIGNAL(triggered(bool)), this, SLOT( import() ) ); + connect( importAction, SIGNAL(triggered(bool)), this, SLOT(import()) ); = importDBAction=3D new KAction( this ); importDBAction->setText( i18n( "Import from Database..." ) ); importDBAction->setIcon( KIcon( "document-import" ) ); actionCollection()->addAction( "import_db_action" , importDBAction ); - connect( importDBAction, SIGNAL(triggered(bool)), this, SLOT( kreDBImport= () ) ); + connect( importDBAction, SIGNAL(triggered(bool)), this, SLOT(kreDBImport(= )) ); = exportAction =3D new KAction( this ); exportAction->setText( i18n( "Export..." ) ); exportAction->setShortcut( Qt::CTRL + Qt::Key_O ); exportAction->setIcon( KIcon( "document-export" ) ); actionCollection()->addAction( "export_action" , exportAction ); - connect( exportAction, SIGNAL(triggered(bool)), this, SLOT( fileExport() = ) ); + connect( exportAction, SIGNAL(triggered(bool)), this, SLOT(fileExport()) = ); = copyToClipboardAction =3D new KAction( this ); copyToClipboardAction->setText( i18n( "&Copy to Clipboard" ) ); copyToClipboardAction->setIcon( KIcon( "edit-copy" ) ); copyToClipboardAction->setShortcut( Qt::CTRL + Qt::Key_C ); actionCollection()->addAction( "copy_to_clipboard_action" , copyToClipboa= rdAction ); - connect( copyToClipboardAction, SIGNAL(triggered(bool)), this, SLOT( file= ToClipboard() ) ); + connect( copyToClipboardAction, SIGNAL(triggered(bool)), this, SLOT(fileT= oClipboard()) ); = = pageSetupAction =3D new KAction( this ); pageSetupAction->setText( i18n( "Page Setup..." ) ); pageSetupAction->setIcon( KIcon( "configure" ) ); actionCollection()->addAction( "page_setup_action" , pageSetupActi= on ); - connect( pageSetupAction, SIGNAL(triggered(bool)), this, SLOT( pag= eSetupSlot() ) ); + connect( pageSetupAction, SIGNAL(triggered(bool)), this, SLOT(page= SetupSlot()) ); = printSetupAction =3D new KAction( this ); printSetupAction->setText( i18n( "Print Setup..." ) ); printSetupAction->setIcon( KIcon( "configure" ) ); actionCollection()->addAction( "print_setup_action" , printSetupAc= tion ); - connect( printSetupAction, SIGNAL(triggered(bool)), this, SLOT( pr= intSetupSlot() ) ); + connect( printSetupAction, SIGNAL(triggered(bool)), this, SLOT(pri= ntSetupSlot()) ); = backupAction =3D new KAction( this ); backupAction->setText( i18n( "Backup..." ) ); backupAction->setIcon( KIcon( "document-save-all" ) ); actionCollection()->addAction( "backup_action" , backupAction ); - connect( backupAction, SIGNAL(triggered(bool)), this, SLOT( backup= Slot() ) ); + connect( backupAction, SIGNAL(triggered(bool)), this, SLOT(backupS= lot()) ); = restoreAction =3D new KAction( this ); restoreAction->setText( i18n( "Restore..." ) ); restoreAction->setIcon( KIcon( "document-revert" ) ); actionCollection()->addAction( "restore_action" , restoreAction ); - connect( restoreAction, SIGNAL(triggered(bool)), this, SLOT( resto= reSlot() ) ); + connect( restoreAction, SIGNAL(triggered(bool)), this, SLOT(restor= eSlot()) ); = addToShoppingListAction =3D new KAction( this ); addToShoppingListAction->setText( i18n( "Add to Shopping List" ) ); = addToShoppingListAction->setIcon( KIcon( "view-pim-tasks" ) ); addToShoppingListAction->setShortcut( Qt::CTRL + Qt::Key_S ); actionCollection()->addAction( "add_to_shopping_list_action", addToShoppi= ngListAction ); - connect( addToShoppingListAction, SIGNAL(triggered(bool)), m_view, SLOT( = addToShoppingList() ) ); + connect( addToShoppingListAction, SIGNAL(triggered(bool)), m_view, SLOT(a= ddToShoppingList()) ); = removeFromCategoryAction =3D new KAction( this ); removeFromCategoryAction->setText( i18n( "Remove From Category" ) ); removeFromCategoryAction->setIcon( KIcon( "edit-delete-shred" ) ); removeFromCategoryAction->setShortcut( Qt::ALT + Qt::Key_Delete ); actionCollection()->addAction( "remove_from_category_action", removeFromC= ategoryAction ); - connect( removeFromCategoryAction, SIGNAL(triggered(bool)), m_view, SLOT(= removeFromCategory() ) ); + connect( removeFromCategoryAction, SIGNAL(triggered(bool)), m_view, SLOT(= removeFromCategory()) ); = deleteAction =3D new KAction( this ); deleteAction->setText( i18n( "Delete" ) ); deleteAction->setIcon( KIcon( "edit-delete" ) ); deleteAction->setShortcut( Qt::Key_Delete ); actionCollection()->addAction( "delete_action", deleteAction ); - connect( deleteAction, SIGNAL(triggered(bool)), m_view, SLOT( deleteCurre= ntElements() ) ); + connect( deleteAction, SIGNAL(triggered(bool)), m_view, SLOT(deleteCurren= tElements()) ); = showRecipeAction =3D new KAction( this ); showRecipeAction->setText( i18n( "Show Recipe(s)" ) ); showRecipeAction->setIcon( KIcon( "system-search" ) ); showRecipeAction->setShortcut( Qt::CTRL + Qt::Key_L ); actionCollection()->addAction( "show_recipe_action", showRecipeAction ); - connect( showRecipeAction, SIGNAL(triggered(bool)), m_view, SLOT( showCur= rentRecipes() ) ); + connect( showRecipeAction, SIGNAL(triggered(bool)), m_view, SLOT(showCurr= entRecipes()) ); = categorizeAction =3D new KAction( this ); categorizeAction->setText( i18n( "Categorize" ) ); categorizeAction->setIcon( KIcon( "folder-yellow" ) ); categorizeAction->setShortcut( Qt::CTRL + Qt::Key_T ); actionCollection()->addAction( "categorize_action", categorizeAction ); - connect( categorizeAction, SIGNAL(triggered(bool)), m_view, SLOT( categor= izeCurrentRecipe() ) ); + connect( categorizeAction, SIGNAL(triggered(bool)), m_view, SLOT(categori= zeCurrentRecipe()) ); = expandAllAction =3D new KAction( this ); expandAllAction->setText( i18n( "Expand All" ) ); expandAllAction->setShortcut( Qt::CTRL + Qt::Key_Plus ); actionCollection()->addAction( "expand_all_action", expandAllAction ); - connect( expandAllAction, SIGNAL(triggered(bool)), m_view, SLOT( expandAl= l() ) ); + connect( expandAllAction, SIGNAL(triggered(bool)), m_view, SLOT(expandAll= ()) ); = collapseAllAction =3D new KAction( this ); collapseAllAction->setText( i18n ( "Collapse All") ); collapseAllAction->setShortcut( Qt::CTRL + Qt::Key_Minus ); actionCollection()->addAction( "collapse_all_action", collapseAllAction ); - connect( collapseAllAction, SIGNAL(triggered(bool)), m_view, SLOT( collap= seAll() ) ); + connect( collapseAllAction, SIGNAL(triggered(bool)), m_view, SLOT(collaps= eAll()) ); = //Note that createAction is intended to create anything except a new reci= pe. createAction =3D new KAction( this ); @@ -349,14 +349,14 @@ void Krecipes::setupActions() createAction->setIcon( KIcon( "document-new" ) ); createAction->setShortcut( Qt::CTRL + Qt::ALT + Qt::Key_N ); actionCollection()->addAction( "create_new_action", createAction ); - connect( createAction, SIGNAL(triggered(bool)), m_view, SLOT( createNewEl= ement() ) ); + connect( createAction, SIGNAL(triggered(bool)), m_view, SLOT(createNewEle= ment()) ); = renameAction =3D new KAction( this ); renameAction->setText( i18n( "Rename" ) ); renameAction->setIcon( KIcon( "edit-rename" ) ); renameAction->setShortcut( Qt::CTRL + Qt::Key_R ); actionCollection()->addAction( "rename_action", renameAction ); - connect( renameAction, SIGNAL(triggered(bool)), m_view, SLOT( renameCurre= ntElement() ) ); + connect( renameAction, SIGNAL(triggered(bool)), m_view, SLOT(renameCurren= tElement()) ); = //Not using an standard action because I don't want it in toolbar nor in = menus. cutAction =3D new KAction( this ); @@ -364,7 +364,7 @@ void Krecipes::setupActions() cutAction->setIcon( KIcon( "edit-cut" ) ); cutAction->setShortcut( Qt::CTRL + Qt::Key_X ); actionCollection()->addAction( "cut_action", cutAction ); - connect( cutAction, SIGNAL(triggered(bool)), m_view, SLOT( cut() ) ); + connect( cutAction, SIGNAL(triggered(bool)), m_view, SLOT(cut()) ); = //Not using an standard action because I don't want it in toolbar nor in = menus. pasteAction =3D new KAction( this ); @@ -372,14 +372,14 @@ void Krecipes::setupActions() pasteAction->setIcon( KIcon( "edit-paste" ) ); pasteAction->setShortcut( Qt::CTRL + Qt::Key_V ); actionCollection()->addAction( "paste_action", pasteAction ); - connect( pasteAction, SIGNAL(triggered(bool)), m_view, SLOT( paste() ) ); + connect( pasteAction, SIGNAL(triggered(bool)), m_view, SLOT(paste()) ); = pasteAsSubcategoryAction =3D new KAction( this ); pasteAsSubcategoryAction->setText( i18n( "Paste as Subcategory" ) ); pasteAsSubcategoryAction->setIcon( KIcon( "edit-paste" ) ); pasteAsSubcategoryAction->setShortcut( Qt::CTRL + Qt::SHIFT + Qt::Key_V ); actionCollection()->addAction( "paste_as_subcategory_action", pasteAsSubc= ategoryAction ); - connect( pasteAsSubcategoryAction, SIGNAL(triggered(bool)), m_view, SLOT(= pasteAsSubcategory() ) ); + connect( pasteAsSubcategoryAction, SIGNAL(triggered(bool)), m_view, SLOT(= pasteAsSubcategory()) ); = // Add actions to the context menus in the "select recipe" dialog m_view->addSelectRecipeAction( showRecipeAction ); @@ -821,7 +821,7 @@ void Krecipes::optionsConfigureToolbars() saveMainWindowSettings( KConfigGroup(KGlobal::config(), autoSaveGroup() )= ); = QPointer dlg =3D new KEditToolBar( actionCollection() ); - connect( dlg, SIGNAL( newToolbarConfig() ), this, SLOT( newToolbarConfig(= ) ) ); + connect( dlg, SIGNAL(newToolbarConfig()), this, SLOT(newToolbarConfig()) = ); dlg->exec(); delete dlg; } diff --git a/src/krecipesview.cpp b/src/krecipesview.cpp index 75886a33..1ace61a3 100644 --- a/src/krecipesview.cpp +++ b/src/krecipesview.cpp @@ -284,51 +284,51 @@ KrecipesView::KrecipesView( QWidget *parent ) = = // Connect Signals from Left Panel to slotSetPanel() - connect( leftPanel, SIGNAL( clicked( KrePanel ) ), this, SLOT( slotSetPan= el( KrePanel ) ) ); + connect( leftPanel, SIGNAL(clicked(KrePanel)), this, SLOT(slotSetPanel(Kr= ePanel)) ); = - connect( contextButton, SIGNAL( clicked() ), SLOT( activateContextHelp() = ) ); + connect( contextButton, SIGNAL(clicked()), SLOT(activateContextHelp()) ); = - connect( leftPanel, SIGNAL( resized( int, int ) ), this, SLOT( resizeRigh= tPane( int, int ) ) ); + connect( leftPanel, SIGNAL(resized(int,int)), this, SLOT(resizeRightPane(= int,int)) ); = = // Retransmit signal to parent to Enable/Disable the Save Button - connect ( inputPanel, SIGNAL( enableSaveOption( bool ) ), this, SLOT( ena= bleSaveOptionSlot( bool ) ) ); + connect ( inputPanel, SIGNAL(enableSaveOption(bool)), this, SLOT(enableSa= veOptionSlot(bool)) ); = // Create a new button when a recipe is unsaved - connect ( inputPanel, SIGNAL( createButton( QWidget*, const QString & ) )= , this, SLOT( addRecipeButton( QWidget*, const QString & ) ) ); + connect ( inputPanel, SIGNAL(createButton(QWidget*,QString)), this, SLOT(= addRecipeButton(QWidget*,QString)) ); = // Connect Signals from selectPanel (SelectRecipeDialog) = - connect ( selectPanel, SIGNAL( recipeSelected( int, int ) ), this, SLOT( = actionRecipe( int, int ) ) ); - connect ( selectPanel, SIGNAL( recipesSelected( const QList&, int ) = ), this, SLOT( actionRecipes( const QList&, int ) ) ); + connect ( selectPanel, SIGNAL(recipeSelected(int,int)), this, SLOT(action= Recipe(int,int)) ); + connect ( selectPanel, SIGNAL(recipesSelected(QList,int)), this, SLO= T(actionRecipes(QList,int)) ); = // Connect Signals from ingredientMatcherPanel (IngredientMatcherDialog) = - connect ( ingredientMatcherPanel, SIGNAL( recipeSelected( int, int ) ), S= LOT( actionRecipe( int, int ) ) ); + connect ( ingredientMatcherPanel, SIGNAL(recipeSelected(int,int)), SLOT(a= ctionRecipe(int,int)) ); = // Close a recipe when requested (just switch panels) - connect( inputPanel, SIGNAL( closeRecipe() ), this, SLOT( closeRecipe() )= ); + connect( inputPanel, SIGNAL(closeRecipe()), this, SLOT(closeRecipe()) ); = // Show a recipe when requested (just switch panels) - connect( inputPanel, SIGNAL( showRecipe( int ) ), this, SLOT( showRecipe(= int ) ) ); + connect( inputPanel, SIGNAL(showRecipe(int)), this, SLOT(showRecipe(int))= ); = //Edit the recipe when requested - connect( viewPanel, SIGNAL( editRecipe() ), this, SLOT( editRecipe() ) ); + connect( viewPanel, SIGNAL(editRecipe()), this, SLOT(editRecipe()) ); = // Close the recipe view when requested (just switch panels) - connect( viewPanel, SIGNAL( closeRecipeView() ), this, SLOT( closeRecipe(= ) ) ); + connect( viewPanel, SIGNAL(closeRecipeView()), this, SLOT(closeRecipe()) = ); = // Create a new shopping list when a new diet is generated and accepted - connect( dietPanel, SIGNAL( dietReady() ), this, SLOT( createShoppingList= FromDiet() ) ); + connect( dietPanel, SIGNAL(dietReady()), this, SLOT(createShoppingListFro= mDiet()) ); = // Place the Tip Button in correct position when the left pane is resized - connect( leftPanel, SIGNAL( resized( int, int ) ), this, SLOT( moveTipBut= ton( int, int ) ) ); + connect( leftPanel, SIGNAL(resized(int,int)), this, SLOT(moveTipButton(in= t,int)) ); = - connect( rightPanel, SIGNAL( panelRaised( QWidget*, QWidget* ) ), SLOT( p= anelRaised( QWidget*, QWidget* ) ) ); + connect( rightPanel, SIGNAL(panelRaised(QWidget*,QWidget*)), SLOT(panelRa= ised(QWidget*,QWidget*)) ); = - connect( selectPanel, SIGNAL( recipeSelected(bool) ), SIGNAL( recipeSelec= ted(bool) ) ); + connect( selectPanel, SIGNAL(recipeSelected(bool)), SIGNAL(recipeSelected= (bool)) ); = - connect( ingredientMatcherPanel, SIGNAL( recipeSelected(bool) ), SIGNAL( = recipeSelected(bool) ) ); + connect( ingredientMatcherPanel, SIGNAL(recipeSelected(bool)), SIGNAL(rec= ipeSelected(bool)) ); = //Finish the splash screen splashScreen.finish( this ); @@ -1062,8 +1062,8 @@ void KrecipesView::addRecipeButton( QWidget *w, const= QString &title ) = leftPanel->highlightButton( recipeButton ); = - connect( recipeButton, SIGNAL( clicked() ), this, SLOT( switchToRecipe() = ) ); - connect( ( RecipeInputDialog * ) w, SIGNAL( titleChanged( const QString& = ) ), recipeButton, SLOT( setTitle( const QString& ) ) ); + connect( recipeButton, SIGNAL(clicked()), this, SLOT(switchToRecipe()) ); + connect( ( RecipeInputDialog * ) w, SIGNAL(titleChanged(QString)), recipe= Button, SLOT(setTitle(QString)) ); = } = diff --git a/src/models/kreallingheadersmodels.cpp b/src/models/kreallinghe= adersmodels.cpp index 61f9c0ed..6c0af521 100644 --- a/src/models/kreallingheadersmodels.cpp +++ b/src/models/kreallingheadersmodels.cpp @@ -28,12 +28,12 @@ KreAllIngHeadersModels::KreAllIngHeadersModels( RecipeD= B * database ): m_ingHeaderNameCompletion =3D new KCompletion; = //Connect signals and slots for model updating - connect( database, SIGNAL(ingHeaderCreated(const KreIngHeader &)), - this, SLOT(ingHeaderCreatedDBSlot(const KreIngHeader &)) ); - connect( database, SIGNAL(ingHeaderModified(const KreIngHeader &)), - this, SLOT(ingHeaderModifiedDBSlot(const KreIngHeader &)) ); - connect( database, SIGNAL(ingHeaderRemoved(const QVariant &)), - this, SLOT(ingHeaderRemovedDBSlot(const QVariant &)) ); + connect( database, SIGNAL(ingHeaderCreated(KreIngHeader)), + this, SLOT(ingHeaderCreatedDBSlot(KreIngHeader)) ); + connect( database, SIGNAL(ingHeaderModified(KreIngHeader)), + this, SLOT(ingHeaderModifiedDBSlot(KreIngHeader)) ); + connect( database, SIGNAL(ingHeaderRemoved(QVariant)), + this, SLOT(ingHeaderRemovedDBSlot(QVariant)) ); } = KreAllIngHeadersModels::~KreAllIngHeadersModels() diff --git a/src/models/kreallingredientsmodels.cpp b/src/models/kreallingr= edientsmodels.cpp index 8f0a47de..8b09d64f 100644 --- a/src/models/kreallingredientsmodels.cpp +++ b/src/models/kreallingredientsmodels.cpp @@ -28,12 +28,12 @@ KreAllIngredientsModels::KreAllIngredientsModels( Recip= eDB * database ): m_ingredientNameCompletion =3D new KCompletion; = //Connect signals and slots for model updating - connect( database, SIGNAL(ingredientCreated(const KreIngredient &)), - this, SLOT(ingredientCreatedDBSlot(const KreIngredient &)) ); - connect( database, SIGNAL(ingredientModified(const KreIngredient &)), - this, SLOT(ingredientModifiedDBSlot(const KreIngredient &)) ); - connect( database, SIGNAL(ingredientRemoved(const QVariant &)), - this, SLOT(ingredientRemovedDBSlot(const QVariant &)) ); + connect( database, SIGNAL(ingredientCreated(KreIngredient)), + this, SLOT(ingredientCreatedDBSlot(KreIngredient)) ); + connect( database, SIGNAL(ingredientModified(KreIngredient)), + this, SLOT(ingredientModifiedDBSlot(KreIngredient)) ); + connect( database, SIGNAL(ingredientRemoved(QVariant)), + this, SLOT(ingredientRemovedDBSlot(QVariant)) ); } = KreAllIngredientsModels::~KreAllIngredientsModels() diff --git a/src/widgets/amountunitinput.cpp b/src/widgets/amountunitinput.= cpp index 81e099ee..5be19880 100644 --- a/src/widgets/amountunitinput.cpp +++ b/src/widgets/amountunitinput.cpp @@ -25,7 +25,7 @@ AmountUnitInput::AmountUnitInput( QWidget *parent, Recipe= DB *database, Unit::Typ unitBox =3D new UnitComboBox(this,database,type); unitBox->reload(); = - connect( amountInput, SIGNAL(valueChanged(const MixedNumber &)), SLOT(emi= tValueChanged()) ); + connect( amountInput, SIGNAL(valueChanged(MixedNumber)), SLOT(emitValueCh= anged()) ); connect( unitBox, SIGNAL(activated(int)), SLOT(emitValueChanged()) ); connect( amountInput, SIGNAL(returnPressed()), SIGNAL(doneEditing()) ); } @@ -42,7 +42,7 @@ void AmountUnitInput::setAmount( const MixedNumber &amoun= t ) amountInput->clear(); else amountInput->setValue( amount, 0 ); - connect( amountInput, SIGNAL(valueChanged(const MixedNumber &)), SLOT(emi= tValueChanged()) ); + connect( amountInput, SIGNAL(valueChanged(MixedNumber)), SLOT(emitValueCh= anged()) ); } = void AmountUnitInput::setUnit( const Unit &unit ) diff --git a/src/widgets/categorycombobox.cpp b/src/widgets/categorycombobo= x.cpp index 1cf69b2b..61f980c6 100644 --- a/src/widgets/categorycombobox.cpp +++ b/src/widgets/categorycombobox.cpp @@ -26,10 +26,10 @@ CategoryComboBox::CategoryComboBox( QWidget *parent, Re= cipeDB *db ) : KComboBox( database( db ), m_offset(0) { - connect( database, SIGNAL( categoryCreated( const Element &, int ) ), SLO= T( createCategory( const Element &, int ) ) ); - connect( database, SIGNAL( categoryRemoved( int ) ), SLOT( removeCategory= ( int ) ) ); - connect( database, SIGNAL( categoryModified( const Element & ) ), SLOT( m= odifyCategory( const Element & ) ) ); - connect( database, SIGNAL( categoriesMerged( int, int ) ), SLOT( mergeCat= egories( int, int ) ) ); + connect( database, SIGNAL(categoryCreated(Element,int)), SLOT(createCateg= ory(Element,int)) ); + connect( database, SIGNAL(categoryRemoved(int)), SLOT(removeCategory(int)= ) ); + connect( database, SIGNAL(categoryModified(Element)), SLOT(modifyCategory= (Element)) ); + connect( database, SIGNAL(categoriesMerged(int,int)), SLOT(mergeCategorie= s(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/src/widgets/categorylistview.cpp b/src/widgets/categorylistvie= w.cpp index c27a189c..489adb88 100644 --- a/src/widgets/categorylistview.cpp +++ b/src/widgets/categorylistview.cpp @@ -139,21 +139,21 @@ void CategoryListItem::setText( int column, const QSt= ring &text ) CategoryListView::CategoryListView( QWidget *parent, RecipeDB *db ) : DBLi= stViewBase( parent, db, db->categoryTopLevelCount() ), m_item_to_delete(0) { - //connect( this, SIGNAL( spacePressed(QListViewItem*) ), SLOT( open(QList= ViewItem*) ) ); - //connect( this, SIGNAL( returnPressed(QListViewItem*) ), SLOT( open(QLis= tViewItem*) ) ); - //connect( this, SIGNAL( executed(QListViewItem*) ), SLOT( open(QListView= Item*) ) ); + //connect( this, SIGNAL(spacePressed(QListViewItem*)), SLOT(open(QListVie= wItem*)) ); + //connect( this, SIGNAL(returnPressed(QListViewItem*)), SLOT(open(QListVi= ewItem*)) ); + //connect( this, SIGNAL(executed(QListViewItem*)), SLOT(open(QListViewIte= m*)) ); = - connect( this, SIGNAL( expanded(Q3ListViewItem*) ), SLOT( open(Q3ListView= Item*) ) ); + connect( this, SIGNAL(expanded(Q3ListViewItem*)), SLOT(open(Q3ListViewIte= m*)) ); = setRootIsDecorated( true ); setAllColumnsShowFocus( true ); setDefaultRenameAction( Q3ListView::Reject ); = - connect( database, SIGNAL( categoryCreated( const Element &, int ) ), SLO= T( checkCreateCategory( const Element &, int ) ) ); - connect( database, SIGNAL( categoryRemoved( int ) ), SLOT( removeCategory= ( int ) ) ); - connect( database, SIGNAL( categoryModified( const Element & ) ), SLOT( m= odifyCategory( const Element & ) ) ); - connect( database, SIGNAL( categoryModified( int, int ) ), SLOT( modifyCa= tegory( int, int ) ) ); - connect( database, SIGNAL( categoriesMerged( int, int ) ), SLOT( mergeCat= egories( int, int ) ) ); + connect( database, SIGNAL(categoryCreated(Element,int)), SLOT(checkCreate= Category(Element,int)) ); + connect( database, SIGNAL(categoryRemoved(int)), SLOT(removeCategory(int)= ) ); + connect( database, SIGNAL(categoryModified(Element)), SLOT(modifyCategory= (Element)) ); + connect( database, SIGNAL(categoryModified(int,int)), SLOT(modifyCategory= (int,int)) ); + connect( database, SIGNAL(categoriesMerged(int,int)), SLOT(mergeCategorie= s(int,int)) ); } = // (Re)loads the data from the database diff --git a/src/widgets/criteriacombobox.cpp b/src/widgets/criteriacombobo= x.cpp index d9fefd29..690dc9b9 100644 --- a/src/widgets/criteriacombobox.cpp +++ b/src/widgets/criteriacombobox.cpp @@ -15,7 +15,7 @@ CriteriaComboBox::CriteriaComboBox( bool b, QWidget *parent, RecipeDB *db = ) : KComboBox( b, parent ), database( db ) { - connect( db, SIGNAL(ratingCriteriaCreated(const Element &)), this, SLOT(a= ddCriteria(const Element &)) ); + connect( db, SIGNAL(ratingCriteriaCreated(Element)), this, SLOT(addCriter= ia(Element)) ); } = void CriteriaComboBox::addCriteria( const Element &criteria ) diff --git a/src/widgets/headercombobox.cpp b/src/widgets/headercombobox.cpp index 1c751242..a6712660 100644 --- a/src/widgets/headercombobox.cpp +++ b/src/widgets/headercombobox.cpp @@ -19,10 +19,10 @@ HeaderComboBox::HeaderComboBox( bool b, QWidget *parent, RecipeDB *db ) : = KComboBox( b, parent ), database( db ) { - connect( database, SIGNAL( ingGroupCreated(const Element &) ), - this, SLOT( createHeader(const Element &) ) ); - connect( database, SIGNAL( ingGroupRemoved(int) ), - this, SLOT( removeHeader(int) ) ); + connect( database, SIGNAL(ingGroupCreated(Element)), + this, SLOT(createHeader(Element)) ); + connect( database, SIGNAL(ingGroupRemoved(int)), + this, SLOT(removeHeader(int)) ); } = void HeaderComboBox::reload() diff --git a/src/widgets/ingredientcombobox.cpp b/src/widgets/ingredientcom= bobox.cpp index 6a45c46d..30778408 100644 --- a/src/widgets/ingredientcombobox.cpp +++ b/src/widgets/ingredientcombobox.cpp @@ -55,8 +55,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( removeIngred= ient( int ) ) ); + connect( database, SIGNAL(ingredientCreated(Element)), SLOT(createIngredi= ent(Element)) ); + connect( database, SIGNAL(ingredientRemoved(int)), SLOT(removeIngredient(= int)) ); } = void IngredientComboBox::loadMore() @@ -100,8 +100,8 @@ void IngredientComboBox::endLoad() load_timer->stop(); = //now we're ready to receive ingredient created/removed events from the d= atabase - connect( database, SIGNAL( ingredientCreated( const Element & ) ), SLOT( = createIngredient( const Element & ) ) ); - connect( database, SIGNAL( ingredientRemoved( int ) ), SLOT( removeIngred= ient( int ) ) ); + connect( database, SIGNAL(ingredientCreated(Element)), SLOT(createIngredi= ent(Element)) ); + connect( database, SIGNAL(ingredientRemoved(int)), SLOT(removeIngredient(= int)) ); } = int IngredientComboBox::id( int row ) diff --git a/src/widgets/ingredientlistview.cpp b/src/widgets/ingredientlis= tview.cpp index 389a736b..8083d001 100644 --- a/src/widgets/ingredientlistview.cpp +++ b/src/widgets/ingredientlistview.cpp @@ -79,8 +79,8 @@ IngredientListView::IngredientListView( QWidget *parent, = RecipeDB *db ) : DBList { setAllColumnsShowFocus( true ); setDefaultRenameAction( Q3ListView::Reject ); - connect( database, SIGNAL( ingredientCreated( const Element & ) ), SLOT( = checkCreateIngredient( const Element & ) ) ); - connect( database, SIGNAL( ingredientRemoved( int ) ), SLOT( removeIngred= ient( int ) ) ); + connect( database, SIGNAL(ingredientCreated(Element)), SLOT(checkCreateIn= gredient(Element)) ); + connect( database, SIGNAL(ingredientRemoved(int)), SLOT(removeIngredient(= int)) ); } = void IngredientListView::load( int limit, int offset ) diff --git a/src/widgets/kdateedit.cpp b/src/widgets/kdateedit.cpp index 91553be1..7a7eafde 100644 --- a/src/widgets/kdateedit.cpp +++ b/src/widgets/kdateedit.cpp @@ -91,18 +91,18 @@ KDateEdit::KDateEdit( QWidget *parent, const char *name= ) //setSizeAdjustPolicy( AdjustToContents ); setMinimumSize( sizeHint() ); = - connect( lineEdit(), SIGNAL( returnPressed() ), - this, SLOT( lineEnterPressed() ) ); - connect( this, SIGNAL( textChanged( const QString& ) ), - SLOT( slotTextChanged( const QString& ) ) ); + connect( lineEdit(), SIGNAL(returnPressed()), + this, SLOT(lineEnterPressed()) ); + connect( this, SIGNAL(textChanged(QString)), + SLOT(slotTextChanged(QString)) ); = mPopup =3D new KDatePickerPopup( KDatePickerPopup::DatePicker | KDatePic= kerPopup::Words, QDate::currentDate(), this ); mPopup->hide(); mPopup->installEventFilter( this ); = - connect( mPopup, SIGNAL( dateChanged( const QDate& ) ), - SLOT( dateSelected( const QDate& ) ) ); + connect( mPopup, SIGNAL(dateChanged(QDate)), + SLOT(dateSelected(QDate)) ); = // handle keyword entry setupKeywords(); diff --git a/src/widgets/kdatepickerpopup.cpp b/src/widgets/kdatepickerpopu= p.cpp index 2378796a..ec5a8f5d 100644 --- a/src/widgets/kdatepickerpopup.cpp +++ b/src/widgets/kdatepickerpopup.cpp @@ -70,10 +70,10 @@ KDatePickerPopup::KDatePickerPopup( Items items, const = QDate &date, QWidget *par mDatePicker =3D new KDatePicker( this ); mDatePicker->setCloseButton( false ); = - connect( mDatePicker, SIGNAL( dateEntered( const QDate& ) ), - SLOT( slotDateChanged( const QDate& ) ) ); - connect( mDatePicker, SIGNAL( dateSelected( const QDate& ) ), - SLOT( slotDateChanged( const QDate& ) ) ); + connect( mDatePicker, SIGNAL(dateEntered(QDate)), + SLOT(slotDateChanged(QDate)) ); + connect( mDatePicker, SIGNAL(dateSelected(QDate)), + SLOT(slotDateChanged(QDate)) ); = mDatePicker->setDate( date ); = @@ -96,10 +96,10 @@ void KDatePickerPopup::buildMenu() } = if ( mItems & Words ) { - addAction( i18nc( "@option today", "&Today" ), this, SLOT( slotToday()= ) ); - addAction( i18nc( "@option yesterday", "&Yesterday" ), this, SLOT( slo= tYesterday() ) ); - addAction( i18nc( "@option last week", "Last &Week" ), this, SLOT( slo= tLastWeek() ) ); - addAction( i18nc( "@option last month", "Last M&onth" ), this, SLOT( s= lotLastMonth() ) ); + addAction( i18nc( "@option today", "&Today" ), this, SLOT(slotToday())= ); + addAction( i18nc( "@option yesterday", "&Yesterday" ), this, SLOT(slot= Yesterday()) ); + addAction( i18nc( "@option last week", "Last &Week" ), this, SLOT(slot= LastWeek()) ); + addAction( i18nc( "@option last month", "Last M&onth" ), this, SLOT(sl= otLastMonth()) ); = if ( mItems & NoDate ) { addSeparator(); @@ -107,7 +107,7 @@ void KDatePickerPopup::buildMenu() } = if ( mItems & NoDate ) { - addAction( i18nc( "@option do not specify a date", "No Date" ), this, = SLOT( slotNoDate() ) ); + addAction( i18nc( "@option do not specify a date", "No Date" ), this, = SLOT(slotNoDate()) ); } } = diff --git a/src/widgets/kreauthorlistwidget.cpp b/src/widgets/kreauthorlis= twidget.cpp index a23fb463..298cf527 100644 --- a/src/widgets/kreauthorlistwidget.cpp +++ b/src/widgets/kreauthorlistwidget.cpp @@ -40,10 +40,10 @@ KreAuthorListWidget::KreAuthorListWidget( QWidget *pare= nt, RecipeDB *db ): KConfigGroup config =3D KGlobal::config()->group( "Performance" ); setCurrentLimit( config.readEntry( "Limit", -1 ) ); = - connect( m_database, SIGNAL( authorCreated( const Element & ) ), = - SLOT( createAuthor( const Element & ) ) ); - connect( m_database, SIGNAL( authorRemoved( int ) ), = - SLOT( removeAuthor( int ) ) ); + connect( m_database, SIGNAL(authorCreated(Element)), = + SLOT(createAuthor(Element)) ); + connect( m_database, SIGNAL(authorRemoved(int)), = + SLOT(removeAuthor(int)) ); = } = @@ -75,8 +75,8 @@ void KreAuthorListWidget::load( int limit, int offset ) m_thread->setLimit( limit ); m_thread->setOffset( offset ); = - connect( m_thread, SIGNAL(loadFinished(const ElementList&,int)), = - this, SLOT(queryFinished(const ElementList&,int)), Qt::QueuedConnection = ); + connect( m_thread, SIGNAL(loadFinished(ElementList,int)), = + this, SLOT(queryFinished(ElementList,int)), Qt::QueuedConnection ); = kDebug() << "Starting thread."; m_thread->start(); diff --git a/src/widgets/krecategorieslistwidget.cpp b/src/widgets/krecateg= orieslistwidget.cpp index 9e5de8fc..369ecd85 100644 --- a/src/widgets/krecategorieslistwidget.cpp +++ b/src/widgets/krecategorieslistwidget.cpp @@ -56,17 +56,17 @@ KreCategoriesListWidget::KreCategoriesListWidget( QWidg= et *parent, RecipeDB *db, KConfigGroup configPerformance =3D KGlobal::config()->group( "Performance= " ); setCurrentLimit( configPerformance.readEntry( "CategoryLimit", -1 ) ); = - connect( m_database, SIGNAL( categoryCreated( const Element &, int) ), = - this, SLOT( createCategorySlot( const Element &, int ) ) ); - connect( m_database, SIGNAL( categoryModified( const Element & ) ), - SLOT( modifyCategory( const Element & ) ) ); - connect( m_database, SIGNAL( categoryModified( int, int ) ), - SLOT( modifyCategory( int, int ) ) ); - connect( m_database, SIGNAL( categoryRemoved( int ) ), = - SLOT( removeCategory( int ) ) ); - - connect( this, SIGNAL( itemsChanged( const QModelIndex &, const QModelInd= ex & ) ), - SLOT( itemsChangedSlot( const QModelIndex &, const QModelIndex & ) ) ); + connect( m_database, SIGNAL(categoryCreated(Element,int)), = + this, SLOT(createCategorySlot(Element,int)) ); + connect( m_database, SIGNAL(categoryModified(Element)), + SLOT(modifyCategory(Element)) ); + connect( m_database, SIGNAL(categoryModified(int,int)), + SLOT(modifyCategory(int,int)) ); + connect( m_database, SIGNAL(categoryRemoved(int)), = + SLOT(removeCategory(int)) ); + + connect( this, SIGNAL(itemsChanged(QModelIndex,QModelIndex)), + SLOT(itemsChangedSlot(QModelIndex,QModelIndex)) ); } = KreCategoriesListWidget::~KreCategoriesListWidget() diff --git a/src/widgets/kreconversiontable.cpp b/src/widgets/kreconversion= table.cpp index e5178577..c270ae87 100644 --- a/src/widgets/kreconversiontable.cpp +++ b/src/widgets/kreconversiontable.cpp @@ -21,10 +21,10 @@ KreConversionTable::KreConversionTable( QWidget* parent= , int maxrows, int maxcol m_textChanged =3D false; m_signalMapper =3D new QSignalMapper; m_signalMapperDeletion =3D new QSignalMapper; - connect( m_signalMapper, SIGNAL(mapped(const QString&)), - this, SLOT(onEditionFinished(const QString&)) ); - connect( m_signalMapperDeletion, SIGNAL(mapped(const QString&)), - this, SLOT(onCellEdited(const QString&)) ); + connect( m_signalMapper, SIGNAL(mapped(QString)), + this, SLOT(onEditionFinished(QString)) ); + connect( m_signalMapperDeletion, SIGNAL(mapped(QString)), + this, SLOT(onCellEdited(QString)) ); } = KreConversionTable::~KreConversionTable() @@ -96,7 +96,7 @@ void KreConversionTable::initTable() m_signalMapperDeletion->setMapping( editor, QString::number(r) + " " + QString::number(c) ); connect( editor, SIGNAL(editingFinished()), m_signalMapper, SLOT(map()= ) ); - connect( editor, SIGNAL(textEdited(const QString&)), m_signalMapperDel= etion, SLOT(map()) ); + connect( editor, SIGNAL(textEdited(QString)), m_signalMapperDeletion, = SLOT(map()) ); } } } diff --git a/src/widgets/kregenericlistwidget.cpp b/src/widgets/kregenericl= istwidget.cpp index 227203df..65a2e4f5 100644 --- a/src/widgets/kregenericlistwidget.cpp +++ b/src/widgets/kregenericlistwidget.cpp @@ -52,8 +52,8 @@ KreGenericListWidget::KreGenericListWidget( QWidget *pare= nt, RecipeDB *db ): ui->m_treeView->setRootIsDecorated( false ); ui->m_treeView->setUniformRowHeights( true ); ui->m_treeView->setContextMenuPolicy( Qt::CustomContextMenu ); - connect( ui->m_treeView, SIGNAL(customContextMenuRequested(const QPoint &= )), - this, SLOT(contextMenuSlot(const QPoint &)) ); + connect( ui->m_treeView, SIGNAL(customContextMenuRequested(QPoint)), + this, SLOT(contextMenuSlot(QPoint)) ); m_anim =3D new KPixmapSequenceWidget; m_anim->setVisible( false ); QGridLayout * layout =3D new QGridLayout; @@ -98,8 +98,8 @@ void KreGenericListWidget::setSearchAsYouType( bool value= ) { disconnect( ui->m_searchBox ); if (value) { - connect( ui->m_searchBox, SIGNAL(textChanged(const QString &)), - this, SLOT(setFilter(const QString &)) ); + connect( ui->m_searchBox, SIGNAL(textChanged(QString)), + this, SLOT(setFilter(QString)) ); } else { connect( ui->m_searchBox, SIGNAL(returnPressed()), this, SLOT(setFilter()) ); = @@ -152,8 +152,8 @@ void KreGenericListWidget::reload( ReloadFlags flags ) //Disconnect this signal, because calling load(...) may alter the model //data triggering this signal, we must restore this signal/slot connection //as soon as the load is finished. - disconnect( m_proxyModel, SIGNAL(dataChanged(const QModelIndex &, const Q= ModelIndex &)), - this, SIGNAL(itemsChanged(const QModelIndex &, const QModelIndex &)) ); + disconnect( m_proxyModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), + this, SIGNAL(itemsChanged(QModelIndex,QModelIndex)) ); = //Reload the current page. load( m_currentLimit, m_currentOffset ); @@ -170,8 +170,8 @@ void KreGenericListWidget::startAnimation() = void KreGenericListWidget::loadFinishedPrivateSlot() { - connect( m_proxyModel, SIGNAL(dataChanged(const QModelIndex &, const QMod= elIndex &)), - this, SIGNAL(itemsChanged(const QModelIndex &, const QModelIndex &)) ); + connect( m_proxyModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), + this, SIGNAL(itemsChanged(QModelIndex,QModelIndex)) ); m_loadFinished =3D true; m_anim->setVisible( false ); this->setEnabled( true ); diff --git a/src/widgets/kreheaderlistwidget.cpp b/src/widgets/kreheaderlis= twidget.cpp index b03f1ac8..cec5ce88 100644 --- a/src/widgets/kreheaderlistwidget.cpp +++ b/src/widgets/kreheaderlistwidget.cpp @@ -33,10 +33,10 @@ KreHeaderListWidget::KreHeaderListWidget( QWidget * par= ent, RecipeDB *db ): //setCurrentLimit( config.readEntry( "Limit", -1 ) ); = //Connect signals and slots. - connect( m_database, SIGNAL( ingGroupCreated( const Element & ) ), = - SLOT( createHeader( const Element & ) ) ); - connect( m_database, SIGNAL( ingGroupRemoved( int ) ), = - SLOT( removeHeader( int ) ) ); + connect( m_database, SIGNAL(ingGroupCreated(Element)), = + SLOT(createHeader(Element)) ); + connect( m_database, SIGNAL(ingGroupRemoved(int)), = + SLOT(removeHeader(int)) ); } = = diff --git a/src/widgets/kreingredientlistwidget.cpp b/src/widgets/kreingre= dientlistwidget.cpp index bd0cb82f..e636ad44 100644 --- a/src/widgets/kreingredientlistwidget.cpp +++ b/src/widgets/kreingredientlistwidget.cpp @@ -32,10 +32,10 @@ KreIngredientListWidget::KreIngredientListWidget( QWidg= et * parent, RecipeDB *db setCurrentLimit( config.readEntry( "Limit", -1 ) ); = //Connect signals and slots. - connect( m_database, SIGNAL( ingredientCreated( const Element & ) ), = - SLOT( createIngredient( const Element & ) ) ); - connect( m_database, SIGNAL( ingredientRemoved( int ) ), = - SLOT( removeIngredient( int ) ) ); + connect( m_database, SIGNAL(ingredientCreated(Element)), = + SLOT(createIngredient(Element)) ); + connect( m_database, SIGNAL(ingredientRemoved(int)), = + SLOT(removeIngredient(int)) ); } = = diff --git a/src/widgets/krelistview.cpp b/src/widgets/krelistview.cpp index b74d8d85..c25a7fc1 100644 --- a/src/widgets/krelistview.cpp +++ b/src/widgets/krelistview.cpp @@ -55,7 +55,7 @@ KreListView::KreListView( QWidget *parent, const QString = &title, bool filter, in filterLabel->setText( ' ' + i18nc( "@label:textbox Search recipes", "Sea= rch:" ) ); filterEdit =3D new KLineEdit( filterBox ); filterEdit->setClearButtonShown( true ); - connect( filterEdit, SIGNAL( clearButtonClicked() ), this, SLOT( clearSe= arch() ) ); + connect( filterEdit, SIGNAL(clearButtonClicked()), this, SLOT(clearSearc= h()) ); } = list =3D new K3ListView( this ); @@ -70,13 +70,13 @@ KreListView::KreListView( QWidget *parent, const QStrin= g &title, bool filter, in } //Connect Signals & Slots if ( filter ) { - connect( filterEdit, SIGNAL( textChanged( const QString& ) ), SIGNAL( te= xtChanged(const QString&) ) ); - connect( filterEdit, SIGNAL( returnPressed( const QString& ) ), SIGNAL( = returnPressed(const QString&) ) ); + connect( filterEdit, SIGNAL(textChanged(QString)), SIGNAL(textChanged(QS= tring)) ); + connect( filterEdit, SIGNAL(returnPressed(QString)), SIGNAL(returnPresse= d(QString)) ); KConfigGroup config (KGlobal::config(), "Performance" ); if ( config.readEntry("SearchAsYouType",true) ) - connect( this, SIGNAL( textChanged( const QString& ) ), SLOT( filter( c= onst QString& ) ) ); + connect( this, SIGNAL(textChanged(QString)), SLOT(filter(QString)) ); else - connect( this, SIGNAL( returnPressed( const QString& ) ), SLOT( filter(= const QString& ) ) ); + connect( this, SIGNAL(returnPressed(QString)), SLOT(filter(QString)) ); } } = @@ -118,11 +118,11 @@ void KreListView::setCustomFilter( QObject *receiver,= const char *slot ) { KConfigGroup config (KGlobal::config(), "Performance" ); if ( config.readEntry("SearchAsYouType",true) ) { - disconnect( this, SIGNAL( textChanged( const QString& ) ), this, SLOT( f= ilter( const QString& ) ) ); - connect( this, SIGNAL( textChanged( const QString& ) ), receiver, slot ); + disconnect( this, SIGNAL(textChanged(QString)), this, SLOT(filter(QStrin= g)) ); + connect( this, SIGNAL(textChanged(QString)), receiver, slot ); } else { - disconnect( this, SIGNAL( returnPressed( const QString& ) ), this, SLOT(= filter( const QString& ) ) ); - connect( this, SIGNAL( returnPressed( const QString& ) ), receiver, slot= ); + disconnect( this, SIGNAL(returnPressed(QString)), this, SLOT(filter(QStr= ing)) ); + connect( this, SIGNAL(returnPressed(QString)), receiver, slot ); } } = @@ -130,8 +130,8 @@ void KreListView::setListView( DBListViewBase *list_vie= w ) { delete list; = - connect( list_view, SIGNAL( nextGroupLoaded() ), SLOT( refilter() ) ); - connect( list_view, SIGNAL( prevGroupLoaded() ), SLOT( refilter() ) ); + connect( list_view, SIGNAL(nextGroupLoaded()), SLOT(refilter()) ); + connect( list_view, SIGNAL(prevGroupLoaded()), SLOT(refilter()) ); list =3D list_view; list->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::MinimumExpanding = ); } diff --git a/src/widgets/kremenu.cpp b/src/widgets/kremenu.cpp index 70ef8b84..c904d0a4 100644 --- a/src/widgets/kremenu.cpp +++ b/src/widgets/kremenu.cpp @@ -71,7 +71,7 @@ void KreMenu::childEvent ( QChildEvent *e ) else button->show(); = - connect ( button, SIGNAL( clicked( KreMenuButton* ) ), this, SLOT( coll= ectClicks( KreMenuButton* ) ) ); + connect ( button, SIGNAL(clicked(KreMenuButton*)), this, SLOT(collectCl= icks(KreMenuButton*)) ); } } else if ( e->type() =3D=3D QChildEvent::ChildRemoved ) { @@ -129,8 +129,8 @@ MenuId KreMenu::createSubMenu( const QString &title, co= nst QString &icon ) newSubMenuButton->setTitle( i18nc("@action:button Up to top menu", "Up..= ." ) ); newSubMenuButton->setIconSet( KIcon( "arrow-up" ) ); = - connect( newMenuButton, SIGNAL( clicked( MenuId ) ), this, SLOT( showMenu= ( MenuId ) ) ); - connect( newSubMenuButton, SIGNAL( clicked( MenuId ) ), this, SLOT( showM= enu( MenuId ) ) ); + connect( newMenuButton, SIGNAL(clicked(MenuId)), this, SLOT(showMenu(Menu= Id)) ); + connect( newSubMenuButton, SIGNAL(clicked(MenuId)), this, SLOT(showMenu(M= enuId)) ); = = return id; @@ -303,8 +303,8 @@ KreMenuButton::KreMenuButton( KreMenu *parent, KrePanel= _panel, MenuId id ): subMenuId =3D MenuId(); // 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, SIGNAL(resized(int,int)), this, SLOT(rescale()) ); + connect( this, SIGNAL(clicked()), this, SLOT(forwardClicks()) ); setCursor( QCursor( Qt::PointingHandCursor ) ); } = diff --git a/src/widgets/kreprepmethodlistwidget.cpp b/src/widgets/kreprepm= ethodlistwidget.cpp index 12ffd1a7..fa58302a 100644 --- a/src/widgets/kreprepmethodlistwidget.cpp +++ b/src/widgets/kreprepmethodlistwidget.cpp @@ -29,8 +29,8 @@ KrePrepMethodListWidget::KrePrepMethodListWidget( QWidget= *parent, RecipeDB *db KConfigGroup config =3D KGlobal::config()->group( "Performance" ); setCurrentLimit( config.readEntry( "Limit", -1 ) ); = - connect( m_database, SIGNAL( prepMethodCreated( const Element & ) ), SLOT= ( createPrepMethod( const Element & ) ) ); - connect( m_database, SIGNAL( prepMethodRemoved( int ) ), SLOT( removePrep= Method( int ) ) ); + connect( m_database, SIGNAL(prepMethodCreated(Element)), SLOT(createPrepM= ethod(Element)) ); + connect( m_database, SIGNAL(prepMethodRemoved(int)), SLOT(removePrepMetho= d(int)) ); = } = diff --git a/src/widgets/krepropertylistwidget.cpp b/src/widgets/krepropert= ylistwidget.cpp index 72813526..7c52fb8a 100644 --- a/src/widgets/krepropertylistwidget.cpp +++ b/src/widgets/krepropertylistwidget.cpp @@ -37,10 +37,10 @@ KrePropertyListWidget::KrePropertyListWidget( QWidget *= parent, RecipeDB * db ): m_sourceModel->setHorizontalHeaderLabels( horizontalLabels ); = //Connect signals and slots. - connect( m_database, SIGNAL( propertyCreated( const IngredientProperty & = ) ), - this, SLOT( createProperty( const IngredientProperty & ) ) ); - connect( m_database, SIGNAL( propertyRemoved( int ) ), - this, SLOT( removeProperty( int ) ) ); + connect( m_database, SIGNAL(propertyCreated(IngredientProperty)), + this, SLOT(createProperty(IngredientProperty)) ); + connect( m_database, SIGNAL(propertyRemoved(int)), + this, SLOT(removeProperty(int)) ); } = int KrePropertyListWidget::elementCount() diff --git a/src/widgets/krerecipeslistwidget.cpp b/src/widgets/krerecipesl= istwidget.cpp index 71e4a101..58afa98c 100644 --- a/src/widgets/krerecipeslistwidget.cpp +++ b/src/widgets/krerecipeslistwidget.cpp @@ -33,12 +33,12 @@ KreRecipesListWidget::KreRecipesListWidget( QWidget *pa= rent, RecipeDB *db ): horizontalLabels << i18nc( "@title:column", "Recipes" ) << i18nc( = "@title:column", "Id" ); m_sourceModel->setHorizontalHeaderLabels( horizontalLabels ); = - connect( ui->m_treeView, SIGNAL( doubleClicked(const QModelIndex &) ), - this, SIGNAL( doubleClicked(const QModelIndex &) ) ); + connect( ui->m_treeView, SIGNAL(doubleClicked(QModelIndex)), + this, SIGNAL(doubleClicked(QModelIndex)) ); = //Connect signals and slots from the database - connect( m_database, SIGNAL( categoryCreated(const Element &, int) ), - this, SLOT( createCategorySlot(const Element &, int) ) ); + connect( m_database, SIGNAL(categoryCreated(Element,int)), + this, SLOT(createCategorySlot(Element,int)) ); //TODO: connect the following signals from database // right now they are not needed but will be in the future. //void categoryRemoved( int id ); @@ -46,17 +46,17 @@ KreRecipesListWidget::KreRecipesListWidget( QWidget *pa= rent, RecipeDB *db ): //void categoryModified( int id, int parent_id ); //void categoriesMerged( int id1, int id2 ); //void recipeCreated( const Element &, const ElementList &categories ); - connect( m_database, SIGNAL( recipeRemoved(int) ), - this, SLOT( removeRecipeSlot(int) ) ); - connect( m_database, SIGNAL( recipeRemoved(int, int) ), - this, SLOT( removeRecipeFromCategorySlot(int, int) ) ); - connect( m_database, SIGNAL( recipeModified(const Element &, const Elemen= tList &) ), - this, SLOT( modifyRecipeSlot(const Element &, const ElementList &) ) ); + connect( m_database, SIGNAL(recipeRemoved(int)), + this, SLOT(removeRecipeSlot(int)) ); + connect( m_database, SIGNAL(recipeRemoved(int,int)), + this, SLOT(removeRecipeFromCategorySlot(int,int)) ); + connect( m_database, SIGNAL(recipeModified(Element,ElementList)), + this, SLOT(modifyRecipeSlot(Element,ElementList)) ); = //Needed to update the lists of ids of the selected elements and to trigg= er //our elementSelected signal. - connect( ui->m_treeView->selectionModel(), SIGNAL( selectionChanged(const= QItemSelection &, const QItemSelection &) ), = - this, SLOT( selectionChangedSlot(const QItemSelection &, const QItemSele= ction &) ) ); + connect( ui->m_treeView->selectionModel(), SIGNAL(selectionChanged(QItemS= election,QItemSelection)), = + this, SLOT(selectionChangedSlot(QItemSelection,QItemSelection)) ); } = void KreRecipesListWidget::createCategorySlot( const Element & category, i= nt parent_id ) diff --git a/src/widgets/kretextedit.cpp b/src/widgets/kretextedit.cpp index a0773495..38c29e52 100644 --- a/src/widgets/kretextedit.cpp +++ b/src/widgets/kretextedit.cpp @@ -55,7 +55,7 @@ KreTextEdit::KreTextEdit( QWidget *parent ): else setCheckSpellingEnabled( false ); = - //connect( this, SIGNAL( clicked( int, int ) ), SLOT( haltCompletion() ) = ); + //connect( this, SIGNAL(clicked(int,int)), SLOT(haltCompletion()) ); } = void KreTextEdit::createHighlighter() diff --git a/src/widgets/kreunitlistwidget.cpp b/src/widgets/kreunitlistwid= get.cpp index b08dfad3..ea7b68c8 100644 --- a/src/widgets/kreunitlistwidget.cpp +++ b/src/widgets/kreunitlistwidget.cpp @@ -34,10 +34,10 @@ KreUnitListWidget::KreUnitListWidget( QWidget *parent, = RecipeDB *db ) : KreGener m_sourceModel->setHorizontalHeaderLabels( horizontalLabels ); = //Connect signals and slots. - connect( m_database, SIGNAL( unitCreated( const Unit & ) ), - this, SLOT( createUnit( const Unit & ) ) ); - connect( m_database, SIGNAL( unitRemoved( int ) ), - this, SLOT( removeUnit( int ) ) ); + connect( m_database, SIGNAL(unitCreated(Unit)), + this, SLOT(createUnit(Unit)) ); + connect( m_database, SIGNAL(unitRemoved(int)), + this, SLOT(removeUnit(int)) ); } = void KreUnitListWidget::load( int limit, int offset ) diff --git a/src/widgets/prepmethodcombobox.cpp b/src/widgets/prepmethodcom= bobox.cpp index 1f9a728f..6b8fc27a 100644 --- a/src/widgets/prepmethodcombobox.cpp +++ b/src/widgets/prepmethodcombobox.cpp @@ -85,8 +85,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( removePrepMe= thod( int ) ) ); + connect( database, SIGNAL(prepMethodCreated(Element)), SLOT(createPrepMet= hod(Element)) ); + connect( database, SIGNAL(prepMethodRemoved(int)), SLOT(removePrepMethod(= int)) ); } = int PrepMethodComboBox::id( int row ) diff --git a/src/widgets/propertylistview.cpp b/src/widgets/propertylistvie= w.cpp index a1d54a9b..f70fd362 100644 --- a/src/widgets/propertylistview.cpp +++ b/src/widgets/propertylistview.cpp @@ -98,8 +98,8 @@ PropertyListView::PropertyListView( QWidget *parent, Reci= peDB *db ) : setAllColumnsShowFocus( true ); setDefaultRenameAction( Q3ListView::Reject ); = - connect( db, SIGNAL( propertyCreated( const IngredientProperty & ) ), SLO= T( createProperty( const IngredientProperty & ) ) ); - connect( db, SIGNAL( propertyRemoved( int ) ), SLOT( removeProperty( int = ) ) ); + connect( db, SIGNAL(propertyCreated(IngredientProperty)), SLOT(createProp= erty(IngredientProperty)) ); + connect( db, SIGNAL(propertyRemoved(int)), SLOT(removeProperty(int)) ); } = void PropertyListView::reload() diff --git a/src/widgets/unitcombobox.cpp b/src/widgets/unitcombobox.cpp index 0e1b8e41..e29a91d8 100644 --- a/src/widgets/unitcombobox.cpp +++ b/src/widgets/unitcombobox.cpp @@ -19,8 +19,8 @@ UnitComboBox::UnitComboBox( QWidget *parent, RecipeDB *db, Unit::Type type= ) : KComboBox( parent ), database( db ), m_type(type) { - connect( database, SIGNAL( unitCreated( const Unit & ) ), SLOT( createUni= t( const Unit & ) ) ); - connect( database, SIGNAL( unitRemoved( int ) ), SLOT( removeUnit( int ) = ) ); + connect( database, SIGNAL(unitCreated(Unit)), SLOT(createUnit(Unit)) ); + connect( database, SIGNAL(unitRemoved(int)), SLOT(removeUnit(int)) ); } = void UnitComboBox::popup()