SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / views / dolphinnewfilemenuobserver.cpp

diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index 353f1f33ce59cb7bf6075952db48bec3637ee09f..fa549cf84aac0ea78ccdb92be61d75c1f3639ad9 100644 (file)
--- a/src/views/dolphinnewfilemenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -1,25 +1,11 @@
-/***************************************************************************
- *   Copyright (C) 2009 by Peter Penz <peter.penz19@gmail.com>             *
- *                                                                         *
- *   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: 2009 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "dolphinnewfilemenuobserver.h"
 
-#include <KGlobal>
 #include "dolphinnewfilemenu.h"
 
 class DolphinNewFileMenuObserverSingleton
@@ -27,35 +13,29 @@ class DolphinNewFileMenuObserverSingleton
 public:
     DolphinNewFileMenuObserver instance;
 };
-K_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)
+Q_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)
 
-DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance()
+DolphinNewFileMenuObserver &DolphinNewFileMenuObserver::instance()
 {
     return s_DolphinNewFileMenuObserver->instance;
 }
 
-void DolphinNewFileMenuObserver::attach(const DolphinNewFileMenu* menu)
+void DolphinNewFileMenuObserver::attach(const DolphinNewFileMenu *menu)
 {
-    connect(menu, &DolphinNewFileMenu::fileCreated,
-            this, &DolphinNewFileMenuObserver::itemCreated);
-    connect(menu, &DolphinNewFileMenu::directoryCreated,
-            this, &DolphinNewFileMenuObserver::itemCreated);
-    connect(menu, &DolphinNewFileMenu::errorMessage,
-            this, &DolphinNewFileMenuObserver::errorMessage);
+    connect(menu, &DolphinNewFileMenu::fileCreated, this, &DolphinNewFileMenuObserver::itemCreated);
+    connect(menu, &DolphinNewFileMenu::directoryCreated, this, &DolphinNewFileMenuObserver::itemCreated);
+    connect(menu, &DolphinNewFileMenu::errorMessage, this, &DolphinNewFileMenuObserver::errorMessage);
 }
 
-void DolphinNewFileMenuObserver::detach(const DolphinNewFileMenu* menu)
+void DolphinNewFileMenuObserver::detach(const DolphinNewFileMenu *menu)
 {
-    disconnect(menu, &DolphinNewFileMenu::fileCreated,
-               this, &DolphinNewFileMenuObserver::itemCreated);
-    disconnect(menu, &DolphinNewFileMenu::directoryCreated,
-               this, &DolphinNewFileMenuObserver::itemCreated);
-    disconnect(menu, &DolphinNewFileMenu::errorMessage,
-               this, &DolphinNewFileMenuObserver::errorMessage);
+    disconnect(menu, &DolphinNewFileMenu::fileCreated, this, &DolphinNewFileMenuObserver::itemCreated);
+    disconnect(menu, &DolphinNewFileMenu::directoryCreated, this, &DolphinNewFileMenuObserver::itemCreated);
+    disconnect(menu, &DolphinNewFileMenu::errorMessage, this, &DolphinNewFileMenuObserver::errorMessage);
 }
 
-DolphinNewFileMenuObserver::DolphinNewFileMenuObserver() :
-    QObject(0)
+DolphinNewFileMenuObserver::DolphinNewFileMenuObserver()
+    : QObject(nullptr)
 {
 }
 
@@ -63,4 +43,4 @@ DolphinNewFileMenuObserver::~DolphinNewFileMenuObserver()
 {
 }
 
-#include "dolphinnewfilemenuobserver.moc"
+#include "moc_dolphinnewfilemenuobserver.cpp"