Merge remote-tracking branch 'origin/release/20.12'

[dolphin.git] / src / dolphinnewfilemenu.h

diff --git a/src/dolphinnewfilemenu.h b/src/dolphinnewfilemenu.h
index 9f1cb55991f780058ed5add533161e35c3287f97..5b2cc5e7555c2a3ffd14a23a3fee79f77eac866d 100644 (file)
--- a/src/dolphinnewfilemenu.h
+++ b/src/dolphinnewfilemenu.h
@@ -1,30 +1,15 @@
-/***************************************************************************
- *   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
+ */
 #ifndef DOLPHINNEWFILEMENU_H
 #define DOLPHINNEWFILEMENU_H
 
-#include <KNewFileMenu>
-
 #include "dolphin_export.h"
 
+#include <KNewFileMenu>
+
 class KJob;
 
 /**
@@ -41,14 +26,14 @@ class DOLPHIN_EXPORT DolphinNewFileMenu : public KNewFileMenu
 
 public:
     DolphinNewFileMenu(KActionCollection* collection, QObject* parent);
-    virtual ~DolphinNewFileMenu();
+    ~DolphinNewFileMenu() override;
 
 signals:
     void errorMessage(const QString& error);
 
 protected slots:
     /** @see KNewFileMenu::slotResult() */
-    virtual void slotResult(KJob* job) Q_DECL_OVERRIDE;
+    void slotResult(KJob* job) override;
 };
 
 #endif