summaryrefslogtreecommitdiff
path: root/plugins/move/src
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/move/src
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/move/src')
-rw-r--r--plugins/move/src/move.cpp2
-rw-r--r--plugins/move/src/move.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/move/src/move.cpp b/plugins/move/src/move.cpp
index 25e0bba..d41946e 100644
--- a/plugins/move/src/move.cpp
+++ b/plugins/move/src/move.cpp
@@ -718,7 +718,7 @@ static const CompMetadata::OptionInfo moveOptionInfo[] = {
};
MoveScreen::MoveScreen (CompScreen *screen) :
- PrivateHandler<MoveScreen,CompScreen> (screen),
+ PluginClassHandler<MoveScreen,CompScreen> (screen),
w (0),
region (NULL),
status (RectangleOut),
diff --git a/plugins/move/src/move.h b/plugins/move/src/move.h
index 2eb6786..19e518d 100644
--- a/plugins/move/src/move.h
+++ b/plugins/move/src/move.h
@@ -24,7 +24,7 @@
*/
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
@@ -57,7 +57,7 @@ struct _MoveKeys {
class MoveScreen :
public ScreenInterface,
- public PrivateHandler<MoveScreen,CompScreen>
+ public PluginClassHandler<MoveScreen,CompScreen>
{
public:
@@ -98,11 +98,11 @@ class MoveScreen :
class MoveWindow :
public GLWindowInterface,
- public PrivateHandler<MoveWindow,CompWindow>
+ public PluginClassHandler<MoveWindow,CompWindow>
{
public:
MoveWindow (CompWindow *window) :
- PrivateHandler<MoveWindow,CompWindow> (window),
+ PluginClassHandler<MoveWindow,CompWindow> (window),
window (window),
gWindow (GLWindow::get (window)),
cWindow (CompositeWindow::get (window))