remove unnecessary signals and slots

example/sACN Explorer/universemodel.cpp

@@ -15,9 +15,13 @@ UniverseModel::UniverseModel(QObject *parent, QSacnUniverse *universe)
     , universe_(universe)
     , data_mode_(Decimal)
 {
-  if (universe_)
-    connect(universe_, &QSacnUniverse::dataChanged,
-            this, &UniverseModel::universeRefreshed);
+  if (!universe_)
+    return;
+
+  connect(universe_, &QSacnUniverse::dataChanged,
+          this, [this](){
+      emit dataChanged(index(0,0), index(rowCount(), columnCount()));
+  });
 }
 
 
@@ -189,15 +193,6 @@ Qt::ItemFlags UniverseModel::flags(const QModelIndex &index) const
 }
 
 
-/**
- * @brief UniverseModel::universeRefreshed
- */
-void UniverseModel::universeRefreshed() {
-    emit dataChanged(index(0,0), index(rowCount(), columnCount()));
-    emit recievedUpdate(universe_);
-}
-
-
 /**
  * @brief UniverseModel::setDataMode
  * @param mode

example/sACN Explorer/universemodel.h

@@ -9,17 +9,8 @@ class UniverseModel
     Q_OBJECT
 
 public:
-    /// @brief The data_modes enum
-    enum data_modes {
-        Decimal,
-        Hex,
-        Percent
-    };
-    Q_ENUM(data_modes)
-
     explicit UniverseModel(QObject *parent = nullptr,
                            QSacnUniverse *universe = nullptr);
-
     // Model overrides:
     QVariant headerData(int section, Qt::Orientation orientation,
                         int role = Qt::DisplayRole) const override;
@@ -31,14 +22,16 @@ public:
                  int role = Qt::EditRole) override;
     Qt::ItemFlags flags(const QModelIndex& index) const override;
 
-    // Data source:
+    /// @brief The data_modes enum
+    enum data_modes {
+        Decimal,
+        Hex,
+        Percent
+    };
+    Q_ENUM(data_modes)
     data_modes dataMode();
 
-signals:
-    void recievedUpdate(QSacnUniverse*);
-
 public slots:
-    void universeRefreshed();
     void setDataMode(const QString mode);
 
 private:

example/sACN Explorer/universewindow.cpp

@@ -21,8 +21,8 @@ UniverseInspector::UniverseInspector(QWidget *parent, QSacnUniverse *universe)
   ui->tableView->setModel(model);
 
   // update the status bar whenever the universe refreshes
-  connect(model, &UniverseModel::recievedUpdate,
-          this, &UniverseInspector::updateStatus);
+  connect(model, &UniverseModel::dataChanged,
+          this, [this](){update_status_();});
 
   // add data format combobox to toolbar
   auto formatLabel = new QLabel(this);
@@ -49,7 +49,7 @@ UniverseInspector::UniverseInspector(QWidget *parent, QSacnUniverse *universe)
   prioritySpinBox->setEnabled(false);
   ui->toolBar->addWidget(prioritySpinBox);
 
-  updateStatus(universe);
+  update_status_();
   if (universe->isEditable())
     {
       prioritySpinBox->setValue(universe->priority());
@@ -71,24 +71,23 @@ UniverseInspector::~UniverseInspector()
 
 /**
  * @brief UniverseView::updateStatusBar
- * @param universe
  */
-void UniverseInspector::updateStatus(QSacnUniverse* universe)
+void UniverseInspector::update_status_()
 {
   // window title
     this->setWindowTitle(QString("%1 '%2' : "+tr("Universe")+" %3").arg(
-        universe->isEditable() ? tr("Editing") : tr("Viewing"),
-        universe->sourceName(),
-        QString::number(universe->number())));
+        mUniverse->isEditable() ? tr("Editing") : tr("Viewing"),
+        mUniverse->sourceName(),
+        QString::number(mUniverse->number())));
 
-  if (!universe->isEditable())
+  if (!mUniverse->isEditable())
     {
       // status bar
       ui->statusbar->clearMessage();
       QString message = QString("%1 " + tr("Hz")).arg(
-            QString::number(universe->rxRate()));
+            QString::number(mUniverse->rxRate()));
       ui->statusbar->showMessage(message, 2500);
       // priority spinbox
-      prioritySpinBox->setValue(universe->priority());
+      prioritySpinBox->setValue(mUniverse->priority());
     }
 }

example/sACN Explorer/universewindow.h

@@ -27,11 +27,10 @@ public:
      */
     QSacnUniverse * universe() { return mUniverse; }
 
-public slots:
-    void updateStatus(QSacnUniverse *);
-
 private:
     Ui::UniverseInspector *ui;
     QSpinBox *prioritySpinBox;
     QSacnUniverse *mUniverse;
+
+    void update_status_();
 };