diff options
| author | Dennis Kasprzyk <onestone@compiz-fusion.org> | 2009-03-15 16:35:50 +0100 |
|---|---|---|
| committer | Dennis kasprzyk <onestone@compiz-fusion.org> | 2009-03-15 16:35:50 +0100 |
| commit | e53039517058f27329feb72b237d3f46a9a03d8d (patch) | |
| tree | edc02bbeecfb516b7863bb8cf2aca7a2aaf24845 /src/plugin.cpp | |
| parent | f8cf2bc2d5a7fe2d4f90f217aa1b7f6e2d47c345 (diff) | |
| download | zcomp-e53039517058f27329feb72b237d3f46a9a03d8d.tar.gz zcomp-e53039517058f27329feb72b237d3f46a9a03d8d.tar.bz2 | |
Drop CompMetadata from plugin vtable.
Added getOptions and setOption functions to plugin vtable template class.
Diffstat (limited to 'src/plugin.cpp')
| -rw-r--r-- | src/plugin.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/plugin.cpp b/src/plugin.cpp index 4b1c3df..fcf27f1 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -54,13 +54,13 @@ class CorePluginVTable : public CompPlugin::VTable CompOption::Value &value); }; -COMPIZ_PLUGIN_20081216 (core, CorePluginVTable) +COMPIZ_PLUGIN_20090315 (core, CorePluginVTable) CompPlugin::VTable * getCoreVTable () { if (!coreVTable) { - return getCompPluginVTable20081216_core (); + return getCompPluginVTable20090315_core (); } return coreVTable; @@ -162,7 +162,7 @@ dlloaderLoadPlugin (CompPlugin *p, dlerror (); - snprintf (sym, 1024, "getCompPluginVTable20081216_%s", name); + snprintf (sym, 1024, "getCompPluginVTable20090315_%s", name); getInfo = (PluginGetInfoProc) dlsym (dlhand, sym); error = dlerror (); @@ -630,7 +630,6 @@ CompPlugin::checkPluginABI (const char *name, CompPlugin::VTable::VTable () : mName (""), - mMetadata (NULL), mSelf (NULL) { } @@ -639,8 +638,6 @@ CompPlugin::VTable::~VTable () { if (mSelf) *mSelf = NULL; - if (mMetadata) - delete mMetadata; } void @@ -653,14 +650,6 @@ CompPlugin::VTable::initVTable (CompString name, mSelf = self; *mSelf = this; } - if (!mMetadata) - mMetadata = new CompMetadata (name); -} - -CompMetadata * -CompPlugin::VTable::getMetadata () const -{ - return mMetadata; } const CompString @@ -697,13 +686,13 @@ CompPlugin::VTable::finiWindow (CompWindow *) } CompOption::Vector & -CompPlugin::VTable::getOptions () +CompPlugin::VTable::getOptions () const { return noOptions; } bool -CompPlugin::VTable::setOption (const char *name, +CompPlugin::VTable::setOption (const CompString &name, CompOption::Value &value) { return false; |