summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Papp <lpapp@kde.org>2013-03-11 22:38:53 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-12 08:32:16 +0100
commitca59808315342560b5b09687fd47dbe537787ef7 (patch)
treeced1a791f608957a958d241ad62e042f62c95c6a
parent5fac73dea8650d77e72a5133385230a3d3a294c3 (diff)
downloadqtserialport-ca59808315342560b5b09687fd47dbe537787ef7.tar.gz
Use fromUtf8 for the conversion instead of copy assignment
Change-Id: I9f450a55c7fa33811aaa2181eddc0241ea3bbc42 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r--src/serialport/qserialportinfo_mac.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/serialport/qserialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp
index 3f6e27d..302d1e1 100644
--- a/src/serialport/qserialportinfo_mac.cpp
+++ b/src/serialport/qserialportinfo_mac.cpp
@@ -197,7 +197,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
buffer.data(),
buffer.size(),
kCFStringEncodingUTF8)) {
- serialPortInfo.d_ptr->device = QString(buffer);
+ serialPortInfo.d_ptr->device.fromUtf8(buffer);
}
::CFRelease(device);
}
@@ -207,7 +207,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
buffer.data(),
buffer.size(),
kCFStringEncodingUTF8)) {
- serialPortInfo.d_ptr->portName = QString(buffer);
+ serialPortInfo.d_ptr->portName.fromUtf8(buffer);
}
::CFRelease(portName);
}
@@ -217,7 +217,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
buffer.data(),
buffer.size(),
kCFStringEncodingUTF8)) {
- serialPortInfo.d_ptr->description = QString(buffer);
+ serialPortInfo.d_ptr->description.fromUtf8(buffer);
}
::CFRelease(description);
}
@@ -227,7 +227,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
buffer.data(),
buffer.size(),
kCFStringEncodingUTF8)) {
- serialPortInfo.d_ptr->manufacturer = QString(buffer);
+ serialPortInfo.d_ptr->manufacturer.fromUtf8(buffer);
}
::CFRelease(manufacturer);
}