Differential D11012 Diff 28665 src/trash/dolphintrash.h

Changeset View

Standalone View

View Options

src/trash/dolphintrash.h

  • This file was copied from src/panels/places/placesitemsignalhandler.cpp.
1/*************************************************************************** 1​/***************************************************************************
2 * Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com> * 2​ * Copyright (C) 2018 by Roman Inflianskas <infroma@gmail.com> *
3 * * 3​ * *
4 * This program is free software; you can redistribute it and/or modify * 4​ * This program is free software; you can redistribute it and/or modify *
5 * it under the terms of the GNU General Public License as published by * 5​ * it under the terms of the GNU General Public License as published by *
6 * the Free Software Foundation; either version 2 of the License, or * 6​ * the Free Software Foundation; either version 2 of the License, or *
7 * (at your option) any later version. * 7​ * (at your option) any later version. *
8 * * 8​ * *
9 * This program is distributed in the hope that it will be useful, * 9​ * This program is distributed in the hope that it will be useful, *
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of * 10​ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 11​ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
12 * GNU General Public License for more details. * 12​ * GNU General Public License for more details. *
13 * * 13​ * *
14 * You should have received a copy of the GNU General Public License * 14​ * You should have received a copy of the GNU General Public License *
15 * along with this program; if not, write to the * 15​ * along with this program; if not, write to the *
16 * Free Software Foundation, Inc., * 16​ * Free Software Foundation, Inc., *
17 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 17​ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
18 ***************************************************************************/ 18​ ***************************************************************************/
19 19​
20#include "placesitemsignalhandler.h" 20​#ifndef DOLPHINTRASH_H
21​#define DOLPHINTRASH_H
21 22​
22#include "placesitem.h" 23​#include <QWidget>
23 24​
24PlacesItemSignalHandler::PlacesItemSignalHandler(PlacesItem* item, 25​#include <KIO/EmptyTrashJob>
25 QObject* parent) : 26​#include <KIOWidgets/KDirLister>
26 QObject(parent), ​
27 m_item(item) ​
28{ ​
29} ​
30 27​
31PlacesItemSignalHandler::~PlacesItemSignalHandler() 28​class Trash: public QObject
32{ 29​{
33} 30​ Q_OBJECT
34 31​
35void PlacesItemSignalHandler::onAccessibilityChanged() 32​public:
36{ 33​ // delete copy and move constructors and assign operators
37 if (m_item) { 34​ Trash(Trash const&) = delete;
38 m_item->onAccessibilityChanged(); 35​ Trash(Trash&&) = delete;
39 } 36​ Trash& operator=(Trash const&) = delete;
40} 37​ Trash& operator=(Trash &&) = delete;
41 38​
42void PlacesItemSignalHandler::onTrashDirListerCompleted() 39​ static Trash& instance() {
43{ 40​ static Trash result;
44 if (m_item) { 41​ return result;
45 m_item->onTrashDirListerCompleted(); ​
46 } ​
47} 42​ }
43​ KIO::Job* empty(QWidget *window);
44​ bool isEmpty();
48 45​
49void PlacesItemSignalHandler::onTearDownRequested(const QString& udi) 46​signals:
50{ 47​ void emptinessChanged(bool isEmpty);
51 Q_UNUSED(udi) 48​
elvisangelaccioUnsubmitted
Done

These methods don't use m_trashDirLister, right? => they should be static

elvisangelaccio: These methods don't use `m_trashDirLister`, right? => they should be `static`
52 if (m_item) { 49​protected:
53 Solid::StorageAccess *tmp = m_item->device().as<Solid::StorageAccess>(); 50​ Trash();
54 if (tmp) { 51​ ~Trash();
55 QString mountPath = tmp->filePath(); 52​
56 emit tearDownExternallyRequested(mountPath); 53​private:
57 } 54​ KDirLister *m_trashDirLister;
elvisangelaccioUnsubmitted
Done

Why protected instead of private?

elvisangelaccio: Why `protected` instead of `private`?
58 } 55​
59} 56​ void watchEmptinessChanged();
57​};
60 58​
59​#endif // DOLPHINTRASH_H