diff options
| -rw-r--r-- | include/core/option.h | 4 | ||||
| -rw-r--r-- | include/core/plugin.h | 10 | ||||
| -rw-r--r-- | include/core/screen.h | 2 | ||||
| -rw-r--r-- | src/option.cpp | 2 | ||||
| -rw-r--r-- | src/plugin.cpp | 6 | ||||
| -rw-r--r-- | src/screen.cpp | 2 | ||||
| -rw-r--r-- | xslt/bcop.xslt | 6 |
7 files changed, 16 insertions, 16 deletions
diff --git a/include/core/option.h b/include/core/option.h index a67744b..9f6f629 100644 --- a/include/core/option.h +++ b/include/core/option.h @@ -142,9 +142,9 @@ class CompOption { class Class { public: - virtual Vector & getOptions () const = 0; + virtual Vector & getOptions () = 0; - virtual CompOption * getOption (const CompString &name) const; + virtual CompOption * getOption (const CompString &name); virtual bool setOption (const CompString &name, Value &value) = 0; diff --git a/include/core/plugin.h b/include/core/plugin.h index 85867b5..cb15018 100644 --- a/include/core/plugin.h +++ b/include/core/plugin.h @@ -97,7 +97,7 @@ class CompPlugin { virtual void finiWindow (CompWindow *w); - virtual CompOption::Vector & getOptions () const; + virtual CompOption::Vector & getOptions (); virtual bool setOption (const CompString &name, CompOption::Value &value); @@ -116,7 +116,7 @@ class CompPlugin { void finiWindow (CompWindow *w); - CompOption::Vector & getOptions () const; + CompOption::Vector & getOptions (); bool setOption (const CompString &name, CompOption::Value &value); }; @@ -127,7 +127,7 @@ class CompPlugin { void finiScreen (CompScreen *s); - CompOption::Vector & getOptions () const; + CompOption::Vector & getOptions (); bool setOption (const CompString &name, CompOption::Value &value); }; @@ -219,7 +219,7 @@ void CompPlugin::VTableForScreenAndWindow<T,T2>::finiWindow (CompWindow *w) } template <typename T, typename T2> -CompOption::Vector & CompPlugin::VTableForScreenAndWindow<T,T2>::getOptions () const +CompOption::Vector & CompPlugin::VTableForScreenAndWindow<T,T2>::getOptions () { CompOption::Class *oc = dynamic_cast<CompOption::Class *>(T::get (screen)); if (!oc) @@ -257,7 +257,7 @@ void CompPlugin::VTableForScreen<T>::finiScreen (CompScreen *s) } template <typename T> -CompOption::Vector & CompPlugin::VTableForScreen<T>::getOptions () const +CompOption::Vector & CompPlugin::VTableForScreen<T>::getOptions () { CompOption::Class *oc = dynamic_cast<CompOption::Class *>(T::get (screen)); if (!oc) diff --git a/include/core/screen.h b/include/core/screen.h index 93a0d9c..ea58bf7 100644 --- a/include/core/screen.h +++ b/include/core/screen.h @@ -163,7 +163,7 @@ class CompScreen : Display * dpy(); - CompOption::Vector & getOptions () const; + CompOption::Vector & getOptions (); bool setOption (const CompString &name, CompOption::Value &value); diff --git a/src/option.cpp b/src/option.cpp index d90fbfc..e5a3870 100644 --- a/src/option.cpp +++ b/src/option.cpp @@ -582,7 +582,7 @@ CompOption::Restriction::operator= (const CompOption::Restriction &rest) } CompOption * -CompOption::Class::getOption (const CompString &name) const +CompOption::Class::getOption (const CompString &name) { CompOption *o = CompOption::findOption (getOptions (), name); return o; diff --git a/src/plugin.cpp b/src/plugin.cpp index fcf27f1..da8f6cd 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -50,7 +50,7 @@ class CorePluginVTable : public CompPlugin::VTable CompOption::Vector & getOptions (); - bool setOption (const char *name, + bool setOption (const CompString &name, CompOption::Value &value); }; @@ -79,7 +79,7 @@ CorePluginVTable::getOptions () } bool -CorePluginVTable::setOption (const char *name, +CorePluginVTable::setOption (const CompString &name, CompOption::Value &value) { return screen->setOption (name, value); @@ -686,7 +686,7 @@ CompPlugin::VTable::finiWindow (CompWindow *) } CompOption::Vector & -CompPlugin::VTable::getOptions () const +CompPlugin::VTable::getOptions () { return noOptions; } diff --git a/src/screen.cpp b/src/screen.cpp index 9090ddb..c031346 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -737,7 +737,7 @@ PrivateScreen::handlePingTimeout () } CompOption::Vector & -CompScreen::getOptions () const +CompScreen::getOptions () { return priv->opt; } diff --git a/xslt/bcop.xslt b/xslt/bcop.xslt index 3082cd5..76cdd1a 100644 --- a/xslt/bcop.xslt +++ b/xslt/bcop.xslt @@ -396,7 +396,7 @@ inline void <xsl:text>")); </xsl:text> <xsl:value-of select="$value"/> - <xsl:text>.update (); + <xsl:text>.match ().update (); </xsl:text> </xsl:template> @@ -948,7 +948,7 @@ inline void <xsl:value-of select="$Plugin"/> <xsl:text>Options (); - virtual CompOption::Vector & getOptions () const; + virtual CompOption::Vector & getOptions (); virtual bool setOption (const CompString &name, CompOption::Value &value); </xsl:text> @@ -1068,7 +1068,7 @@ inline void CompOption::Vector & </xsl:text> <xsl:value-of select="$Plugin"/> - <xsl:text>Options::getOptions () const + <xsl:text>Options::getOptions () { return mOptions; } |