From 32be37bce3b9ef52c0745c1e545cedab7b28b65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 8 Apr 2013 10:57:32 +0200 Subject: [PATCH] Rename PluginMgr to DecorationPlugin It's about the decorations not just *the* plugin. --- plugins.cpp | 10 +++++----- plugins.h | 4 ++-- workspace.cpp | 2 +- workspace.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins.cpp b/plugins.cpp index 41506b54fb..dae6d7f1df 100644 --- a/plugins.cpp +++ b/plugins.cpp @@ -30,7 +30,7 @@ along with this program. If not, see . namespace KWin { -PluginMgr::PluginMgr() +DecorationPlugin::DecorationPlugin() : KDecorationPlugins(KGlobal::config()) , m_noDecoration(false) { @@ -45,24 +45,24 @@ PluginMgr::PluginMgr() #endif } -void PluginMgr::error(const QString &error_msg) +void DecorationPlugin::error(const QString &error_msg) { qWarning("%s", QString(i18n("KWin: ") + error_msg).toLocal8Bit().data()); setNoDecoration(true); } -bool PluginMgr::provides(Requirement) +bool DecorationPlugin::provides(Requirement) { return false; } -void PluginMgr::setNoDecoration(bool noDecoration) +void DecorationPlugin::setNoDecoration(bool noDecoration) { m_noDecoration = noDecoration; } -bool PluginMgr::hasNoDecoration() const +bool DecorationPlugin::hasNoDecoration() const { return m_noDecoration; } diff --git a/plugins.h b/plugins.h index 627a713e54..30bcd673c3 100644 --- a/plugins.h +++ b/plugins.h @@ -27,11 +27,11 @@ along with this program. If not, see . namespace KWin { -class PluginMgr +class DecorationPlugin : public KDecorationPlugins { public: - PluginMgr(); + DecorationPlugin(); virtual bool provides(Requirement); /** * @returns @c true if there is no decoration plugin. diff --git a/workspace.cpp b/workspace.cpp index d4fbef8fb8..67b1002db3 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -159,7 +159,7 @@ Workspace::Workspace(bool restore) reparseConfigFuture.waitForFinished(); options->loadConfig(); options->loadCompositingConfig(false); - mgr = new PluginMgr; + mgr = new DecorationPlugin; default_colormap = DefaultColormap(display(), screen_number); installed_colormap = default_colormap; diff --git a/workspace.h b/workspace.h index 62f5c14924..9e93278b37 100644 --- a/workspace.h +++ b/workspace.h @@ -60,7 +60,7 @@ namespace KWin class Client; class Outline; class RootInfo; -class PluginMgr; +class DecorationPlugin; class Rules; class UserActionsMenu; class WindowRules; @@ -592,7 +592,7 @@ private: bool global_shortcuts_disabled; bool global_shortcuts_disabled_for_client; - PluginMgr* mgr; + DecorationPlugin* mgr; RootInfo* rootInfo; QWidget* supportWindow;