Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-12 16:22:03 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-03-12 16:22:03 (GMT) |
| commit | 410d721ec495e29e15d45cbd921a9bb59133973d (patch) | |
| tree | 9d1dfd3f5d85ecdf41ba1296b518b65c269edc2a /Swift | |
| parent | b5d0be6e0d5b57effc5b7883d6e6e72aa2a1f062 (diff) | |
| download | swift-410d721ec495e29e15d45cbd921a9bb59133973d.zip swift-410d721ec495e29e15d45cbd921a9bb59133973d.tar.bz2 | |
Make ByteArray an std::vector<unsigned char>.
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/Controllers/CertificateFileStorage.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtAvatarWidget.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/CertificateFileStorage.cpp b/Swift/Controllers/CertificateFileStorage.cpp index 4462556..cf924ee 100644 --- a/Swift/Controllers/CertificateFileStorage.cpp +++ b/Swift/Controllers/CertificateFileStorage.cpp @@ -50,7 +50,7 @@ void CertificateFileStorage::addCertificate(Certificate::ref certificate) { } boost::filesystem::ofstream file(certificatePath, boost::filesystem::ofstream::binary|boost::filesystem::ofstream::out); ByteArray data = certificate->toDER(); - file.write(data.getData(), data.getSize()); + file.write(reinterpret_cast<const char*>(data.getData()), data.getSize()); file.close(); } diff --git a/Swift/QtUI/QtAvatarWidget.cpp b/Swift/QtUI/QtAvatarWidget.cpp index 173d074..3e3aa69 100644 --- a/Swift/QtUI/QtAvatarWidget.cpp +++ b/Swift/QtUI/QtAvatarWidget.cpp @@ -84,7 +84,7 @@ void QtAvatarWidget::mousePressEvent(QMouseEvent* event) { data.readFromFile(Q2PSTRING(fileName)); QBuffer buffer; - buffer.setData(data.getData(), data.getSize()); + buffer.setData(reinterpret_cast<const char*>(data.getData()), data.getSize()); buffer.open(QIODevice::ReadOnly); QString type = QImageReader::imageFormat(&buffer).toLower(); if (!type.isEmpty()) { |