diff options
| author | Dennis Kasprzyk <onestone@compiz-fusion.org> | 2009-03-15 06:11:33 +0100 |
|---|---|---|
| committer | Dennis kasprzyk <onestone@compiz-fusion.org> | 2009-03-15 06:11:33 +0100 |
| commit | ed8f8dbb6da323eac58cdefaf07cbc0e6dd5ba69 (patch) | |
| tree | bca329556da883782f6ee12dbb17eb4e080f3888 /plugins/water | |
| parent | 163f6b6f3c3b7764987cbdf8e03cc355edeaa499 (diff) | |
| parent | 47d457aef6456c12072a6b89101398c0993e3afd (diff) | |
| download | compiz-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/water')
| -rw-r--r-- | plugins/water/src/water.cpp | 2 | ||||
| -rw-r--r-- | plugins/water/src/water.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/water/src/water.cpp b/plugins/water/src/water.cpp index 30970cb..3c506ea 100644 --- a/plugins/water/src/water.cpp +++ b/plugins/water/src/water.cpp @@ -1303,7 +1303,7 @@ static const CompMetadata::OptionInfo waterOptionInfo[] = { }; WaterScreen::WaterScreen (CompScreen *screen) : - PrivateHandler<WaterScreen,CompScreen> (screen), + PluginClassHandler<WaterScreen,CompScreen> (screen), cScreen (CompositeScreen::get (screen)), gScreen (GLScreen::get (screen)), opt(WATER_OPTION_NUM), diff --git a/plugins/water/src/water.h b/plugins/water/src/water.h index c53026a..fb393db 100644 --- a/plugins/water/src/water.h +++ b/plugins/water/src/water.h @@ -32,7 +32,7 @@ #include <X11/cursorfont.h> #include <core/core.h> -#include <core/privatehandler.h> +#include <core/pluginclasshandler.h> #include <composite/composite.h> #include <opengl/opengl.h> @@ -77,7 +77,7 @@ struct WaterFunction { class WaterScreen : public ScreenInterface, public CompositeScreenInterface, - public PrivateHandler<WaterScreen,CompScreen> + public PluginClassHandler<WaterScreen,CompScreen> { public: @@ -159,11 +159,11 @@ class WaterScreen : class WaterWindow : public GLWindowInterface, - public PrivateHandler<WaterWindow,CompWindow> + public PluginClassHandler<WaterWindow,CompWindow> { public: WaterWindow (CompWindow *window) : - PrivateHandler<WaterWindow,CompWindow> (window), + PluginClassHandler<WaterWindow,CompWindow> (window), window (window), gWindow (GLWindow::get (window)), wScreen (WaterScreen::get (screen)), |