mirror of
https://github.com/edisionnano/QDiskInfo.git
synced 2026-03-07 20:09:55 +03:00
Fix QT5 compilation errors
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <unistd.h>
|
||||
#include <QArrayDataPointer>
|
||||
|
||||
QVector<unsigned char> AsciiView::readSMARTData(const QString& device_path) {
|
||||
int fd;
|
||||
@@ -14,7 +15,12 @@ QVector<unsigned char> AsciiView::readSMARTData(const QString& device_path) {
|
||||
unsigned char sense_buffer[SENSE_BUFFER_LEN];
|
||||
sg_io_hdr_t io_hdr;
|
||||
QVector<unsigned char> result;
|
||||
|
||||
fd = open(device_path.toStdString().c_str(), O_RDONLY);
|
||||
if (fd < 0) {
|
||||
return result;
|
||||
}
|
||||
|
||||
memset(&io_hdr, 0, sizeof(sg_io_hdr_t));
|
||||
io_hdr.interface_id = 'S';
|
||||
io_hdr.cmd_len = SMART_READ_CMD_LEN;
|
||||
@@ -28,9 +34,11 @@ QVector<unsigned char> AsciiView::readSMARTData(const QString& device_path) {
|
||||
|
||||
if (ioctl(fd, SG_IO, &io_hdr) < 0) {
|
||||
close(fd);
|
||||
return result;
|
||||
}
|
||||
|
||||
result.append(QArrayDataPointer<unsigned char>::fromRawData(smart_read_resp, SMART_READ_RESP_LEN));
|
||||
result.resize(SMART_READ_RESP_LEN);
|
||||
memcpy(result.data(), smart_read_resp, SMART_READ_RESP_LEN);
|
||||
|
||||
memset(&io_hdr, 0, sizeof(sg_io_hdr_t));
|
||||
io_hdr.interface_id = 'S';
|
||||
@@ -45,9 +53,13 @@ QVector<unsigned char> AsciiView::readSMARTData(const QString& device_path) {
|
||||
|
||||
if (ioctl(fd, SG_IO, &io_hdr) < 0) {
|
||||
close(fd);
|
||||
return result;
|
||||
}
|
||||
|
||||
result.append(QArrayDataPointer<unsigned char>::fromRawData(inquiry_resp, INQUIRY_RESP_LEN));
|
||||
int currentSize = result.size();
|
||||
result.resize(currentSize + INQUIRY_RESP_LEN);
|
||||
memcpy(result.data() + currentSize, inquiry_resp, INQUIRY_RESP_LEN);
|
||||
|
||||
close(fd);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ void GridView::resizeEvent(QResizeEvent *) {
|
||||
}
|
||||
|
||||
void GridView::setDisks(const QVector<DiskItem> &newDisks) {
|
||||
disks = newDisks;
|
||||
disks = newDisks.toList();
|
||||
populateGrid();
|
||||
}
|
||||
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Als JSON speichern</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>Αποθήκευση &JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>Guardar Archivo JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Salva JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>JSONを保存(&S)</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Saglabāt JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Salvar JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Сохранить JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Зберегти JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&Save JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>保存 J&SON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
@@ -366,10 +366,6 @@
|
||||
<source>PNG Files (*.png)</source>
|
||||
<translation type="unfinished">PNG Files (*.png)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Save JSON</source>
|
||||
<translation>&儲存 JSON</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
|
||||
Reference in New Issue
Block a user