Added base class for get/setOption(s) functions.

2 files changed, 9 insertions, 9 deletions

diff --git a/src/option.cpp b/src/option.cpp
index 0140812..d90fbfc 100644
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -582,6 +582,13 @@ CompOption::Restriction::operator= (const CompOption::Restriction &rest)
 }
 
 CompOption *
+CompOption::Class::getOption (const CompString &name) const
+{
+    CompOption *o = CompOption::findOption (getOptions (), name);
+    return o;
+}
+
+CompOption *
 CompOption::findOption (CompOption::Vector &options,
 			CompString         name,
 			unsigned int       *index)
diff --git a/src/screen.cpp b/src/screen.cpp
index e4c0f07..9090ddb 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -625,13 +625,6 @@ CompScreen::dpy ()
     return priv->dpy;
 }
 
-CompOption *
-CompScreen::getOption (const char *name)
-{
-    CompOption *o = CompOption::findOption (priv->opt, name);
-    return o;
-}
-
 bool
 CompScreen::XRandr ()
 {
@@ -744,13 +737,13 @@ PrivateScreen::handlePingTimeout ()
 }
 
 CompOption::Vector &
-CompScreen::getOptions ()
+CompScreen::getOptions () const
 {
     return priv->opt;
 }
 
 bool
-CompScreen::setOption (const char        *name,
+CompScreen::setOption (const CompString  &name,
 		       CompOption::Value &value)
 {
     CompOption   *o;