X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ceba0f6f6a07babac230d1f136d16d34629b4cf3..6dd5525131e13d42f515eba982a6e7cd1153effe:/src/views/dolphinnewfilemenuobserver.cpp diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp index bc3f7658f..fa549cf84 100644 --- a/src/views/dolphinnewfilemenuobserver.cpp +++ b/src/views/dolphinnewfilemenuobserver.cpp @@ -1,57 +1,41 @@ -/*************************************************************************** - * Copyright (C) 2009 by Peter Penz * - * * - * 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 + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphinnewfilemenuobserver.h" -#include -#include +#include "dolphinnewfilemenu.h" 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 KNewFileMenu* menu) +void DolphinNewFileMenuObserver::attach(const DolphinNewFileMenu *menu) { - connect(menu, SIGNAL(fileCreated(const KUrl&)), - this, SIGNAL(itemCreated(const KUrl&))); - connect(menu, SIGNAL(directoryCreated(const KUrl&)), - this, SIGNAL(itemCreated(const KUrl&))); + 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 KNewFileMenu* menu) +void DolphinNewFileMenuObserver::detach(const DolphinNewFileMenu *menu) { - disconnect(menu, SIGNAL(fileCreated(const KUrl&)), - this, SIGNAL(itemCreated(const KUrl&))); - disconnect(menu, SIGNAL(directoryCreated(const KUrl&)), - this, SIGNAL(itemCreated(const KUrl&))); + 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) { } @@ -59,4 +43,4 @@ DolphinNewFileMenuObserver::~DolphinNewFileMenuObserver() { } -#include "dolphinnewfilemenuobserver.moc" +#include "moc_dolphinnewfilemenuobserver.cpp"