alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove AbstractDialogManager

Browse Source
This commit is contained in:
Marco Martin 2013-03-04 15:21:26 +01:00
parent 89d7cbd648
commit 79256d9931
7 changed files with 0 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/CMakeLists.txt
View File

@ -68,7 +68,6 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1209)
set(plasma_LIB_SRCS set(plasma_LIB_SRCS
abstractrunner.cpp abstractrunner.cpp
abstractdialogmanager.cpp
configloader.cpp configloader.cpp
containmentactions.cpp containmentactions.cpp
datacontainer.cpp datacontainer.cpp
@ -159,7 +158,6 @@ install(TARGETS plasma EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_AR
generate_export_header(plasma) generate_export_header(plasma)
set(plasma_LIB_INCLUDES set(plasma_LIB_INCLUDES
abstractdialogmanager.h
abstractrunner.h abstractrunner.h
applet.h applet.h
configloader.h configloader.h

56
src/plasma/abstractdialogmanager.cpp
View File

@ -1,56 +0,0 @@
/*
* Copyright (C) 2010 Marco Martin <notmart@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, 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 Library 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 "abstractdialogmanager.h"
#include "corona.h"
namespace Plasma
{
class AbstractDialogManagerPrivate
{
public:
AbstractDialogManagerPrivate()
{
}
};
AbstractDialogManager::AbstractDialogManager(Corona *parent)
: QObject(parent),
d(new AbstractDialogManagerPrivate)
{
}
AbstractDialogManager::~AbstractDialogManager()
{
delete d;
}
void AbstractDialogManager::showDialog(QWidget *widget, Plasma::Applet *applet)
{
Q_UNUSED(applet)
widget->show();
}
}
#include "moc_abstractdialogmanager.cpp"

67
src/plasma/abstractdialogmanager.h
View File

@ -1,67 +0,0 @@
/*
* Copyright (C) 2010 Marco Martin <notmart@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, 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 Library 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.
*/
#ifndef PLASMA_DIALOGMANAGER_H
#define PLASMA_DIALOGMANAGER_H
#include <QtCore/QObject>
#include <plasma/plasma_export.h>
namespace Plasma
{
class Applet;
class Corona;
class AbstractDialogManagerPrivate;
/**
* @class AbstractDialogManager plasma/dialogmanager.h <Plasma/AbstractDialogManager>
*
* @short The AbstractDialogManager class shows the dialogs shown by applets and the rest of the shell.
* a AbstractDialogManager can manage aspects like positioning, sizing and widget style
* of dialogs sich as the applet configuration dialog.
* @since 4.5
*/
class PLASMA_EXPORT AbstractDialogManager : public QObject
{
Q_OBJECT
public:
explicit AbstractDialogManager(Plasma::Corona *parent=0);
~AbstractDialogManager();
public Q_SLOTS:
/**
* This fake virtual slot shows a dialog belonging to an applet.
* There is no guarantee how the implementation will show it
* @param widget the dialog widget
* @param applet the applet that owns the dialog
*/
void showDialog(QWidget *widget, Plasma::Applet *applet);
private:
AbstractDialogManagerPrivate * const d;
};
}
#endif

11
src/plasma/corona.cpp
View File

@ -39,7 +39,6 @@
#include <kshortcutsdialog.h> #include <kshortcutsdialog.h>
#include <kwindowsystem.h> #include <kwindowsystem.h>
#include "abstractdialogmanager.h"
#include "containment.h" #include "containment.h"
#include "pluginloader.h" #include "pluginloader.h"
#include "private/applet_p.h" #include "private/applet_p.h"
@ -394,16 +393,6 @@ QHash<QString, QString> Corona::defaultContainmentActionsPlugins(ContainmentType
return d->containmentActionsDefaults.value(containmentType); return d->containmentActionsDefaults.value(containmentType);
} }
void Corona::setDialogManager(AbstractDialogManager *dialogManager)
{
d->dialogManager = dialogManager;
}
AbstractDialogManager *Corona::dialogManager()
{
return d->dialogManager.data();
}
CoronaPrivate::CoronaPrivate(Corona *corona) CoronaPrivate::CoronaPrivate(Corona *corona)
: q(corona), : q(corona),
immutability(Mutable), immutability(Mutable),

15
src/plasma/corona.h
View File

@ -35,7 +35,6 @@ namespace Plasma
class CoronaPrivate; class CoronaPrivate;
class ContainmentActionsPluginsConfig; class ContainmentActionsPluginsConfig;
class AbstractDialogManager;
/** /**
* @class Corona plasma/Corona.h <Plasma/Corona> * @class Corona plasma/Corona.h <Plasma/Corona>
@ -194,20 +193,6 @@ public:
*/ */
QHash<QString, QString> defaultContainmentActionsPlugins(ContainmentType containmentType) const; QHash<QString, QString> defaultContainmentActionsPlugins(ContainmentType containmentType) const;
/**
* @param the AbstractDialogManager implementation
*
* @since 4.5
*/
void setDialogManager(AbstractDialogManager *manager);
/**
* @return the AbstractDialogManager that will show dialogs used by applets, like configuration dialogs
*
* @since 4.5
*/
AbstractDialogManager *dialogManager();
/** /**
* Returns the name of the preferred plugin to be used as containment toolboxes. * Returns the name of the preferred plugin to be used as containment toolboxes.
* CustomContainments and CustomPanelContainments can still override it as their liking. It's also not guaranteed that the plugin will actually exist. * CustomContainments and CustomPanelContainments can still override it as their liking. It's also not guaranteed that the plugin will actually exist.

1
src/plasma/includes/Plasma/AbstractDialogManager
View File

@ -1 +0,0 @@
#include "../../plasma/abstractdialogmanager.h"

1
src/plasma/private/corona_p.h
View File

@ -66,7 +66,6 @@ public:
KActionCollection actions; KActionCollection actions;
QMap<Plasma::ContainmentType, QHash<QString, QString> > containmentActionsDefaults; QMap<Plasma::ContainmentType, QHash<QString, QString> > containmentActionsDefaults;
QWeakPointer<KShortcutsDialog> shortcutsDlg; QWeakPointer<KShortcutsDialog> shortcutsDlg;
QWeakPointer<AbstractDialogManager> dialogManager;
QHash<Plasma::ContainmentType, QString> toolBoxPlugins; QHash<Plasma::ContainmentType, QString> toolBoxPlugins;
QList<QWeakPointer<KActionCollection> > actionCollections; QList<QWeakPointer<KActionCollection> > actionCollections;
}; };