From aa762266ae4415ed85fc7b60e2bbec3edc9e978e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 11 Sep 2017 18:46:48 +0100 Subject: [PATCH] Fix some minor clang warnings. --- src/gui/applyprogressdialog.cpp | 2 +- src/gui/applyprogressdialogwidget.cpp | 2 +- src/gui/infopane.cpp | 2 +- src/gui/infopane.h | 2 +- src/gui/partitionmanagerwidget.cpp | 8 ++++---- src/gui/scanprogressdialog.h | 2 +- src/gui/sizedialogbase.cpp | 12 ++++++------ src/gui/sizedialogbase.h | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/gui/applyprogressdialog.cpp b/src/gui/applyprogressdialog.cpp index f323b87..8b35a2f 100644 --- a/src/gui/applyprogressdialog.cpp +++ b/src/gui/applyprogressdialog.cpp @@ -97,7 +97,7 @@ ApplyProgressDialog::ApplyProgressDialog(QWidget* parent, OperationRunner& orunn dialogButtonBox->addButton(detailsButton, QDialogButtonBox::ActionRole); mainLayout->addWidget(dialogButtonBox); - dialogWidget().treeTasks().setColumnWidth(0, width() * 0.8); + dialogWidget().treeTasks().setColumnWidth(0, width() * 8 / 10); detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme(QStringLiteral("document-open")).pixmap(IconSize(KIconLoader::Toolbar))); detailsWidget().buttonSave().setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(IconSize(KIconLoader::Toolbar))); diff --git a/src/gui/applyprogressdialogwidget.cpp b/src/gui/applyprogressdialogwidget.cpp index fd10f50..4a834b9 100644 --- a/src/gui/applyprogressdialogwidget.cpp +++ b/src/gui/applyprogressdialogwidget.cpp @@ -20,4 +20,4 @@ ApplyProgressDialogWidget::ApplyProgressDialogWidget(QWidget* parent) : QWidget(parent) { setupUi(this); m_TreeTasks->header()->setSectionResizeMode(QHeaderView::ResizeToContents); -} \ No newline at end of file +} diff --git a/src/gui/infopane.cpp b/src/gui/infopane.cpp index 8bf0907..4f34314 100644 --- a/src/gui/infopane.cpp +++ b/src/gui/infopane.cpp @@ -200,7 +200,7 @@ void InfoPane::showDevice(Qt::DockWidgetArea area, const Device& d) } } -quint32 InfoPane::cols(Qt::DockWidgetArea area) const +qint32 InfoPane::cols(Qt::DockWidgetArea area) const { if (area == Qt::LeftDockWidgetArea || area == Qt::RightDockWidgetArea) return 2; diff --git a/src/gui/infopane.h b/src/gui/infopane.h index aadb38b..c6101a6 100644 --- a/src/gui/infopane.h +++ b/src/gui/infopane.h @@ -53,7 +53,7 @@ protected: Q_ASSERT(m_GridLayout); return *m_GridLayout; } - quint32 cols(Qt::DockWidgetArea area) const; + qint32 cols(Qt::DockWidgetArea area) const; private: QGridLayout* m_GridLayout; diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp index bbfdbeb..f0b6906 100644 --- a/src/gui/partitionmanagerwidget.cpp +++ b/src/gui/partitionmanagerwidget.cpp @@ -210,7 +210,7 @@ static QTreeWidgetItem* createTreeWidgetItem(const Partition& p) { QTreeWidgetItem* item = new PartitionTreeWidgetItem(&p); - quint32 i = 0; + int i = 0; item->setText(i++, p.deviceNode()); if (p.roles().has(PartitionRole::Luks) && p.fileSystem().name() != p.fileSystem().nameForType(FileSystem::Luks)) @@ -328,11 +328,11 @@ void PartitionManagerWidget::on_m_PartTableWidget_itemSelectionChanged(PartWidge if (p) { QList findResult = treePartitions().findItems(p->deviceNode(), Qt::MatchFixedString | Qt::MatchRecursive, 0); - for (const auto &item : findResult) { - const PartitionTreeWidgetItem* ptwItem = dynamic_cast(item); + for (const auto &treeWidgetItem : findResult) { + const PartitionTreeWidgetItem* ptwItem = dynamic_cast(treeWidgetItem); if (ptwItem && ptwItem->partition() == p) { - treePartitions().setCurrentItem(item); + treePartitions().setCurrentItem(treeWidgetItem); break; } } diff --git a/src/gui/scanprogressdialog.h b/src/gui/scanprogressdialog.h index 27f46c1..c3bbb93 100644 --- a/src/gui/scanprogressdialog.h +++ b/src/gui/scanprogressdialog.h @@ -28,7 +28,7 @@ class ScanProgressDialog : public QProgressDialog public: ScanProgressDialog(QWidget* parent); - void setProgress(quint32 p) { + void setProgress(int p) { setValue(p); } void setDeviceName(const QString& d); diff --git a/src/gui/sizedialogbase.cpp b/src/gui/sizedialogbase.cpp index c4c02b0..a90ec9d 100644 --- a/src/gui/sizedialogbase.cpp +++ b/src/gui/sizedialogbase.cpp @@ -113,8 +113,8 @@ void SizeDialogBase::setupConstraints() dialogWidget().spinFreeAfter().setEnabled(moveAllowed); detailsWidget().spinFirstSector().setEnabled(moveAllowed); - setMinimumLength(!canShrink() ? partition().length() : qMax(partition().sectorsUsed(), partition().minimumSectors())); - setMaximumLength(!canGrow() ? partition().length() : qMin(maximumLastSector() - minimumFirstSector() + 1, partition().maximumSectors())); + setMinimumLength(!canShrink() ? partition().length() : std::max(partition().sectorsUsed(), partition().minimumSectors())); + setMaximumLength(!canGrow() ? partition().length() : std::min(maximumLastSector() - minimumFirstSector() + 1, partition().maximumSectors())); dialogWidget().partResizerWidget().setMinimumLength(minimumLength()); dialogWidget().partResizerWidget().setMaximumLength(maximumLength()); @@ -210,7 +210,7 @@ void SizeDialogBase::onSpinCapacityChanged(double newCapacity) qint64 newLength = qBound( minimumLength(), dialogUnitToSectors(device(), newCapacity), - qMin(maximumLastSector() - minimumFirstSector() + 1, maximumLength()) + std::min(maximumLastSector() - minimumFirstSector() + 1, maximumLength()) ); if (newLength == partition().length()) @@ -218,7 +218,7 @@ void SizeDialogBase::onSpinCapacityChanged(double newCapacity) qint64 delta = newLength - partition().length(); - qint64 tmp = qMin(delta, maximumLastSector() - partition().lastSector()); + qint64 tmp = std::min(delta, maximumLastSector() - partition().lastSector()); delta -= tmp; const bool signalState = dialogWidget().partResizerWidget().blockSignals(true); @@ -291,7 +291,7 @@ void SizeDialogBase::onSpinFreeAfterChanged(double newAfter) updateSpinFreeAfter(dialogUnitToSectors(device(), oldAfter)); } -void SizeDialogBase::onSpinFirstSectorChanged(double newFirst) +void SizeDialogBase::onSpinFirstSectorChanged(qint64 newFirst) { if (newFirst >= minimumFirstSector() && dialogWidget().partResizerWidget().updateFirstSector(newFirst)) setDirty(); @@ -301,7 +301,7 @@ void SizeDialogBase::onSpinFirstSectorChanged(double newFirst) updateSpinFirstSector(partition().firstSector()); } -void SizeDialogBase::onSpinLastSectorChanged(double newLast) +void SizeDialogBase::onSpinLastSectorChanged(qint64 newLast) { if (newLast <= maximumLastSector() && dialogWidget().partResizerWidget().updateLastSector(newLast)) setDirty(); diff --git a/src/gui/sizedialogbase.h b/src/gui/sizedialogbase.h index 66e5640..487143a 100644 --- a/src/gui/sizedialogbase.h +++ b/src/gui/sizedialogbase.h @@ -122,8 +122,8 @@ protected: void onSpinFreeBeforeChanged(double newBefore); void onSpinFreeAfterChanged(double newAfter); - void onSpinFirstSectorChanged(double newFirst); - void onSpinLastSectorChanged(double newLast); + void onSpinFirstSectorChanged(qint64 newFirst); + void onSpinLastSectorChanged(qint64 newLast); void onAlignToggled(bool); void toggleDetails();