Merge branch 'master' into luks-decorator

src/config/configureoptionsdialog.h

@@ -36,10 +36,10 @@ public:
     ~ConfigureOptionsDialog();
 
 protected Q_SLOTS:
-    virtual void updateSettings();
+    virtual void updateSettings() override;
-    virtual void updateWidgetsDefault();
+    virtual void updateWidgetsDefault() override;
-    virtual bool hasChanged();
+    virtual bool hasChanged() override;
-    virtual bool isDefault();
+    virtual bool isDefault() override;
     void onComboDefaultFileSystemActivated(int) {
         settingsChangedSlot();
     }

src/gui/applyprogressdialog.h

@@ -82,8 +82,8 @@ protected Q_SLOTS:
     void updateReport(bool force = false);
 
 protected:
-    void closeEvent(QCloseEvent* e);
+    void closeEvent(QCloseEvent* e) override;
-    void keyPressEvent(QKeyEvent* e);
+    void keyPressEvent(QKeyEvent* e) override;
 
     void setupConnections();
 

src/gui/applyprogressdialogwidget.cpp

@@ -16,3 +16,8 @@
  *************************************************************************/
 
 #include "gui/applyprogressdialogwidget.h"
+
+ApplyProgressDialogWidget::ApplyProgressDialogWidget(QWidget* parent) : QWidget(parent) {
+    setupUi(this);
+    m_TreeTasks->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+}

src/gui/applyprogressdialogwidget.h

@@ -27,9 +27,7 @@
 class ApplyProgressDialogWidget : public QWidget, public Ui::ApplyProgressDialogWidgetBase
 {
 public:
-    ApplyProgressDialogWidget(QWidget* parent) : QWidget(parent) {
+    ApplyProgressDialogWidget(QWidget* parent);
-        setupUi(this);
-    }
 
 public:
     QTreeWidget& treeTasks() {

src/gui/applyprogressdialogwidgetbase.ui

@@ -28,6 +28,9 @@
      <property name="columnCount">
       <number>2</number>
      </property>
+     <attribute name="headerStretchLastSection">
+      <bool>true</bool>
+     </attribute>
      <column>
       <property name="text">
        <string>Operations and Jobs</string>

src/gui/editmountpointdialog.h

@@ -42,7 +42,7 @@ protected:
     }
 
 protected Q_SLOTS:
-    void accept();
+    void accept() override;
 
 private:
     Partition& partition() {

src/gui/filesystemsupportdialog.h

@@ -43,7 +43,7 @@ public:
     ~FileSystemSupportDialog();
 
 public:
-    QSize sizeHint() const;
+    QSize sizeHint() const override;
 
 protected Q_SLOTS:
     void onButtonRescanClicked();

src/gui/formattedspinbox.h

@@ -27,8 +27,8 @@ public:
     FormattedSpinBox(QWidget* parent = nullptr) : QDoubleSpinBox(parent) {}
 
 public:
-    virtual QString textFromValue(double value) const;
+    virtual QString textFromValue(double value) const override;
-    virtual double valueFromText(const QString& text) const;
+    virtual double valueFromText(const QString& text) const override;
 
 private:
     QString stripped(const QString &t, int *pos = 0) const;

src/gui/insertdialog.h

@@ -43,8 +43,8 @@ protected:
     const Partition& destPartition() const {
         return m_DestPartition;
     }
-    virtual bool canGrow() const;
+    virtual bool canGrow() const override;
-    virtual bool canShrink() const {
+    virtual bool canShrink() const override {
         return false;
     }
 

src/gui/newdialog.h

@@ -42,26 +42,26 @@ public:
     ~NewDialog();
 
 protected Q_SLOTS:
-    void accept();
+    void accept() override;
     void onRoleChanged(bool);
     void onFilesystemChanged(int);
     void onLabelChanged(const QString& newLabel);
 
 protected:
-    void setupConnections();
+    void setupConnections() override;
-    void setupDialog();
+    void setupDialog() override;
     void updateHideAndShow();
     void updateFileSystem(FileSystem::Type t);
     PartitionRole::Roles partitionRoles() const {
         return m_PartitionRoles;
     }
-    virtual bool canGrow() const {
+    virtual bool canGrow() const override {
         return true;
     }
-    virtual bool canShrink() const {
+    virtual bool canShrink() const override {
         return true;
     }
-    virtual bool canMove() const {
+    virtual bool canMove() const override {
         return true;
     }
 

src/gui/partitionmanagerwidget.cpp

@@ -394,7 +394,7 @@ void PartitionManagerWidget::onMountPartition()
             KMessageBox::detailedSorry(this, xi18nc("@info", "The file system on partition <filename>%1</filename> could not be mounted.", p->deviceNode()), QStringLiteral("<pre>%1</pre>").arg(report.toText()), i18nc("@title:window", "Could Not Mount File System."));
     } else if (p->canUnmount()) {
         if (!p->unmount(report))
-            KMessageBox::detailedSorry(this, xi18nc("@info", "The file system on partition <filename>%1</filename> could not be unmounted.", p->deviceNode()), QStringLiteral("pre>%1</pre>").arg(report.toText()), i18nc("@title:window", "Could Not Unmount File System."));
+            KMessageBox::detailedSorry(this, xi18nc("@info", "The file system on partition <filename>%1</filename> could not be unmounted.", p->deviceNode()), QStringLiteral("<pre>%1</pre>").arg(report.toText()), i18nc("@title:window", "Could Not Unmount File System."));
     }
 
     if (p->roles().has(PartitionRole::Logical)) {

src/gui/parttablewidget.h

@@ -40,10 +40,10 @@ class PartTableWidget : public PartWidgetBase
 
 public:
     PartTableWidget(QWidget* parent);
-    virtual qint32 borderWidth() const {
+    virtual qint32 borderWidth() const override {
         return 0;    /**< @return border width */
     }
-    virtual qint32 borderHeight() const {
+    virtual qint32 borderHeight() const override {
         return 0;    /**< @return border height */
     }
 
@@ -68,9 +68,9 @@ Q_SIGNALS:
     void itemDoubleClicked(const PartWidget*);
 
 protected:
-    void resizeEvent(QResizeEvent* event);
+    void resizeEvent(QResizeEvent* event) override;
-    void mousePressEvent(QMouseEvent* event);
+    void mousePressEvent(QMouseEvent* event) override;
-    void mouseDoubleClickEvent(QMouseEvent* event);
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
 
     const PartitionTable* partitionTable() const {
         return m_PartitionTable;

src/gui/resizedialog.h

@@ -21,7 +21,7 @@
 
 #include "gui/sizedialogbase.h"
 
-#include <qglobal.h>
+#include <QtGlobal>
 
 class Partition;
 class Device;
@@ -48,15 +48,15 @@ public:
     }
 
 public Q_SLOTS:
-    virtual void accept();
+    virtual void accept() override;
-    virtual void reject();
+    virtual void reject() override;
 
 protected:
-    virtual bool canGrow() const;
+    virtual bool canGrow() const override;
-    virtual bool canShrink() const;
+    virtual bool canShrink() const override;
-    virtual bool canMove() const;
+    virtual bool canMove() const override;
-    virtual void setupDialog();
+    virtual void setupDialog() override;
-    virtual void setDirty();
+    virtual void setDirty() override;
     void rollback();
     void setResizedFirstSector(qint64 s) {
         m_ResizedFirstSector = s;

src/gui/scanprogressdialog.h

@@ -31,7 +31,7 @@ public:
     ScanProgressDialog(QWidget* parent);
 
 protected:
-    virtual void showEvent(QShowEvent* e);
+    virtual void showEvent(QShowEvent* e) override;
 
 public:
     void setProgress(quint32 p) {

src/gui/sizedialogbase.h

@@ -21,7 +21,7 @@
 
 #include <util/capacity.h>
 
-#include <qglobal.h>
+#include <QtGlobal>
 #include <QDebug>
 #include <QDialog>
 #include <QPushButton>

src/gui/smartdialog.cpp

@@ -34,7 +34,7 @@
 #include <QTextDocument>
 #include <QTextStream>
 #include <QTreeWidgetItem>
-#include <qglobal.h>
+#include <QtGlobal>
 
 #include <KConfigGroup>
 #include <KFormat>