From affd326dbba01fd2ea23fa87c7c165bc07bd08fe Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Sat, 23 Nov 2013 17:59:34 +0000 Subject: Replace the silly empty output with a reasonable "N/A" placeholder Change-Id: Iad5076e9a192f5a07e41314d286bc02e46ea92c8 Reviewed-by: Sergey Belyashov Reviewed-by: Denis Shienkov --- examples/serialport/terminal/settingsdialog.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'examples/serialport/terminal') diff --git a/examples/serialport/terminal/settingsdialog.cpp b/examples/serialport/terminal/settingsdialog.cpp index ad32824e..923f0004 100644 --- a/examples/serialport/terminal/settingsdialog.cpp +++ b/examples/serialport/terminal/settingsdialog.cpp @@ -151,14 +151,19 @@ void SettingsDialog::fillPortsParameters() void SettingsDialog::fillPortsInfo() { ui->serialPortInfoListBox->clear(); + static const QString blankString = QObject::tr("N/A"); + QString description; + QString manufacturer; foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) { QStringList list; + description = info.description(); + manufacturer = info.manufacturer(); list << info.portName() - << info.description() - << info.manufacturer() + << (!description.isEmpty() ? description : blankString) + << (!manufacturer.isEmpty() ? manufacturer : blankString) << info.systemLocation() - << (info.vendorIdentifier() ? QString::number(info.vendorIdentifier(), 16) : QString()) - << (info.productIdentifier() ? QString::number(info.productIdentifier(), 16) : QString()); + << (info.vendorIdentifier() ? QString::number(info.vendorIdentifier(), 16) : blankString) + << (info.productIdentifier() ? QString::number(info.productIdentifier(), 16) : blankString); ui->serialPortInfoListBox->addItem(list.first(), list); } -- cgit v1.2.3