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

Assign the correct type to some variable and fix shadowing cases

Browse Source
This commit is contained in:
spiros
2024-06-22 19:39:59 +03:00
parent 86c4c7647f
commit 94da0612a5
6 changed files with 73 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/custombutton.cpp
View File

@@ -1,8 +1,8 @@
#include "custombutton.h"
#include <QFontMetrics>
CustomButton::CustomButton(const QString &text1, const QString &text2, const QString &text3, const QColor &lineColor, QWidget *parent)
: QPushButton(parent), text1(text1), text2(text2), text3(text3), lineColor(lineColor) {
CustomButton::CustomButton(const QString &text1_, const QString &text2_, const QString &text3_, const QColor &lineColor_, QWidget *parent)
: QPushButton(parent), text1(text1_), text2(text2_), text3(text3_), lineColor(lineColor_) {
setMinimumHeight(60);
adjustWidthToFitText();
}

3
src/custombutton.h
View File

@@ -8,7 +8,7 @@ class CustomButton : public QPushButton {
Q_OBJECT
public:
CustomButton(const QString &text1, const QString &text2, const QString &text3, const QColor &lineColor, QWidget *parent = nullptr);
CustomButton(const QString &text1_, const QString &text2_, const QString &text3_, const QColor &lineColor_, QWidget *parent = nullptr);
protected:
void paintEvent(QPaintEvent *event) override;
@@ -18,7 +18,6 @@ protected:
void setText3(const QString &newText3);
void adjustWidthToFitText();
private:
QString text1;
QString text2;

8
src/jsonparser.cpp
View File

@@ -32,10 +32,10 @@ QVector<QPair<QString, int>> JsonParser::parse(const QString &json)
if (trimmedLine.contains("}")) {
break;
}
int colon_pos = trimmedLine.indexOf(":");
if (colon_pos != -1) {
QString key = removeQuotes(trimmedLine.left(colon_pos));
QString valueString = trimmedLine.mid(colon_pos + 1).trimmed();
qsizetype colonPos = trimmedLine.indexOf(":");
if (colonPos != -1) {
QString key = removeQuotes(trimmedLine.left(colonPos));
QString valueString = trimmedLine.mid(colonPos + 1).trimmed();
valueString.chop(1);
int value = valueString.toInt();
data.append(qMakePair(key, value));

109
src/mainwindow.cpp
View File

@@ -104,21 +104,21 @@ MainWindow::~MainWindow()
void MainWindow::onNextButtonClicked()
{
int currentIndex = buttonGroup->buttons().indexOf(buttonGroup->checkedButton());
int nextIndex = (currentIndex + 1) % buttonGroup->buttons().size();
qsizetype currentIndex = buttonGroup->buttons().indexOf(buttonGroup->checkedButton());
qsizetype nextIndex = (currentIndex + 1) % buttonGroup->buttons().size();
buttonGroup->buttons().at(nextIndex)->click();
updateNavigationButtons(nextIndex);
}
void MainWindow::onPrevButtonClicked()
{
int currentIndex = buttonGroup->buttons().indexOf(buttonGroup->checkedButton());
int prevIndex = (currentIndex - 1 + buttonGroup->buttons().size()) % buttonGroup->buttons().size();
qsizetype currentIndex = buttonGroup->buttons().indexOf(buttonGroup->checkedButton());
qsizetype prevIndex = (currentIndex - 1 + buttonGroup->buttons().size()) % buttonGroup->buttons().size();
buttonGroup->buttons().at(prevIndex)->click();
updateNavigationButtons(prevIndex);
}
void MainWindow::updateNavigationButtons(int currentIndex)
void MainWindow::updateNavigationButtons(qsizetype currentIndex)
{
prevButton->setEnabled(currentIndex > 0 || (ui->actionCyclic_Navigation->isChecked() && buttonGroup->buttons().size() > 1)); // We can use setVisible if we want to mimic CrystalDiskInfo
nextButton->setEnabled(currentIndex < buttonGroup->buttons().size() - 1 || ui->actionCyclic_Navigation->isChecked());
@@ -151,7 +151,7 @@ void MainWindow::updateUI()
QString health;
QColor healthColor;
float diskCapacityGB = localObj.value("user_capacity").toObject().value("bytes").toDouble() / 1e9;
double diskCapacityGB = localObj.value("user_capacity").toObject().value("bytes").toDouble() / 1e9;
QString gbSymbol = locale.formattedDataSize(1 << 30, 1, QLocale::DataSizeTraditionalFormat).split(' ')[1];
QString tbSymbol = locale.formattedDataSize(qint64(1) << 40, 1, QLocale::DataSizeTraditionalFormat).split(' ')[1];
QString diskCapacityString;
@@ -243,7 +243,7 @@ void MainWindow::updateUI()
button->setCheckable(true);
button->setAutoExclusive(true);
int buttonIndex = buttonGroup->buttons().indexOf(button);
qsizetype buttonIndex = buttonGroup->buttons().indexOf(button);
auto updateWindow = [=]() {
if (isNvme) {
@@ -295,7 +295,7 @@ void MainWindow::populateWindow(const QJsonObject &localObj, const QString &heal
QJsonObject nvmeLog = localObj["nvme_smart_health_information_log"].toObject();
QString modelName = localObj["model_name"].toString();
QString firmwareVersion = localObj["firmware_version"].toString();
float diskCapacityGB = localObj.value("user_capacity").toObject().value("bytes").toDouble() / 1e9;
double diskCapacityGB = localObj.value("user_capacity").toObject().value("bytes").toDouble() / 1e9;
int diskCapacityGbInt = static_cast<int>(diskCapacityGB);
int temperatureInt = localObj["temperature"].toObject()["current"].toInt();
int totalWritesInt = 0;
@@ -329,32 +329,38 @@ void MainWindow::populateWindow(const QJsonObject &localObj, const QString &heal
auto createTablePopup = [=](QJsonArray selfTestsTable) {
QWidget *popup = new QWidget();
QTableWidget *tableWidget = new QTableWidget();
QTableWidget *selfTestsTableWidget = new QTableWidget();
selfTestsTableWidget->setFocusPolicy(Qt::NoFocus);
tableWidget->setRowCount(selfTestsTable.size());
tableWidget->setColumnCount(3);
tableWidget->verticalHeader()->setVisible(false);
tableWidget->setHorizontalHeaderLabels({tr("Type"), tr("Status"), tr("Power On Hours")});
qsizetype rowCount = selfTestsTable.size();
if (rowCount > std::numeric_limits<int>::max()) {
rowCount = std::numeric_limits<int>::max();
}
for (int i = 0; i < selfTestsTable.size(); ++i) {
selfTestsTableWidget->setRowCount(static_cast<int>(rowCount));
selfTestsTableWidget->setColumnCount(3);
selfTestsTableWidget->verticalHeader()->setVisible(false);
selfTestsTableWidget->setHorizontalHeaderLabels({tr("Type"), tr("Status"), tr("Power On Hours")});
for (int i = 0; i < rowCount; ++i) {
QJsonObject entry = selfTestsTable[i].toObject();
QTableWidgetItem *item;
if (isNvme) {
tableWidget->setItem(i, 0, new QTableWidgetItem(entry["self_test_code"].toObject()["string"].toString()));
tableWidget->setItem(i, 1, new QTableWidgetItem(entry["self_test_result"].toObject()["string"].toString()));
selfTestsTableWidget->setItem(i, 0, new QTableWidgetItem(entry["self_test_code"].toObject()["string"].toString()));
selfTestsTableWidget->setItem(i, 1, new QTableWidgetItem(entry["self_test_result"].toObject()["string"].toString()));
item = new QTableWidgetItem(QString::number(entry["power_on_hours"].toInt()));
} else {
tableWidget->setItem(i, 0, new QTableWidgetItem(entry["type"].toObject()["string"].toString()));
tableWidget->setItem(i, 1, new QTableWidgetItem(entry["status"].toObject()["string"].toString()));
selfTestsTableWidget->setItem(i, 0, new QTableWidgetItem(entry["type"].toObject()["string"].toString()));
selfTestsTableWidget->setItem(i, 1, new QTableWidgetItem(entry["status"].toObject()["string"].toString()));
item = new QTableWidgetItem(QString::number(entry["lifetime_hours"].toInt()));
}
item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
tableWidget->setItem(i, 2, item);
selfTestsTableWidget->setItem(i, 2, item);
}
for (int i = 0; i < tableWidget->columnCount(); ++i) {
QTableWidgetItem *headerItem = tableWidget->horizontalHeaderItem(i);
for (int i = 0; i < selfTestsTableWidget->columnCount(); ++i) {
QTableWidgetItem *headerItem = selfTestsTableWidget->horizontalHeaderItem(i);
if (headerItem) {
if (i == 2) {
headerItem->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
@@ -365,19 +371,19 @@ void MainWindow::populateWindow(const QJsonObject &localObj, const QString &heal
}
tableWidget->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
for (int i = 0; i < tableWidget->columnCount(); ++i) {
selfTestsTableWidget->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
for (int i = 0; i < selfTestsTableWidget->columnCount(); ++i) {
if (i != 1) {
tableWidget->horizontalHeader()->setSectionResizeMode(i, QHeaderView::ResizeToContents);
selfTestsTableWidget->horizontalHeader()->setSectionResizeMode(i, QHeaderView::ResizeToContents);
}
}
tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
tableWidget->verticalHeader()->setDefaultSectionSize(31);
tableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
selfTestsTableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
selfTestsTableWidget->verticalHeader()->setDefaultSectionSize(31);
selfTestsTableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
QVBoxLayout *layout = new QVBoxLayout;
layout->addWidget(tableWidget);
layout->addWidget(selfTestsTableWidget);
popup->setLayout(layout);
popup->setWindowTitle(tr("Self Test Log"));
popup->resize(400, 400);
@@ -449,10 +455,10 @@ void MainWindow::populateWindow(const QJsonObject &localObj, const QString &heal
double gigabytes = (attrObj["raw"].toObject()["value"].toInt() * 32 * 1024.0 * 1024.0) / 1e9;
totalWritesInt = static_cast<int>(gigabytes);
} else if (attrObj["name"] == "Total_LBAs_Written") {
unsigned int logicalBlockSize = localObj["logical_block_size"].toInt();
unsigned long long lbaWritten = attrObj["raw"].toObject()["value"].toVariant().toLongLong();
unsigned long long oneGB = static_cast<unsigned long long>(std::pow(2, 30));
unsigned long long gigabytes = (lbaWritten * logicalBlockSize) / oneGB;
int logicalBlockSize = localObj["logical_block_size"].toInt();
qlonglong lbaWritten = attrObj["raw"].toObject()["value"].toVariant().toLongLong();
qlonglong oneGB = static_cast<qlonglong>(std::pow(2, 30));
qlonglong gigabytes = (lbaWritten * logicalBlockSize) / oneGB;
totalWritesInt = static_cast<int>(gigabytes);
} else if (attrObj["name"] == "Host_Writes_GiB" || attrObj["name"] == "Lifetime_Writes_GiB") {
double gibibytes = attrObj["raw"].toObject()["value"].toDouble();
@@ -470,10 +476,10 @@ void MainWindow::populateWindow(const QJsonObject &localObj, const QString &heal
double gigabytes = (attrObj["raw"].toObject()["value"].toInt() * 32 * 1024.0 * 1024.0) / 1e9;
totalReadsInt = static_cast<int>(gigabytes);
} else if (attrObj["name"] == "Total_LBAs_Read") {
unsigned int logicalBlockSize = localObj["logical_block_size"].toInt();
unsigned long long lbaRead = attrObj["raw"].toObject()["value"].toVariant().toLongLong();
unsigned long long oneGB = static_cast<unsigned long long>(std::pow(2, 30));
unsigned long long gigabytes = (lbaRead * logicalBlockSize) / oneGB;
int logicalBlockSize = localObj["logical_block_size"].toInt();
qlonglong lbaRead = attrObj["raw"].toObject()["value"].toVariant().toLongLong();
qlonglong oneGB = static_cast<qlonglong>(std::pow(2, 30));
qlonglong gigabytes = (lbaRead * logicalBlockSize) / oneGB;
totalReadsInt = static_cast<int>(gigabytes);
} else if (attrObj["name"] == "Host_Reads_GiB" || attrObj["name"] == "Lifetime_Reads_GiB") {
double gibibytes = attrObj["raw"].toObject()["value"].toDouble();
@@ -485,10 +491,10 @@ void MainWindow::populateWindow(const QJsonObject &localObj, const QString &heal
}
} else if (attrObj["id"] == 246) { // MX500
if (attrObj["name"] == "Total_LBAs_Written") {
unsigned int logicalBlockSize = localObj["logical_block_size"].toInt();
unsigned long long lbaWritten = attrObj["raw"].toObject()["value"].toVariant().toLongLong();
unsigned long long oneGB = static_cast<unsigned long long>(std::pow(2, 30));
unsigned long long gigabytes = (lbaWritten * logicalBlockSize) / oneGB;
int logicalBlockSize = localObj["logical_block_size"].toInt();
qlonglong lbaWritten = attrObj["raw"].toObject()["value"].toVariant().toLongLong();
qlonglong oneGB = static_cast<qlonglong>(std::pow(2, 30));
qlonglong gigabytes = (lbaWritten * logicalBlockSize) / oneGB;
totalWritesInt = static_cast<int>(gigabytes);
}
} else if (attrObj["name"] == "Remaining_Lifetime_Perc") {
@@ -568,7 +574,7 @@ void MainWindow::populateWindow(const QJsonObject &localObj, const QString &heal
nvmeHasSelfTest = true;
}
} else if (stringValue.startsWith("Warning Comp. Temp. Threshold")) {
int pos = stringValue.indexOf(':');
qsizetype pos = stringValue.indexOf(':');
if (pos != -1) {
QString thresholdStr = stringValue.mid(pos + 1).trimmed();
int temperature = thresholdStr.section(' ', 0, 0).toInt();
@@ -577,7 +583,7 @@ void MainWindow::populateWindow(const QJsonObject &localObj, const QString &heal
}
}
} else if (stringValue.startsWith("Critical Comp. Temp. Threshold")) {
int pos = stringValue.indexOf(':');
qsizetype pos = stringValue.indexOf(':');
if (pos != -1) {
QString thresholdStr = stringValue.mid(pos + 1).trimmed();
int temperature = thresholdStr.section(' ', 0, 0).toInt();
@@ -721,11 +727,17 @@ void MainWindow::addNvmeLogTable(const QVector<QPair<QString, int>>& nvmeLogOrde
{
QString warningMessage = "";
qsizetype rowCount = nvmeLogOrdered.size();
if (rowCount > std::numeric_limits<int>::max()) {
rowCount = std::numeric_limits<int>::max();
}
tableWidget->setRowCount(static_cast<int>(rowCount));
tableWidget->setColumnCount(4);
tableWidget->setHorizontalHeaderLabels({"", tr("ID"), tr("Attribute Name"), tr("Raw Values")});
tableWidget->verticalHeader()->setVisible(false);
tableWidget->setItemDelegateForColumn(0, new StatusDot(tableWidget));
tableWidget->setRowCount(nvmeLogOrdered.size());
tableWidget->horizontalHeaderItem(2)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
tableWidget->horizontalHeaderItem(3)->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
@@ -817,11 +829,16 @@ void MainWindow::addNvmeLogTable(const QVector<QPair<QString, int>>& nvmeLogOrde
void MainWindow::addSmartAttributesTable(const QJsonArray &attributes)
{
qsizetype rowCount = attributes.size();
if (rowCount > std::numeric_limits<int>::max()) {
rowCount = std::numeric_limits<int>::max();
}
tableWidget->setRowCount(static_cast<int>(rowCount));
tableWidget->setColumnCount(7);
tableWidget->setHorizontalHeaderLabels({"", tr("ID"), tr("Attribute Name"), tr("Current"), tr("Worst"), tr("Threshold"), tr("Raw Values")});
tableWidget->verticalHeader()->setVisible(false);
tableWidget->setItemDelegateForColumn(0, new StatusDot(tableWidget));
tableWidget->setRowCount(attributes.size());
for (int i = 0; i < tableWidget->columnCount(); ++i) {
QTableWidgetItem *headerItem = tableWidget->horizontalHeaderItem(i);
@@ -845,7 +862,7 @@ void MainWindow::addSmartAttributesTable(const QJsonArray &attributes)
QString rawString = attrObj["raw"].toObject()["string"].toString();
QString rawHEX = rawString;
int spaceIndex = rawHEX.indexOf(' ');
qsizetype spaceIndex = rawHEX.indexOf(' ');
if (spaceIndex != -1) {
rawHEX = rawHEX.left(spaceIndex);
}
@@ -1003,7 +1020,7 @@ void MainWindow::on_actionUse_Fahrenheit_toggled(bool enabled)
void MainWindow::on_actionCyclic_Navigation_toggled(bool cyclicNavigation)
{
settings.setValue("CyclicNavigation", cyclicNavigation);
int currentIndex = buttonGroup->buttons().indexOf(buttonGroup->checkedButton());
qsizetype currentIndex = buttonGroup->buttons().indexOf(buttonGroup->checkedButton());
updateNavigationButtons(currentIndex);
}

2
src/mainwindow.h
View File

@@ -67,7 +67,7 @@ private:
void onNextButtonClicked();
void onPrevButtonClicked();
void updateNavigationButtons(int currentIndex);
void updateNavigationButtons(qsizetype currentIndex);
void updateUI();
void populateWindow(const QJsonObject &tempObj, const QString &health, const QVector<QPair<QString, int>>& nvmeLogOrdered = QVector<QPair<QString, int>>());
void addNvmeLogTable(const QVector<QPair<QString, int>>& nvmeLogOrdered);

6
src/utils.cpp
View File

@@ -85,8 +85,8 @@ QPair<QStringList, QJsonArray> utils::scanDevices(bool initializing)
QString allDevicesOutput = getSmartctlOutput({"sh", "-c", command}, true, initializing);
int startIndex = 0;
int endIndex = 0;
qsizetype startIndex = 0;
qsizetype endIndex = 0;
static const QRegularExpression regex("\\}\\n\\{");
@@ -153,8 +153,6 @@ void utils::selfTestHandler(const QString &mode, const QString &name, const QStr
QJsonDocument testDoc = QJsonDocument::fromJson(output.toUtf8());
QJsonObject testObj = testDoc.object();
QJsonObject smartctlObj = testObj.value("smartctl").toObject();
QJsonObject deviceObj = testObj.value("device").toObject();
QString name = deviceObj.value("name").toString();
int exitStatus = smartctlObj.value("exit_status").toInt();
QJsonArray outputArray = smartctlObj["output"].toArray();