Rename PluginMgr to DecorationPlugin

It's about the decorations not just *the* plugin.
This commit is contained in:
Martin Gräßlin 2013-04-08 10:57:32 +02:00
parent 0fb27fd12e
commit 32be37bce3
4 changed files with 10 additions and 10 deletions

View file

@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace KWin namespace KWin
{ {
PluginMgr::PluginMgr() DecorationPlugin::DecorationPlugin()
: KDecorationPlugins(KGlobal::config()) : KDecorationPlugins(KGlobal::config())
, m_noDecoration(false) , m_noDecoration(false)
{ {
@ -45,24 +45,24 @@ PluginMgr::PluginMgr()
#endif #endif
} }
void PluginMgr::error(const QString &error_msg) void DecorationPlugin::error(const QString &error_msg)
{ {
qWarning("%s", QString(i18n("KWin: ") + error_msg).toLocal8Bit().data()); qWarning("%s", QString(i18n("KWin: ") + error_msg).toLocal8Bit().data());
setNoDecoration(true); setNoDecoration(true);
} }
bool PluginMgr::provides(Requirement) bool DecorationPlugin::provides(Requirement)
{ {
return false; return false;
} }
void PluginMgr::setNoDecoration(bool noDecoration) void DecorationPlugin::setNoDecoration(bool noDecoration)
{ {
m_noDecoration = noDecoration; m_noDecoration = noDecoration;
} }
bool PluginMgr::hasNoDecoration() const bool DecorationPlugin::hasNoDecoration() const
{ {
return m_noDecoration; return m_noDecoration;
} }

View file

@ -27,11 +27,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace KWin namespace KWin
{ {
class PluginMgr class DecorationPlugin
: public KDecorationPlugins : public KDecorationPlugins
{ {
public: public:
PluginMgr(); DecorationPlugin();
virtual bool provides(Requirement); virtual bool provides(Requirement);
/** /**
* @returns @c true if there is no decoration plugin. * @returns @c true if there is no decoration plugin.

View file

@ -159,7 +159,7 @@ Workspace::Workspace(bool restore)
reparseConfigFuture.waitForFinished(); reparseConfigFuture.waitForFinished();
options->loadConfig(); options->loadConfig();
options->loadCompositingConfig(false); options->loadCompositingConfig(false);
mgr = new PluginMgr; mgr = new DecorationPlugin;
default_colormap = DefaultColormap(display(), screen_number); default_colormap = DefaultColormap(display(), screen_number);
installed_colormap = default_colormap; installed_colormap = default_colormap;

View file

@ -60,7 +60,7 @@ namespace KWin
class Client; class Client;
class Outline; class Outline;
class RootInfo; class RootInfo;
class PluginMgr; class DecorationPlugin;
class Rules; class Rules;
class UserActionsMenu; class UserActionsMenu;
class WindowRules; class WindowRules;
@ -592,7 +592,7 @@ private:
bool global_shortcuts_disabled; bool global_shortcuts_disabled;
bool global_shortcuts_disabled_for_client; bool global_shortcuts_disabled_for_client;
PluginMgr* mgr; DecorationPlugin* mgr;
RootInfo* rootInfo; RootInfo* rootInfo;
QWidget* supportWindow; QWidget* supportWindow;