Merge branch 'release/20.08'

[dolphin.git] / src / settings / viewpropsprogressinfo.cpp

diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index 1878c8137269791b55d773684ff01bed1fc46d08..57a00c2b1856ccc293da7b13e77ade855afeb4b0 100644 (file)
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -1,38 +1,23 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Peter Penz                                      *
- *   peter.penz@gmx.at                                                     *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2006 Peter Penz <peter.penz@gmx.at>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "viewpropsprogressinfo.h"
+
 #include "applyviewpropsjob.h"
+#include "views/viewproperties.h"
+
+#include <KConfigGroup>
+#include <KLocalizedString>
 
+#include <QDialogButtonBox>
 #include <QLabel>
 #include <QProgressBar>
+#include <QPushButton>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QDialogButtonBox>
-#include <QPushButton>
-
-#include <KConfigGroup>
-#include <KLocalizedString>
-#include <KIO/Job>
-
-#include <views/viewproperties.h>
 
 ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
                                              const QUrl& dir,
@@ -54,7 +39,7 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
     m_viewProps = new ViewProperties(dir);
     m_viewProps->setDirProperties(viewProps);
 
-    // the view properties are stored by the ViewPropsApplierJob, so prevent
+    // the view properties are stored by the ApplyViewPropsJob, so prevent
     // that the view properties are saved twice:
     m_viewProps->setAutoSaveEnabled(false);