diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/serialport/blockingmaster/dialog.cpp | 2 | ||||
-rw-r--r-- | examples/serialport/blockingmaster/dialog.h | 2 | ||||
-rw-r--r-- | examples/serialport/blockingmaster/masterthread.h | 4 | ||||
-rw-r--r-- | examples/serialport/blockingslave/dialog.cpp | 2 | ||||
-rw-r--r-- | examples/serialport/blockingslave/dialog.h | 2 | ||||
-rw-r--r-- | examples/serialport/blockingslave/slavethread.h | 4 | ||||
-rw-r--r-- | examples/serialport/creaderasync/serialportreader.h | 2 | ||||
-rw-r--r-- | examples/serialport/cwriterasync/serialportwriter.h | 2 | ||||
-rw-r--r-- | examples/serialport/enumerator/main.cpp | 6 | ||||
-rw-r--r-- | examples/serialport/master/dialog.cpp | 5 | ||||
-rw-r--r-- | examples/serialport/master/dialog.h | 2 | ||||
-rw-r--r-- | examples/serialport/slave/dialog.cpp | 5 | ||||
-rw-r--r-- | examples/serialport/slave/dialog.h | 2 | ||||
-rw-r--r-- | examples/serialport/terminal/console.h | 10 | ||||
-rw-r--r-- | examples/serialport/terminal/mainwindow.h | 2 | ||||
-rw-r--r-- | examples/serialport/terminal/settingsdialog.h | 2 |
16 files changed, 28 insertions, 26 deletions
diff --git a/examples/serialport/blockingmaster/dialog.cpp b/examples/serialport/blockingmaster/dialog.cpp index c1ca850..08403c3 100644 --- a/examples/serialport/blockingmaster/dialog.cpp +++ b/examples/serialport/blockingmaster/dialog.cpp @@ -81,7 +81,7 @@ Dialog::Dialog(QWidget *parent) waitResponseSpinBox->setRange(0, 10000); waitResponseSpinBox->setValue(1000); - QGridLayout *mainLayout = new QGridLayout; + auto mainLayout = new QGridLayout; mainLayout->addWidget(serialPortLabel, 0, 0); mainLayout->addWidget(serialPortComboBox, 0, 1); mainLayout->addWidget(waitResponseLabel, 1, 0); diff --git a/examples/serialport/blockingmaster/dialog.h b/examples/serialport/blockingmaster/dialog.h index 4f0e331..aff8177 100644 --- a/examples/serialport/blockingmaster/dialog.h +++ b/examples/serialport/blockingmaster/dialog.h @@ -70,7 +70,7 @@ class Dialog : public QDialog Q_OBJECT public: - Dialog(QWidget *parent = 0); + explicit Dialog(QWidget *parent = nullptr); private slots: void transaction(); diff --git a/examples/serialport/blockingmaster/masterthread.h b/examples/serialport/blockingmaster/masterthread.h index ffb6602..f23559f 100644 --- a/examples/serialport/blockingmaster/masterthread.h +++ b/examples/serialport/blockingmaster/masterthread.h @@ -61,11 +61,11 @@ class MasterThread : public QThread Q_OBJECT public: - MasterThread(QObject *parent = 0); + explicit MasterThread(QObject *parent = nullptr); ~MasterThread(); void transaction(const QString &portName, int waitTimeout, const QString &request); - void run(); + void run() Q_DECL_OVERRIDE; signals: void response(const QString &s); diff --git a/examples/serialport/blockingslave/dialog.cpp b/examples/serialport/blockingslave/dialog.cpp index 8550773..3bfd419 100644 --- a/examples/serialport/blockingslave/dialog.cpp +++ b/examples/serialport/blockingslave/dialog.cpp @@ -81,7 +81,7 @@ Dialog::Dialog(QWidget *parent) for (const QSerialPortInfo &info : infos) serialPortComboBox->addItem(info.portName()); - QGridLayout *mainLayout = new QGridLayout; + auto mainLayout = new QGridLayout; mainLayout->addWidget(serialPortLabel, 0, 0); mainLayout->addWidget(serialPortComboBox, 0, 1); mainLayout->addWidget(waitRequestLabel, 1, 0); diff --git a/examples/serialport/blockingslave/dialog.h b/examples/serialport/blockingslave/dialog.h index 4e01656..0e59410 100644 --- a/examples/serialport/blockingslave/dialog.h +++ b/examples/serialport/blockingslave/dialog.h @@ -70,7 +70,7 @@ class Dialog : public QDialog Q_OBJECT public: - Dialog(QWidget *parent = 0); + explicit Dialog(QWidget *parent = nullptr); private slots: void startSlave(); diff --git a/examples/serialport/blockingslave/slavethread.h b/examples/serialport/blockingslave/slavethread.h index d678a7b..9a15e24 100644 --- a/examples/serialport/blockingslave/slavethread.h +++ b/examples/serialport/blockingslave/slavethread.h @@ -61,11 +61,11 @@ class SlaveThread : public QThread Q_OBJECT public: - SlaveThread(QObject *parent = 0); + explicit SlaveThread(QObject *parent = nullptr); ~SlaveThread(); void startSlave(const QString &portName, int waitTimeout, const QString &response); - void run(); + void run() Q_DECL_OVERRIDE; signals: void request(const QString &s); diff --git a/examples/serialport/creaderasync/serialportreader.h b/examples/serialport/creaderasync/serialportreader.h index 6c0a2c5..6698087 100644 --- a/examples/serialport/creaderasync/serialportreader.h +++ b/examples/serialport/creaderasync/serialportreader.h @@ -69,7 +69,7 @@ class SerialPortReader : public QObject Q_OBJECT public: - SerialPortReader(QSerialPort *serialPort, QObject *parent = 0); + explicit SerialPortReader(QSerialPort *serialPort, QObject *parent = nullptr); ~SerialPortReader(); private slots: diff --git a/examples/serialport/cwriterasync/serialportwriter.h b/examples/serialport/cwriterasync/serialportwriter.h index a4bc32e..9fd305f 100644 --- a/examples/serialport/cwriterasync/serialportwriter.h +++ b/examples/serialport/cwriterasync/serialportwriter.h @@ -69,7 +69,7 @@ class SerialPortWriter : public QObject Q_OBJECT public: - SerialPortWriter(QSerialPort *serialPort, QObject *parent = 0); + explicit SerialPortWriter(QSerialPort *serialPort, QObject *parent = nullptr); ~SerialPortWriter(); void write(const QByteArray &writeData); diff --git a/examples/serialport/enumerator/main.cpp b/examples/serialport/enumerator/main.cpp index fa925da..d7622a2 100644 --- a/examples/serialport/enumerator/main.cpp +++ b/examples/serialport/enumerator/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - QVBoxLayout *layout = new QVBoxLayout; + auto layout = new QVBoxLayout; const auto infos = QSerialPortInfo::availablePorts(); for (const QSerialPortInfo &info : infos) { @@ -75,11 +75,11 @@ int main(int argc, char *argv[]) + QObject::tr("Product Identifier: ") + (info.hasProductIdentifier() ? QString::number(info.productIdentifier(), 16) : QString()) + "\n" + QObject::tr("Busy: ") + (info.isBusy() ? QObject::tr("Yes") : QObject::tr("No")) + "\n"; - QLabel *label = new QLabel(s); + auto label = new QLabel(s); layout->addWidget(label); } - QWidget *workPage = new QWidget; + auto workPage = new QWidget; workPage->setLayout(layout); QScrollArea area; diff --git a/examples/serialport/master/dialog.cpp b/examples/serialport/master/dialog.cpp index 2c92404..4bed08b 100644 --- a/examples/serialport/master/dialog.cpp +++ b/examples/serialport/master/dialog.cpp @@ -74,13 +74,14 @@ Dialog::Dialog(QWidget *parent) , statusLabel(new QLabel(tr("Status: Not running."))) , runButton(new QPushButton(tr("Start"))) { - foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) + const auto infos = QSerialPortInfo::availablePorts(); + for (const QSerialPortInfo &info : infos) serialPortComboBox->addItem(info.portName()); waitResponseSpinBox->setRange(0, 10000); waitResponseSpinBox->setValue(100); - QGridLayout *mainLayout = new QGridLayout; + auto mainLayout = new QGridLayout; mainLayout->addWidget(serialPortLabel, 0, 0); mainLayout->addWidget(serialPortComboBox, 0, 1); mainLayout->addWidget(waitResponseLabel, 1, 0); diff --git a/examples/serialport/master/dialog.h b/examples/serialport/master/dialog.h index b981943..0bc1241 100644 --- a/examples/serialport/master/dialog.h +++ b/examples/serialport/master/dialog.h @@ -73,7 +73,7 @@ class Dialog : public QDialog Q_OBJECT public: - Dialog(QWidget *parent = 0); + explicit Dialog(QWidget *parent = nullptr); private slots: void sendRequest(); diff --git a/examples/serialport/slave/dialog.cpp b/examples/serialport/slave/dialog.cpp index 5bc0561..d801052 100644 --- a/examples/serialport/slave/dialog.cpp +++ b/examples/serialport/slave/dialog.cpp @@ -77,10 +77,11 @@ Dialog::Dialog(QWidget *parent) waitRequestSpinBox->setRange(0, 10000); waitRequestSpinBox->setValue(20); - foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) + const auto infos = QSerialPortInfo::availablePorts(); + for (const QSerialPortInfo &info : infos) serialPortComboBox->addItem(info.portName()); - QGridLayout *mainLayout = new QGridLayout; + auto mainLayout = new QGridLayout; mainLayout->addWidget(serialPortLabel, 0, 0); mainLayout->addWidget(serialPortComboBox, 0, 1); mainLayout->addWidget(waitRequestLabel, 1, 0); diff --git a/examples/serialport/slave/dialog.h b/examples/serialport/slave/dialog.h index d03c123..0405cf8 100644 --- a/examples/serialport/slave/dialog.h +++ b/examples/serialport/slave/dialog.h @@ -73,7 +73,7 @@ class Dialog : public QDialog Q_OBJECT public: - Dialog(QWidget *parent = 0); + explicit Dialog(QWidget *parent = nullptr); private slots: void startSlave(); diff --git a/examples/serialport/terminal/console.h b/examples/serialport/terminal/console.h index 03b0fb1..0674ded 100644 --- a/examples/serialport/terminal/console.h +++ b/examples/serialport/terminal/console.h @@ -62,17 +62,17 @@ signals: void getData(const QByteArray &data); public: - explicit Console(QWidget *parent = 0); + explicit Console(QWidget *parent = nullptr); void putData(const QByteArray &data); void setLocalEchoEnabled(bool set); protected: - virtual void keyPressEvent(QKeyEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void contextMenuEvent(QContextMenuEvent *e); + void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *e) Q_DECL_OVERRIDE; private: bool localEchoEnabled; diff --git a/examples/serialport/terminal/mainwindow.h b/examples/serialport/terminal/mainwindow.h index 9e8c1c1..b792895 100644 --- a/examples/serialport/terminal/mainwindow.h +++ b/examples/serialport/terminal/mainwindow.h @@ -76,7 +76,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); private slots: diff --git a/examples/serialport/terminal/settingsdialog.h b/examples/serialport/terminal/settingsdialog.h index da17565..ea249c1 100644 --- a/examples/serialport/terminal/settingsdialog.h +++ b/examples/serialport/terminal/settingsdialog.h @@ -87,7 +87,7 @@ public: bool localEchoEnabled; }; - explicit SettingsDialog(QWidget *parent = 0); + explicit SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); Settings settings() const; |