Use "BaudRate" instead of "Rate" and "BaudXXXX" instead of "RateXXXX"

Change-Id: Id5db378b6da89f672cb55fa312e325cd1e9b88ce
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>

9 files changed, 37 insertions, 37 deletions

diff --git a/examples/blockingmaster/masterthread.cpp b/examples/blockingmaster/masterthread.cpp
index 9044fdf..9c61f08 100644
--- a/examples/blockingmaster/masterthread.cpp
+++ b/examples/blockingmaster/masterthread.cpp
@@ -110,8 +110,8 @@ void MasterThread::run()
                 return;
             }
 
-            if (!serial.setRate(9600)) {
-                emit error(tr("Can't set rate 9600 baud to port %1, error code %2")
+            if (!serial.setBaudRate(9600)) {
+                emit error(tr("Can't set baud rate 9600 baud to port %1, error code %2")
                            .arg(portName).arg(serial.error()));
                 return;
             }
diff --git a/examples/blockingslave/slavethread.cpp b/examples/blockingslave/slavethread.cpp
index a08bf20..04acaec 100644
--- a/examples/blockingslave/slavethread.cpp
+++ b/examples/blockingslave/slavethread.cpp
@@ -106,8 +106,8 @@ void SlaveThread::run()
                 return;
             }
 
-            if (!serial.setRate(9600)) {
-                emit error(tr("Can't set rate 9600 baud to port %1, error code %2")
+            if (!serial.setBaudRate(9600)) {
+                emit error(tr("Can't set baud rate 9600 baud to port %1, error code %2")
                            .arg(portName).arg(serial.error()));
                 return;
             }
diff --git a/examples/master/dialog.cpp b/examples/master/dialog.cpp
index 766c7dd..f829c1c 100644
--- a/examples/master/dialog.cpp
+++ b/examples/master/dialog.cpp
@@ -108,7 +108,7 @@ void Dialog::sendRequest()
             return;
         }
 
-        if (!serial.setRate(9600)) {
+        if (!serial.setBaudRate(9600)) {
             processError(tr("Can't set rate 9600 baud to port %1, error code %2")
                          .arg(serial.portName()).arg(serial.error()));
             return;
diff --git a/examples/slave/dialog.cpp b/examples/slave/dialog.cpp
index 3e69ca4..ce22bb9 100644
--- a/examples/slave/dialog.cpp
+++ b/examples/slave/dialog.cpp
@@ -115,8 +115,8 @@ void Dialog::startSlave()
             return;
         }
 
-        if (!serial.setRate(9600)) {
-            processError(tr("Can't set rate 9600 baud to port %1, error code %2")
+        if (!serial.setBaudRate(9600)) {
+            processError(tr("Can't set baud rate 9600 baud to port %1, error code %2")
                          .arg(serial.portName()).arg(serial.error()));
             return;
         }
diff --git a/examples/slave/slavethread.cpp b/examples/slave/slavethread.cpp
index 3ff370e..fd32fba 100644
--- a/examples/slave/slavethread.cpp
+++ b/examples/slave/slavethread.cpp
@@ -100,8 +100,8 @@ void SlaveThread::run()
                 return;
             }
 
-            if (!serial.setRate(9600)) {
-                emit error(tr("Can't set rate 9600 baud to port %1, error code %2")
+            if (!serial.setBaudRate(9600)) {
+                emit error(tr("Can't set baud rate 9600 baud to port %1, error code %2")
                            .arg(portName).arg(serial.error()));
                 return;
             }
diff --git a/examples/terminal/mainwindow.cpp b/examples/terminal/mainwindow.cpp
index 998854a..bb7af3a 100644
--- a/examples/terminal/mainwindow.cpp
+++ b/examples/terminal/mainwindow.cpp
@@ -89,7 +89,7 @@ void MainWindow::openSerialPort()
     SettingsDialog::Settings p = settings->settings();
     serial->setPort(p.name);
     if (serial->open(QIODevice::ReadWrite)) {
-        if (serial->setRate(p.rate)
+        if (serial->setBaudRate(p.baudRate)
                 && serial->setDataBits(p.dataBits)
                 && serial->setParity(p.parity)
                 && serial->setStopBits(p.stopBits)
@@ -100,7 +100,7 @@ void MainWindow::openSerialPort()
             ui->actionDisconnect->setEnabled(true);
             ui->actionConfigure->setEnabled(false);
             ui->statusBar->showMessage(tr("Connected to %1 : %2, %3, %4, %5, %6")
-                                       .arg(p.name).arg(p.stringRate).arg(p.stringDataBits)
+                                       .arg(p.name).arg(p.stringBaudRate).arg(p.stringDataBits)
                                        .arg(p.stringParity).arg(p.stringStopBits).arg(p.stringFlowControl));
 
         } else {
diff --git a/examples/terminal/settingsdialog.cpp b/examples/terminal/settingsdialog.cpp
index 5cb8e19..039c31a 100644
--- a/examples/terminal/settingsdialog.cpp
+++ b/examples/terminal/settingsdialog.cpp
@@ -55,14 +55,14 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
 
     intValidator = new QIntValidator(0, 4000000, this);
 
-    ui->rateBox->setInsertPolicy(QComboBox::NoInsert);
+    ui->baudRateBox->setInsertPolicy(QComboBox::NoInsert);
 
     connect(ui->applyButton, SIGNAL(clicked()),
             this, SLOT(apply()));
     connect(ui->portsBox, SIGNAL(currentIndexChanged(int)),
             this, SLOT(showPortInfo(int)));
-    connect(ui->rateBox, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(checkCustomRatePolicy(int)));
+    connect(ui->baudRateBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(checkCustomBaudRatePolicy(int)));
 
     fillPortsParameters();
     fillPortsInfo();
@@ -98,12 +98,12 @@ void SettingsDialog::apply()
     hide();
 }
 
-void SettingsDialog::checkCustomRatePolicy(int idx)
+void SettingsDialog::checkCustomBaudRatePolicy(int idx)
 {
-    ui->rateBox->setEditable(idx == 4);
+    ui->baudRateBox->setEditable(idx == 4);
     if (idx == 4) {
-        ui->rateBox->clearEditText();
-        QLineEdit *edit = ui->rateBox->lineEdit();
+        ui->baudRateBox->clearEditText();
+        QLineEdit *edit = ui->baudRateBox->lineEdit();
         edit->setValidator(intValidator);
     }
 }
@@ -112,11 +112,11 @@ void SettingsDialog::fillPortsParameters()
 {
     // fill baud rate (is not the entire list of available values,
     // desired values??, add your independently)
-    ui->rateBox->addItem(QLatin1String("9600"), SerialPort::Rate9600);
-    ui->rateBox->addItem(QLatin1String("19200"), SerialPort::Rate19200);
-    ui->rateBox->addItem(QLatin1String("38400"), SerialPort::Rate38400);
-    ui->rateBox->addItem(QLatin1String("115200"), SerialPort::Rate115200);
-    ui->rateBox->addItem(QLatin1String("Custom"));
+    ui->baudRateBox->addItem(QLatin1String("9600"), SerialPort::Baud9600);
+    ui->baudRateBox->addItem(QLatin1String("19200"), SerialPort::Baud19200);
+    ui->baudRateBox->addItem(QLatin1String("38400"), SerialPort::Baud38400);
+    ui->baudRateBox->addItem(QLatin1String("115200"), SerialPort::Baud115200);
+    ui->baudRateBox->addItem(QLatin1String("Custom"));
 
     // fill data bits
     ui->dataBitsBox->addItem(QLatin1String("5"), SerialPort::Data5);
@@ -162,16 +162,16 @@ void SettingsDialog::updateSettings()
 {
     currentSettings.name = ui->portsBox->currentText();
 
-    // Rate
-    if (ui->rateBox->currentIndex() == 4) {
-        // custom rate
-        currentSettings.rate = ui->rateBox->currentText().toInt();
+    // Baud Rate
+    if (ui->baudRateBox->currentIndex() == 4) {
+        // custom baud rate
+        currentSettings.baudRate = ui->baudRateBox->currentText().toInt();
     } else {
-        // standard rate
-        currentSettings.rate = static_cast<SerialPort::Rate>(
-                    ui->rateBox->itemData(ui->rateBox->currentIndex()).toInt());
+        // standard baud rate
+        currentSettings.baudRate = static_cast<SerialPort::BaudRate>(
+                    ui->baudRateBox->itemData(ui->baudRateBox->currentIndex()).toInt());
     }
-    currentSettings.stringRate = QString::number(currentSettings.rate);
+    currentSettings.stringBaudRate = QString::number(currentSettings.baudRate);
 
     // Data bits
     currentSettings.dataBits = static_cast<SerialPort::DataBits>(
diff --git a/examples/terminal/settingsdialog.h b/examples/terminal/settingsdialog.h
index 116210d..ce916ac 100644
--- a/examples/terminal/settingsdialog.h
+++ b/examples/terminal/settingsdialog.h
@@ -61,8 +61,8 @@ class SettingsDialog : public QDialog
 public:
     struct Settings {
         QString name;
-        qint32 rate;
-        QString stringRate;
+        qint32 baudRate;
+        QString stringBaudRate;
         SerialPort::DataBits dataBits;
         QString stringDataBits;
         SerialPort::Parity parity;
@@ -81,7 +81,7 @@ public:
 private slots:
     void showPortInfo(int idx);
     void apply();
-    void checkCustomRatePolicy(int idx);
+    void checkCustomBaudRatePolicy(int idx);
 
 private:
     void fillPortsParameters();
diff --git a/examples/terminal/settingsdialog.ui b/examples/terminal/settingsdialog.ui
index 0e3caa9..8dd2341 100644
--- a/examples/terminal/settingsdialog.ui
+++ b/examples/terminal/settingsdialog.ui
@@ -68,14 +68,14 @@
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
-       <widget class="QLabel" name="rateLabel">
+       <widget class="QLabel" name="baudRateLabel">
         <property name="text">
-         <string>Rate:</string>
+         <string>BaudRate:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QComboBox" name="rateBox"/>
+       <widget class="QComboBox" name="baudRateBox"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="dataBitsLabel">