X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c9acf7915287957394148caa5ce3c461288b5cfa..6072005ddce81b456fdcf2e77d5156a1d86f3686:/src/trash/dolphintrash.cpp diff --git a/src/trash/dolphintrash.cpp b/src/trash/dolphintrash.cpp index 749d0d481..35c5bbdfb 100644 --- a/src/trash/dolphintrash.cpp +++ b/src/trash/dolphintrash.cpp @@ -1,22 +1,9 @@ -/*************************************************************************** - * Copyright (C) 2012 by Peter Penz * - * Copyright (C) 2018 by Roman Inflianskas * - * * - * 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: 2012 Peter Penz + * SPDX-FileCopyrightText: 2018 Roman Inflianskas + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphintrash.h" @@ -26,7 +13,7 @@ #include #include #include - +#include Trash::Trash() : m_trashDirLister(new KDirLister()) @@ -40,7 +27,7 @@ Trash::Trash() bool isTrashEmpty = m_trashDirLister->items().isEmpty(); emit emptinessChanged(isTrashEmpty); }; - connect(m_trashDirLister, static_cast(&KDirLister::completed), this, trashDirContentChanged); + connect(m_trashDirLister, QOverload<>::of(&KCoreDirLister::completed), this, trashDirContentChanged); connect(m_trashDirLister, &KDirLister::itemsDeleted, this, trashDirContentChanged); m_trashDirLister->openUrl(QUrl(QStringLiteral("trash:/"))); } @@ -66,8 +53,10 @@ KIO::Job *Trash::empty(QWidget *window) KJobWidgets::setWindow(job, window); job->uiDelegate()->setAutoErrorHandlingEnabled(true); // as long as KIO doesn't do this, do it ourselves - connect(job, &KIO::Job::result, [](){ - KNotification::event(QStringLiteral("Trash: emptied"), QString(), QPixmap(), nullptr, KNotification::DefaultEvent); + connect(job, &KIO::Job::result, []() { + KNotification::event(QStringLiteral("Trash: emptied"), i18n("Trash Emptied"), + i18n("The Trash was emptied."), QStringLiteral("user-trash"), + nullptr, KNotification::DefaultEvent); }); return job; }