qt: use signal-slot for write instead of callback

Author: bbogush

qt/main_window.cpp

@@ -61,6 +61,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     initBufTable();
 
     prog = new Programmer(this);
+    connect(prog, SIGNAL(writeChipCompleted(int)), this,
+        SLOT(slotProgWriteCompleted(int)));
 
     addChipDB(ui->chipSelectComboBox);
     connect(ui->chipSelectComboBox, SIGNAL(currentIndexChanged(int)),
@@ -216,7 +218,7 @@ void MainWindow::slotProgRead()
         std::placeholders::_1), buffer, START_ADDRESS, readSize);
 }
 
-void MainWindow::writeChipCb(int status)
+void MainWindow::slotProgWriteCompleted(int status)
 {
     if (!status)
         qInfo() << "Data has been successfully written";
@@ -244,8 +246,7 @@ void MainWindow::slotProgWrite()
         return;
     }
 
-    prog->writeChip(std::bind(&MainWindow::writeChipCb, this,
-        std::placeholders::_1), buffer, START_ADDRESS, bufferSize, pageSize);
+    prog->writeChip(buffer, START_ADDRESS, bufferSize, pageSize);
 }
 
 void MainWindow::selectChipCb()

qt/main_window.h

@@ -39,6 +39,9 @@ class MainWindow : public QMainWindow
     void readChipCb(int status);
     void writeChipCb(int status);
 
+private slots:
+    void slotProgWriteCompleted(int status);
+
 public slots:
     void slotFileOpen();
     void slotProgConnect();

qt/programmer.cpp

@@ -323,13 +323,12 @@ void Programmer::writeCb(int ret)
 {
     QObject::disconnect(&writer, SIGNAL(result(int)), this, SLOT(writeCb(int)));
     serialPortConnect();
-    writeChipCb(ret);
+    emit writeChipCompleted(ret);
 }
 
-void Programmer::writeChip(std::function<void(int)> callback, uint8_t *buf,
-    uint32_t addr, uint32_t len, uint32_t pageSize)
+void Programmer::writeChip(uint8_t *buf, uint32_t addr, uint32_t len,
+    uint32_t pageSize)
 {
-    writeChipCb = callback;
     QObject::connect(&writer, SIGNAL(result(int)), this, SLOT(writeCb(int)));
 
     /* Serial port object cannot be used in other thread */

qt/programmer.h

@@ -31,7 +31,6 @@ class Programmer : public QObject
     std::function<void(void)> selectChipCb;
     std::function<void(void)> eraseChipCb;
     std::function<void(int)> readChipCb;
-    std::function<void(int)> writeChipCb;
     uint8_t *readChipBuf;
     uint32_t readChipLen;
     uint8_t *writeChipBuf;
@@ -73,10 +72,13 @@ class Programmer : public QObject
         uint32_t len);
     void readChip(std::function<void(int)> callback, uint8_t *buf,
         uint32_t addr, uint32_t len);
-    void writeChip(std::function<void(int)> callback, uint8_t *buf,
-        uint32_t addr, uint32_t len, uint32_t pageSize);
+    void writeChip(uint8_t *buf, uint32_t addr, uint32_t len,
+        uint32_t pageSize);
     void selectChip(std::function<void(void)> callback, uint32_t chipNum);
 
+signals:
+    void writeChipCompleted(int ret);
+
 private slots:
     void writeCb(int ret);
 };