mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
![Emmanuel Pescosta](/assets/img/avatar_default.png)
Removed all signal-slot-connections related to DolphinNewFileMenu->errorMessage(QString) in DolphinMainWindow and DolphinContextMenu and replaced it by a better solution. Now we make use of the already existing DolphinNewFileMenuObserver singleton class to achieve a better error handling, because every newly created DolphinContextMenu instance registers himself by DolphinNewFileMenuObserver and we use this to connect the errorMessage(QString) signal of every DolphinContextMenu instance to the errorMessage(QString) signal of the DolphinNewFileMenuObserver singleton class. So we need only one connection from DolphinNewFileMenuObserver to DolphinMainWindow (or to DolphinPart) to collect all error messages thrown by every DolphinNewFileMenu instance. REVIEW: 112178
49 lines
2.1 KiB
C++
49 lines
2.1 KiB
C++
/***************************************************************************
|
|
* 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 *
|
|
***************************************************************************/
|
|
|
|
#include "dolphinnewfilemenu.h"
|
|
|
|
#include "views/dolphinnewfilemenuobserver.h"
|
|
|
|
#include <KActionCollection>
|
|
#include <KIO/Job>
|
|
|
|
DolphinNewFileMenu::DolphinNewFileMenu(KActionCollection* collection, QObject* parent) :
|
|
KNewFileMenu(collection, "new_menu", parent)
|
|
{
|
|
DolphinNewFileMenuObserver::instance().attach(this);
|
|
}
|
|
|
|
DolphinNewFileMenu::~DolphinNewFileMenu()
|
|
{
|
|
DolphinNewFileMenuObserver::instance().detach(this);
|
|
}
|
|
|
|
void DolphinNewFileMenu::slotResult(KJob* job)
|
|
{
|
|
if (job->error()) {
|
|
emit errorMessage(job->errorString());
|
|
} else {
|
|
KNewFileMenu::slotResult(job);
|
|
}
|
|
}
|
|
|
|
#include "dolphinnewfilemenu.moc"
|