Refactoring

Author: sanny32

omodsim/controls/modbuslogwidget.cpp

@@ -70,13 +70,12 @@ void ModbusLogModel::clear()
 /// \brief ModbusLogModel::append
 /// \param data
 ///
-void ModbusLogModel::append(const ModbusMessage* data)
+void ModbusLogModel::append(QSharedPointer<const ModbusMessage> data)
 {
     if(data == nullptr) return;
 
     while(rowCount() >= _rowLimit)
     {
-        delete _items.first();
         _items.removeFirst();
     }
 
@@ -108,9 +107,6 @@ void ModbusLogModel::setRowLimit(int val)
 ///
 void ModbusLogModel::deleteItems()
 {
-    for(auto&& i : _items)
-        delete i;
-
     _items.clear();
 }
 
@@ -183,9 +179,9 @@ QModelIndex ModbusLogWidget::index(int row)
 /// \param request
 /// \return
 ///
-const ModbusMessage* ModbusLogWidget::addItem(const QModbusPdu& pdu, ModbusMessage::ProtocolType protocol, int deviceId, int transactionId, const QDateTime& timestamp, bool request)
+QSharedPointer<const ModbusMessage> ModbusLogWidget::addItem(const QModbusPdu& pdu, ModbusMessage::ProtocolType protocol, int deviceId, int transactionId, const QDateTime& timestamp, bool request)
 {
-    const ModbusMessage* msg = nullptr;
+    QSharedPointer<const ModbusMessage> msg;
     if(model())
     {
         msg = ModbusMessage::create(pdu, protocol, deviceId, timestamp, request);
@@ -202,13 +198,13 @@ const ModbusMessage* ModbusLogWidget::addItem(const QModbusPdu& pdu, ModbusMessa
 /// \param index
 /// \return
 ///
-const ModbusMessage* ModbusLogWidget::itemAt(const QModelIndex& index)
+QSharedPointer<const ModbusMessage> ModbusLogWidget::itemAt(const QModelIndex& index)
 {
     if(!index.isValid())
         return nullptr;
 
     return model() ?
-           model()->data(index, Qt::UserRole).value<const ModbusMessage*>() :
+           model()->data(index, Qt::UserRole).value<QSharedPointer<const ModbusMessage>>() :
            nullptr;
 }
 

omodsim/controls/modbuslogwidget.h

@@ -22,7 +22,7 @@ class  ModbusLogModel : public QAbstractListModel
     QVariant data(const QModelIndex& index, int role) const override;
 
     void clear();
-    void append(const ModbusMessage* data);
+    void append(QSharedPointer<const ModbusMessage> data);
     void update(){
         emit dataChanged(index(0), index(_items.size() - 1));
     }
@@ -36,7 +36,7 @@ class  ModbusLogModel : public QAbstractListModel
 private:
     int _rowLimit = 30;
     ModbusLogWidget* _parentWidget;
-    QQueue<const ModbusMessage*> _items;
+    QQueue<QSharedPointer<const ModbusMessage>> _items;
 };
 
 ///
@@ -53,8 +53,8 @@ class ModbusLogWidget : public QListView
     int rowCount() const;
     QModelIndex index(int row);
 
-    const ModbusMessage* addItem(const QModbusPdu& pdu, ModbusMessage::ProtocolType protocol, int deviceId, int transactionId, const QDateTime& timestamp, bool request);
-    const ModbusMessage* itemAt(const QModelIndex& index);
+    QSharedPointer<const ModbusMessage> addItem(const QModbusPdu& pdu, ModbusMessage::ProtocolType protocol, int deviceId, int transactionId, const QDateTime& timestamp, bool request);
+    QSharedPointer<const ModbusMessage> itemAt(const QModelIndex& index);
 
     DataDisplayMode dataDisplayMode() const;
     void setDataDisplayMode(DataDisplayMode mode);

omodsim/controls/modbusmessagewidget.cpp

@@ -21,8 +21,8 @@ class ModbusMessageWidget : public QListWidget
     ByteOrder byteOrder() const;
     void setByteOrder(ByteOrder order);
 
-    const ModbusMessage* modbusMessage() const;
-    void setModbusMessage(const ModbusMessage* msg);
+    QSharedPointer<const ModbusMessage> modbusMessage() const;
+    void setModbusMessage(QSharedPointer<const ModbusMessage> msg);
 
     bool showTimestamp() const;
     void setShowTimestamp(bool on);
@@ -40,7 +40,7 @@ class ModbusMessageWidget : public QListWidget
     ByteOrder _byteOrder;
     DataDisplayMode _dataDisplayMode;
     bool _showTimestamp;
-    const ModbusMessage* _mm;
+    QSharedPointer<const ModbusMessage> _mm;
 };
 
 #endif // MODBUSMESSAGEWIDGET_H

omodsim/controls/modbusmessagewidget.h

@@ -35,7 +35,6 @@ DialogMsgParser::DialogMsgParser(DataDisplayMode mode, ModbusMessage::ProtocolTy
 DialogMsgParser::~DialogMsgParser()
 {
     delete ui;
-    if(_mm) delete _mm;
 }
 
 ///
@@ -97,7 +96,6 @@ void DialogMsgParser::on_pushButtonParse_clicked()
     if(ui->buttonTcp->isChecked())
         protocol = ModbusMessage::Tcp;
 
-    if(_mm) delete _mm;
     _mm = ModbusMessage::create(data, protocol, QDateTime::currentDateTime(), ui->request->isChecked());
     ui->info->setModbusMessage(_mm);
 }

omodsim/dialogs/dialogmsgparser.cpp

@@ -31,7 +31,7 @@ private slots:
 
 private:
     Ui::DialogMsgParser *ui;
-    const ModbusMessage* _mm;
+    QSharedPointer<const ModbusMessage> _mm;
 };
 
 #endif // DIALOGMSGPARSER_H