X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/576a97d8eb9601f4ad74def6528cc90fffe97b1c..9061b22a0d0bc6bd7b9a1c31a5296bd00af60d0b:/src/settings/viewpropsprogressinfo.cpp diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp index 57a00c2b1..a3692be51 100644 --- a/src/settings/viewpropsprogressinfo.cpp +++ b/src/settings/viewpropsprogressinfo.cpp @@ -9,7 +9,6 @@ #include "applyviewpropsjob.h" #include "views/viewproperties.h" -#include #include #include @@ -19,17 +18,15 @@ #include #include -ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent, - const QUrl& dir, - const ViewProperties& viewProps) : - QDialog(parent), - m_dir(dir), - m_viewProps(nullptr), - m_label(nullptr), - m_progressBar(nullptr), - m_dirSizeJob(nullptr), - m_applyViewPropsJob(nullptr), - m_timer(nullptr) +ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget *parent, const QUrl &dir, const ViewProperties &viewProps) + : QDialog(parent) + , m_dir(dir) + , m_viewProps(nullptr) + , m_label(nullptr) + , m_progressBar(nullptr) + , m_dirSizeJob(nullptr) + , m_applyViewPropsJob(nullptr) + , m_timer(nullptr) { const QSize minSize = minimumSize(); setMinimumSize(QSize(320, minSize.height())); @@ -44,7 +41,6 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent, m_viewProps->setAutoSaveEnabled(false); auto layout = new QVBoxLayout(this); - setLayout(layout); m_label = new QLabel(i18nc("@info:progress", "Counting folders: %1", 0), this); layout->addWidget(m_label); @@ -66,15 +62,13 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent, // allows to give a progress indication for the user when applying the view // properties later. m_dirSizeJob = KIO::directorySize(dir); - connect(m_dirSizeJob, &KIO::DirectorySizeJob::result, - this, &ViewPropsProgressInfo::applyViewProperties); + connect(m_dirSizeJob, &KIO::DirectorySizeJob::result, this, &ViewPropsProgressInfo::applyViewProperties); // The directory size job cannot emit any progress signal, as it is not aware // about the total number of directories. Therefor a timer is triggered, which // periodically updates the current directory count. m_timer = new QTimer(this); - connect(m_timer, &QTimer::timeout, - this, &ViewPropsProgressInfo::updateProgress); + connect(m_timer, &QTimer::timeout, this, &ViewPropsProgressInfo::updateProgress); m_timer->start(300); } @@ -84,7 +78,7 @@ ViewPropsProgressInfo::~ViewPropsProgressInfo() m_viewProps = nullptr; } -void ViewPropsProgressInfo::closeEvent(QCloseEvent* event) +void ViewPropsProgressInfo::closeEvent(QCloseEvent *event) { m_timer->stop(); m_applyViewPropsJob = nullptr; @@ -132,7 +126,5 @@ void ViewPropsProgressInfo::applyViewProperties() m_dirSizeJob = nullptr; m_applyViewPropsJob = new ApplyViewPropsJob(m_dir, *m_viewProps); - connect(m_applyViewPropsJob, &ApplyViewPropsJob::result, - this, &ViewPropsProgressInfo::close); + connect(m_applyViewPropsJob, &ApplyViewPropsJob::result, this, &ViewPropsProgressInfo::close); } -