TheLanc3/QDiskInfo
1
0
Fork 0
mirror of https://github.com/edisionnano/QDiskInfo.git synced 2026-03-07 20:09:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Addressed some issues with the code that produced warnings

Browse Source
This commit is contained in:
spiros
2024-06-22 17:55:48 +03:00
parent 0d1e794898
commit dc8100d3ee
4 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils.cpp
View File

@@ -14,7 +14,7 @@ void utils::clearButtonGroup(QButtonGroup* buttonGroup, QHBoxLayout* horizontalL
menuDisk->clear();
}
QString utils::getSmartctlPath(bool initializing) {
QString utils::getSmartctlPath() {
QStringList paths = QString::fromLocal8Bit(qgetenv("PATH")).split(QDir::listSeparator(), Qt::SkipEmptyParts);
paths << "/usr/sbin" << "/usr/local/sbin";
@@ -37,10 +37,10 @@ QString utils::getSmartctlOutput(const QStringList &arguments, bool root, bool i
if (root) {
command = "pkexec";
} else {
command = getSmartctlPath(initializing);
command = getSmartctlPath();
}
if (!getSmartctlPath(initializing).isEmpty()) {
if (!getSmartctlPath().isEmpty()) {
process.start(command, arguments);
process.waitForFinished(-1);
}
@@ -67,7 +67,7 @@ QPair<QStringList, QJsonArray> utils::scanDevices(bool initializing)
QJsonDocument doc = QJsonDocument::fromJson(output.toUtf8());
QJsonObject jsonObj = doc.object();
QJsonArray devices = jsonObj["devices"].toArray();
QString smartctlPath = getSmartctlPath(initializing);
QString smartctlPath = getSmartctlPath();
QStringList commandList;
QStringList deviceOutputs;
@@ -112,7 +112,7 @@ QPair<QStringList, QJsonArray> utils::scanDevices(bool initializing)
QString utils::initiateSelfTest(const QString &testType, const QString &deviceNode)
{
QProcess process;
QString command = getSmartctlPath(false);
QString command = getSmartctlPath();
QStringList arguments;
arguments << command << "--json=o" << "-t" << testType << deviceNode;
@@ -129,7 +129,7 @@ QString utils::initiateSelfTest(const QString &testType, const QString &deviceNo
void utils::cancelSelfTest(const QString &deviceNode)
{
QProcess process;
QString command = getSmartctlPath(false);
QString command = getSmartctlPath();
QStringList arguments;
arguments << command << "-X" << deviceNode;