diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-11-06 08:37:47 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-06 09:55:30 +0100 |
| commit | 8e0b66f1269c0516fd339a18b5644bf38a1e2412 (patch) | |
| tree | 14bb8482e2ca6d7712657163f85a916b1f0671a4 /examples | |
| parent | 77f5e60cd23391f5103ac9c238066611b2fc4223 (diff) | |
| download | qtserialport-8e0b66f1269c0516fd339a18b5644bf38a1e2412.tar.gz | |
Define QStringLiteral when undefined (e.g. Qt 4)
This will allow us Qt 5 style coding. QLatin1String replaced everywhere where it
works for Qt 4 and 5, namely: the direct literal passing.
Note that the "standard" typo has also been fixed in this commit as the line had
to change anyway, so it is not much of an additional noise.
Change-Id: I8b7e4fe5f337441000bd3d8f58db528fdd0e175b
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/serialport/terminal/settingsdialog.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/examples/serialport/terminal/settingsdialog.cpp b/examples/serialport/terminal/settingsdialog.cpp index 65f6b87..ad32824 100644 --- a/examples/serialport/terminal/settingsdialog.cpp +++ b/examples/serialport/terminal/settingsdialog.cpp @@ -115,37 +115,37 @@ void SettingsDialog::fillPortsParameters() { // fill baud rate (is not the entire list of available values, // desired values??, add your independently) - ui->baudRateBox->addItem(QLatin1String("9600"), QSerialPort::Baud9600); - ui->baudRateBox->addItem(QLatin1String("19200"), QSerialPort::Baud19200); - ui->baudRateBox->addItem(QLatin1String("38400"), QSerialPort::Baud38400); - ui->baudRateBox->addItem(QLatin1String("115200"), QSerialPort::Baud115200); - ui->baudRateBox->addItem(QLatin1String("Custom")); + ui->baudRateBox->addItem(QStringLiteral("9600"), QSerialPort::Baud9600); + ui->baudRateBox->addItem(QStringLiteral("19200"), QSerialPort::Baud19200); + ui->baudRateBox->addItem(QStringLiteral("38400"), QSerialPort::Baud38400); + ui->baudRateBox->addItem(QStringLiteral("115200"), QSerialPort::Baud115200); + ui->baudRateBox->addItem(QStringLiteral("Custom")); // fill data bits - ui->dataBitsBox->addItem(QLatin1String("5"), QSerialPort::Data5); - ui->dataBitsBox->addItem(QLatin1String("6"), QSerialPort::Data6); - ui->dataBitsBox->addItem(QLatin1String("7"), QSerialPort::Data7); - ui->dataBitsBox->addItem(QLatin1String("8"), QSerialPort::Data8); + ui->dataBitsBox->addItem(QStringLiteral("5"), QSerialPort::Data5); + ui->dataBitsBox->addItem(QStringLiteral("6"), QSerialPort::Data6); + ui->dataBitsBox->addItem(QStringLiteral("7"), QSerialPort::Data7); + ui->dataBitsBox->addItem(QStringLiteral("8"), QSerialPort::Data8); ui->dataBitsBox->setCurrentIndex(3); // fill parity - ui->parityBox->addItem(QLatin1String("None"), QSerialPort::NoParity); - ui->parityBox->addItem(QLatin1String("Even"), QSerialPort::EvenParity); - ui->parityBox->addItem(QLatin1String("Odd"), QSerialPort::OddParity); - ui->parityBox->addItem(QLatin1String("Mark"), QSerialPort::MarkParity); - ui->parityBox->addItem(QLatin1String("Space"), QSerialPort::SpaceParity); + ui->parityBox->addItem(QStringLiteral("None"), QSerialPort::NoParity); + ui->parityBox->addItem(QStringLiteral("Even"), QSerialPort::EvenParity); + ui->parityBox->addItem(QStringLiteral("Odd"), QSerialPort::OddParity); + ui->parityBox->addItem(QStringLiteral("Mark"), QSerialPort::MarkParity); + ui->parityBox->addItem(QStringLiteral("Space"), QSerialPort::SpaceParity); // fill stop bits - ui->stopBitsBox->addItem(QLatin1String("1"), QSerialPort::OneStop); + ui->stopBitsBox->addItem(QStringLiteral("1"), QSerialPort::OneStop); #ifdef Q_OS_WIN - ui->stopBitsBox->addItem(QLatin1String("1.5"), QSerialPort::OneAndHalfStop); + ui->stopBitsBox->addItem(QStringLiteral("1.5"), QSerialPort::OneAndHalfStop); #endif - ui->stopBitsBox->addItem(QLatin1String("2"), QSerialPort::TwoStop); + ui->stopBitsBox->addItem(QStringLiteral("2"), QSerialPort::TwoStop); // fill flow control - ui->flowControlBox->addItem(QLatin1String("None"), QSerialPort::NoFlowControl); - ui->flowControlBox->addItem(QLatin1String("RTS/CTS"), QSerialPort::HardwareControl); - ui->flowControlBox->addItem(QLatin1String("XON/XOFF"), QSerialPort::SoftwareControl); + ui->flowControlBox->addItem(QStringLiteral("None"), QSerialPort::NoFlowControl); + ui->flowControlBox->addItem(QStringLiteral("RTS/CTS"), QSerialPort::HardwareControl); + ui->flowControlBox->addItem(QStringLiteral("XON/XOFF"), QSerialPort::SoftwareControl); } void SettingsDialog::fillPortsInfo() |