summaryrefslogtreecommitdiff
path: root/plugins/switcher
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2009-03-15 06:11:33 +0100
committerDennis kasprzyk <onestone@compiz-fusion.org>2009-03-15 06:11:33 +0100
commited8f8dbb6da323eac58cdefaf07cbc0e6dd5ba69 (patch)
treebca329556da883782f6ee12dbb17eb4e080f3888 /plugins/switcher
parent163f6b6f3c3b7764987cbdf8e03cc355edeaa499 (diff)
parent47d457aef6456c12072a6b89101398c0993e3afd (diff)
downloadcompiz-with-glib-mainloop-ed8f8dbb6da323eac58cdefaf07cbc0e6dd5ba69.tar.gz
compiz-with-glib-mainloop-ed8f8dbb6da323eac58cdefaf07cbc0e6dd5ba69.tar.bz2
Merge branch 'master' of git+ssh://git.compiz-fusion.org/git/compiz/core
Diffstat (limited to 'plugins/switcher')
-rw-r--r--plugins/switcher/src/switcher.cpp2
-rw-r--r--plugins/switcher/src/switcher.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/switcher/src/switcher.cpp b/plugins/switcher/src/switcher.cpp
index a13c47f..fad8198 100644
--- a/plugins/switcher/src/switcher.cpp
+++ b/plugins/switcher/src/switcher.cpp
@@ -1563,7 +1563,7 @@ SwitchScreen::setOption (const char *name,
}
SwitchScreen::SwitchScreen (CompScreen *screen) :
- PrivateHandler<SwitchScreen,CompScreen> (screen),
+ PluginClassHandler<SwitchScreen,CompScreen> (screen),
cScreen (CompositeScreen::get (screen)),
gScreen (GLScreen::get (screen)),
opt(SWITCH_OPTION_NUM),
diff --git a/plugins/switcher/src/switcher.h b/plugins/switcher/src/switcher.h
index f2c5a81..7cd6f49 100644
--- a/plugins/switcher/src/switcher.h
+++ b/plugins/switcher/src/switcher.h
@@ -32,7 +32,7 @@
#include <decoration.h>
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <core/atoms.h>
#include <composite/composite.h>
@@ -84,7 +84,7 @@ class SwitchScreen :
public ScreenInterface,
public CompositeScreenInterface,
public GLScreenInterface,
- public PrivateHandler<SwitchScreen,CompScreen>
+ public PluginClassHandler<SwitchScreen,CompScreen>
{
public:
@@ -162,11 +162,11 @@ class SwitchScreen :
class SwitchWindow :
public CompositeWindowInterface,
public GLWindowInterface,
- public PrivateHandler<SwitchWindow,CompWindow>
+ public PluginClassHandler<SwitchWindow,CompWindow>
{
public:
SwitchWindow (CompWindow *window) :
- PrivateHandler<SwitchWindow,CompWindow> (window),
+ PluginClassHandler<SwitchWindow,CompWindow> (window),
window (window),
gWindow (GLWindow::get (window)),
cWindow (CompositeWindow::get (window)),