Skip to content

Commit

Permalink
修正在linux无法编译的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
heyuanjie87 committed Apr 23, 2020
1 parent 8445187 commit ede1854
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Modem/Modem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Modem::Modem(QWidget *parent) :
ui->setupUi(this);

ym = new Ymodem(this);
connect(ym, &ym->showTransfer, this, &this->showTransfer);
connect(ym, &ym->finished, this, &this->closed);
connect(ym, SIGNAL(showTransfer()), this, SLOT(showTransfer()));
connect(ym, SIGNAL(finished()), this, SLOT(closed()));
}

Modem::~Modem()
Expand Down
10 changes: 5 additions & 5 deletions simple/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ MainWindow::MainWindow(QWidget *parent) :
connect(serial, static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error),
this, &MainWindow::handleError);

connect(serial, &QSerialPort::readyRead, this, &MainWindow::readData);
connect(term, &term->outData, this, &MainWindow::writeData);
connect(serial, SIGNAL(readyRead()), this, SLOT(readData()));
connect(term, SIGNAL(outData(QByteArray)), this, SLOT(writeData(QByteArray)));

dlgSS = new SendSave;

connect(dlgSS, &dlgSS->outData, this, &MainWindow::writeData);
connect(dlgSS, SIGNAL(outData(QByteArray)), this, SLOT(writeData(QByteArray)));
dlgSS->connectDb("save.dblite");

statusBar()->addWidget(dlgSS->toolButton(3));
Expand All @@ -104,13 +104,13 @@ MainWindow::MainWindow(QWidget *parent) :
statusBar()->addWidget(dlgSS->toolButton(2));

modem = new Modem(this);
connect(modem, &modem->outData, this, &MainWindow::writeData);
connect(modem, SIGNAL(outData(QByteArray)), this, SLOT(writeData(QByteArray)));

modemCheck = new QTimer;
modemCheck->setSingleShot(true);
connect(modemCheck, SIGNAL(timeout()), this, SLOT(startModem()));

connect(modem, &modem->exitTransfer, this, &this->exitTransfer);
connect(modem, SIGNAL(exitTransfer()), this, SLOT(exitTransfer()));
}

MainWindow::~MainWindow()
Expand Down

0 comments on commit ede1854

Please sign in to comment.