And the final set of what is easily converted to qt5 style connect calls

speshak · Jan 27, 2017 · c2c2d55 · c2c2d55
1 parent cb19447
commit c2c2d55
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 32 deletions.
diff --git a/src/RefractoDialog.cpp b/src/RefractoDialog.cpp
@@ -30,7 +30,7 @@ RefractoDialog::RefractoDialog(QWidget* parent) : QDialog(parent)
 {
    setupUi(this);
 
-   connect( pushButton_calculate, SIGNAL( clicked() ), this, SLOT( calculate() ) );
+   connect( pushButton_calculate, &QAbstractButton::clicked, this, &RefractoDialog::calculate );
 }
 
 RefractoDialog::~RefractoDialog()

diff --git a/src/StrikeWaterDialog.cpp b/src/StrikeWaterDialog.cpp
@@ -29,7 +29,7 @@ const double StrikeWaterDialog::specificHeatBarley = 0.41;
 StrikeWaterDialog::StrikeWaterDialog(QWidget* parent) : QDialog(parent)
 {
    setupUi(this);
-   connect(pushButton_calculate, SIGNAL(clicked()), this, SLOT(calculate()));
+   connect(pushButton_calculate, &QAbstractButton::clicked, this, &StrikeWaterDialog::calculate);
 }
 
 StrikeWaterDialog::~StrikeWaterDialog() {}

diff --git a/src/StyleButton.cpp b/src/StyleButton.cpp
@@ -40,7 +40,7 @@ void StyleButton::setRecipe(Recipe* rec)
    _rec = rec;
    if( _rec )
    {
-      connect( _rec, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(recChanged(QMetaProperty,QVariant)) );
+      connect( _rec, &BeerXMLElement::changed, this, &StyleButton::recChanged );
       setStyle( _rec->style() );
    }
    else
@@ -55,7 +55,7 @@ void StyleButton::setStyle(Style* style)
    _style = style;
    if( _style )
    {
-      connect( _style, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(styleChanged(QMetaProperty,QVariant)) );
+      connect( _style, &BeerXMLElement::changed, this, &StyleButton::styleChanged );
       setText( _style->name() );
    }
    else

diff --git a/src/StyleEditor.cpp b/src/StyleEditor.cpp
@@ -49,10 +49,10 @@ StyleEditor::StyleEditor(QWidget* parent, bool singleStyleEditor)
    styleProxyModel->setSourceModel(styleListModel);
    styleComboBox->setModel(styleProxyModel);
 
-   connect( pushButton_save, SIGNAL( clicked() ), this, SLOT( save() ) );
+   connect( pushButton_save, &QAbstractButton::clicked, this, &StyleEditor::save );
    connect( pushButton_new, SIGNAL( clicked() ), this, SLOT( newStyle() ) );
-   connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( clearAndClose() ) );
-   connect( pushButton_remove, SIGNAL( clicked() ), this, SLOT(removeStyle()) );
+   connect( pushButton_cancel, &QAbstractButton::clicked, this, &StyleEditor::clearAndClose );
+   connect( pushButton_remove, &QAbstractButton::clicked, this, &StyleEditor::removeStyle );
    connect( styleComboBox, SIGNAL(activated( const QString& )), this, SLOT( styleSelected(const QString&) ) );
 
    setStyle( styleListModel->at(styleComboBox->currentIndex()));
@@ -66,7 +66,7 @@ void StyleEditor::setStyle( Style* s )
    obsStyle = s;
    if( obsStyle )
    {
-      connect( obsStyle, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(changed(QMetaProperty,QVariant)) );
+      connect( obsStyle, &BeerXMLElement::changed, this, &StyleEditor::changed );
       showChanges();
    }
 

diff --git a/src/StyleListModel.cpp b/src/StyleListModel.cpp
@@ -26,7 +26,7 @@
 StyleListModel::StyleListModel(QWidget* parent)
    : QAbstractListModel(parent), recipe(0)
 {
-   connect( &(Database::instance()), SIGNAL(newStyleSignal(Style*)), this, SLOT(addStyle(Style*)) );
+   connect( &(Database::instance()), &Database::newStyleSignal, this, &StyleListModel::addStyle );
    connect( &(Database::instance()), SIGNAL(deletedSignal(Style*)), this, SLOT(removeStyle(Style*)) );
    repopulateList();
 }
@@ -41,7 +41,7 @@ void StyleListModel::addStyle(Style* s)
       int size = styles.size();
       beginInsertRows( QModelIndex(), size, size );
       styles.append(s);
-      connect( s, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(styleChanged(QMetaProperty,QVariant)) );
+      connect( s, &BeerXMLElement::changed, this, &StyleListModel::styleChanged );
       endInsertRows();
    }
 }
@@ -64,7 +64,7 @@ void StyleListModel::addStyles(QList<Style*> s)
       styles.append(tmp);
 
       for( i = tmp.begin(); i != tmp.end(); i++ )
-         connect( *i, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(styleChanged(QMetaProperty,QVariant)) );
+         connect( *i, &BeerXMLElement::changed, this, &StyleListModel::styleChanged );
 
       endInsertRows();
    }

diff --git a/src/TimerMainDialog.cpp b/src/TimerMainDialog.cpp
@@ -37,8 +37,8 @@ TimerMainDialog::TimerMainDialog(MainWindow* parent) : QDialog(parent),
    updateTime();
 
    //Connections
-   connect(boilTime, SIGNAL(BoilTimeChanged()), this, SLOT(decrementTimer()));
-   connect(boilTime, SIGNAL(timesUp()), this, SLOT(timesUp()));
+   connect(boilTime, &BoilTime::BoilTimeChanged, this, &TimerMainDialog::decrementTimer);
+   connect(boilTime, &BoilTime::timesUp, this, &TimerMainDialog::timesUp);
 
    retranslateUi(this);
 }

diff --git a/src/TimerWidget.cpp b/src/TimerWidget.cpp
@@ -70,8 +70,8 @@ TimerWidget::TimerWidget(TimerMainDialog *parent, BoilTime* bt) :
     retranslateUi(this);
 
     //Connections
-    connect(boilTime, SIGNAL(BoilTimeChanged()), this, SLOT(decrementTime()));
-    connect(boilTime, SIGNAL(timesUp()), this, SLOT(decrementTime()));
+    connect(boilTime, &BoilTime::BoilTimeChanged, this, &TimerWidget::decrementTime);
+    connect(boilTime, &BoilTime::timesUp, this, &TimerWidget::decrementTime);
 }
 
 TimerWidget::~TimerWidget()

diff --git a/src/WaterEditor.cpp b/src/WaterEditor.cpp
@@ -36,7 +36,7 @@ void WaterEditor::setWater(Water *water)
    obs = water;
    if( obs )
    {
-      connect( obs, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(changed(QMetaProperty,QVariant)) );
+      connect( obs, &BeerXMLElement::changed, this, &WaterEditor::changed );
       showChanges();
    }
 }

diff --git a/src/WaterTableModel.cpp b/src/WaterTableModel.cpp
@@ -54,7 +54,7 @@ void WaterTableModel::observeRecipe(Recipe* rec)
    recObs = rec;
    if( recObs )
    {
-      connect( recObs, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(changed(QMetaProperty,QVariant)) );
+      connect( recObs, &BeerXMLElement::changed, this, &WaterTableModel::changed );
       addWaters( recObs->waters() );
    }
 }
@@ -65,7 +65,7 @@ void WaterTableModel::observeDatabase(bool val)
    {
       observeRecipe(0);
       removeAll();
-      connect( &(Database::instance()), SIGNAL(newWaterSignal(Water*)), this, SLOT(addWater(Water*)) );
+      connect( &(Database::instance()), &Database::newWaterSignal, this, &WaterTableModel::addWater );
       connect( &(Database::instance()), SIGNAL(deletedSignal(Water*)), this, SLOT(removeWater(Water*)) );
       addWaters( Database::instance().waters() );
    }
@@ -93,7 +93,7 @@ void WaterTableModel::addWater(Water* water)
 
    beginInsertRows( QModelIndex(), waterObs.size(), waterObs.size() );
    waterObs.append(water);
-   connect( water, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(changed(QMetaProperty,QVariant)) );
+   connect( water, &BeerXMLElement::changed, this, &WaterTableModel::changed );
    endInsertRows();
 
    if(parentTableWidget)
@@ -121,7 +121,7 @@ void WaterTableModel::addWaters(QList<Water*> waters)
       waterObs.append(tmp);
 
       for( i = tmp.begin(); i != tmp.end(); i++ )
-         connect( *i, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(changed(QMetaProperty,QVariant)) );
+         connect( *i, &BeerXMLElement::changed, this, &WaterTableModel::changed );
 
       endInsertRows();
    }

diff --git a/src/YeastDialog.cpp b/src/YeastDialog.cpp
@@ -48,11 +48,11 @@ YeastDialog::YeastDialog(MainWindow* parent)
    yeastTableProxy->setFilterKeyColumn(1);
 
    connect( pushButton_addToRecipe, SIGNAL( clicked() ), this, SLOT( addYeast() ) );
-   connect( pushButton_edit, SIGNAL( clicked() ), this, SLOT( editSelected() ) );
+   connect( pushButton_edit, &QAbstractButton::clicked, this, &YeastDialog::editSelected );
    connect( pushButton_new, SIGNAL( clicked() ), this, SLOT( newYeast() ) );
-   connect( pushButton_remove, SIGNAL(clicked()), this, SLOT( removeYeast() ) );
-   connect( tableWidget, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT( addYeast(const QModelIndex&) ) );
-   connect( qLineEdit_searchBox, SIGNAL(textEdited(QString)), this, SLOT(filterYeasts(QString)));
+   connect( pushButton_remove, &QAbstractButton::clicked, this, &YeastDialog::removeYeast );
+   connect( tableWidget, &QAbstractItemView::doubleClicked, this, &YeastDialog::addYeast );
+   connect( qLineEdit_searchBox, &QLineEdit::textEdited, this, &YeastDialog::filterYeasts);
 
    yeastTableModel->observeDatabase(true);
 

diff --git a/src/YeastEditor.cpp b/src/YeastEditor.cpp
@@ -32,8 +32,8 @@ YeastEditor::YeastEditor( QWidget* parent )
 {
    setupUi(this);
 
-   connect( buttonBox, SIGNAL( accepted() ), this, SLOT( save() ));
-   connect( buttonBox, SIGNAL( rejected() ), this, SLOT( clearAndClose() ));
+   connect( buttonBox, &QDialogButtonBox::accepted, this, &YeastEditor::save);
+   connect( buttonBox, &QDialogButtonBox::rejected, this, &YeastEditor::clearAndClose);
 }
 
 void YeastEditor::setYeast( Yeast* y )

diff --git a/src/YeastTableModel.cpp b/src/YeastTableModel.cpp
@@ -56,7 +56,7 @@ YeastTableModel::YeastTableModel(QTableView* parent, bool editable)
    parentTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
    parentTableWidget->setWordWrap(false);
 
-   connect(headerView, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(contextMenu(const QPoint&)));
+   connect(headerView, &QWidget::customContextMenuRequested, this, &YeastTableModel::contextMenu);
 }
 
 void YeastTableModel::addYeast(Yeast* yeast)
@@ -76,7 +76,7 @@ void YeastTableModel::addYeast(Yeast* yeast)
    int size = yeastObs.size();
    beginInsertRows( QModelIndex(), size, size );
    yeastObs.append(yeast);
-   connect( yeast, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(changed(QMetaProperty,QVariant)) );
+   connect( yeast, &BeerXMLElement::changed, this, &YeastTableModel::changed );
    //reset(); // Tell everybody that the table has changed.
    endInsertRows();
 }
@@ -92,7 +92,7 @@ void YeastTableModel::observeRecipe(Recipe* rec)
    recObs = rec;
    if( recObs )
    {
-      connect( recObs, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(changed(QMetaProperty,QVariant)) );
+      connect( recObs, &BeerXMLElement::changed, this, &YeastTableModel::changed );
       addYeasts( recObs->yeasts() );
    }
 }
@@ -104,7 +104,7 @@ void YeastTableModel::observeDatabase(bool val)
       observeRecipe(0);
 
       removeAll();
-      connect( &(Database::instance()), SIGNAL(newYeastSignal(Yeast*)), this, SLOT(addYeast(Yeast*)) );
+      connect( &(Database::instance()), &Database::newYeastSignal, this, &YeastTableModel::addYeast );
       connect( &(Database::instance()), SIGNAL(deletedSignal(Yeast*)), this, SLOT(removeYeast(Yeast*)) );
       addYeasts( Database::instance().yeasts() );
    }
@@ -133,7 +133,7 @@ void YeastTableModel::addYeasts(QList<Yeast*> yeasts)
       yeastObs.append(tmp);
 
       for( i = tmp.begin(); i != tmp.end(); i++ )
-         connect( *i, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(changed(QMetaProperty,QVariant)) );
+         connect( *i, &BeerXMLElement::changed, this, &YeastTableModel::changed );
 
       endInsertRows();
    }

diff --git a/src/boiltime.cpp b/src/boiltime.cpp
@@ -26,7 +26,7 @@ BoilTime::BoilTime(QObject* parent): QObject(parent),
 { 
     timer = new QTimer(this);
     timer->setInterval(1000);
-    connect(timer, SIGNAL(timeout()), this, SLOT(decrementTime()));
+    connect(timer, &QTimer::timeout, this, &BoilTime::decrementTime);
 }
 
 void BoilTime::setBoilTime(int boilTime)