Index: /orxonox/branches/updater/src/gui/orxonox_gui_audio.cc
===================================================================
--- /orxonox/branches/updater/src/gui/orxonox_gui_audio.cc	(revision 3287)
+++ /orxonox/branches/updater/src/gui/orxonox_gui_audio.cc	(revision 3288)
@@ -37,5 +37,5 @@
   enableSound = new CheckButton ("Disable Sound");
   enableSound->setFlagName ("no-sound", 0);
-  enableSound->saveable = true;
+  enableSound->saveability();
   audioBox->fill (enableSound);
   Label* musicVolumeLabel = new Label ("Music Volume");
@@ -43,5 +43,5 @@
   musicVolume = new Slider ("Music Volume", 0, 100);
   musicVolume->setFlagName ("music-volume", "m", 80);
-  musicVolume->saveable = true;
+  musicVolume->saveability();
   audioBox->fill (musicVolume);
   Label* effectsVolumeLabel = new Label ("Effects Volume");
@@ -49,5 +49,5 @@
   effectsVolume = new Slider ("Effects Volume", 0, 100);
   effectsVolume->setFlagName ("effects-volume", "e", 80);
-  effectsVolume->saveable = true;
+  effectsVolume->saveability();
   audioBox->fill (effectsVolume);
 
Index: /orxonox/branches/updater/src/gui/orxonox_gui_exec.cc
===================================================================
--- /orxonox/branches/updater/src/gui/orxonox_gui_exec.cc	(revision 3287)
+++ /orxonox/branches/updater/src/gui/orxonox_gui_exec.cc	(revision 3288)
@@ -47,13 +47,13 @@
   saveSettings = new CheckButton ("Save Settings");
   saveSettings->value = 1;
-  saveSettings->saveable = true;
+  saveSettings->saveability();
   execBox->fill (saveSettings);
   verboseMode = new Menu ("verbose mode", "no output", "error", "warning", "info", "lastItem");
   verboseMode->setFlagName ("verbose", "v", 0);
-  verboseMode->saveable = true;
+  verboseMode->saveability();
   execBox->fill (verboseMode);
   alwaysShow = new CheckButton ("Always Show this Menu");
   alwaysShow->setFlagName ("gui", "g", 0);
-  alwaysShow->saveable = true;
+  alwaysShow->saveability();
   execBox->fill (alwaysShow);
   quit = new Button ("Quit");
@@ -131,5 +131,5 @@
   int counter = 0;
   while (counter < depth && ((widget->isOption>0
-			      && (static_cast<Option*>(widget)->saveable) )
+			      && (static_cast<Option*>(widget)->isSaveable()) )
 			     || (widget->isOption<0
 				 && static_cast<Packer*>(widget)->getGroupName())))
@@ -156,5 +156,5 @@
   //    printf ("%s\n",widget->label);
   if (widget->isOption >= 1)
-    if  (static_cast<Option*>(widget)->saveable)
+    if  (static_cast<Option*>(widget)->isSaveable())
       {
 	char Buffer[256];
Index: /orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc
===================================================================
--- /orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc	(revision 3287)
+++ /orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc	(revision 3288)
@@ -708,4 +708,28 @@
 }
 
+/**
+   \brief Sets the saveable-state of the option to true.
+*/
+void Option::saveability(void)
+{
+  this->saveable = true;
+}
+
+/**
+   \brief Sets the saveable-state of the option.
+   \param isSaveable the saveable-state to set.
+*/
+void Option::saveability(bool isSaveable)
+{
+  this->saveable = isSaveable;
+}
+
+/**
+   \returns The saveable-state.
+*/
+bool Option::isSaveable(void)
+{
+  return this->saveable;
+}
 
 /* BUTTON */
Index: /orxonox/branches/updater/src/gui/orxonox_gui_gtk.h
===================================================================
--- /orxonox/branches/updater/src/gui/orxonox_gui_gtk.h	(revision 3287)
+++ /orxonox/branches/updater/src/gui/orxonox_gui_gtk.h	(revision 3288)
@@ -193,4 +193,7 @@
 class Option : public Widget
 {
+ protected:
+  bool saveable;  //!< Options can be Saved.
+  
  public:
   //virtual gint OptionChange (GtkWidget* widget, GdkEvent* event, gpointer data);
@@ -201,6 +204,8 @@
   char* flagNameShort; //!< like flag_name but shorter
   int defaultValue; //!< A default value is good, for hiding a option if it is not needed. (hidden if value == default_value)
-  bool saveable;  //!< Options can be Saved.
-
+
+  void saveability(void);
+  void saveability(bool isSaveable);
+  bool isSaveable(void);
   void setFlagName (char* flagname, int defaultvalue);
   void setFlagName (char* flagname, char* flagnameshort, int defaultvalue);
Index: /orxonox/branches/updater/src/gui/orxonox_gui_keys.cc
===================================================================
--- /orxonox/branches/updater/src/gui/orxonox_gui_keys.cc	(revision 3287)
+++ /orxonox/branches/updater/src/gui/orxonox_gui_keys.cc	(revision 3288)
@@ -114,5 +114,5 @@
   inputKey[key]->pKeyButton = new Button(name);
   inputKey[key]->pKeyOLabel = new OptionLabel (name, name);
-  inputKey[key]->pKeyOLabel->saveable = true;
+  inputKey[key]->pKeyOLabel->saveability();
 
 #ifdef HAVE_GTK2
Index: /orxonox/branches/updater/src/gui/orxonox_gui_update.cc
===================================================================
--- /orxonox/branches/updater/src/gui/orxonox_gui_update.cc	(revision 3287)
+++ /orxonox/branches/updater/src/gui/orxonox_gui_update.cc	(revision 3288)
@@ -53,5 +53,5 @@
   this->updateBox->fill(this->autoUpdate);
   this->autoUpdate->setFlagName ("update", "u", 0);
-  this->autoUpdate->saveable = true;
+  this->autoUpdate->saveability();
 
   this->updateSourceWindowCreate ();
Index: /orxonox/branches/updater/src/gui/orxonox_gui_video.cc
===================================================================
--- /orxonox/branches/updater/src/gui/orxonox_gui_video.cc	(revision 3287)
+++ /orxonox/branches/updater/src/gui/orxonox_gui_video.cc	(revision 3288)
@@ -38,9 +38,9 @@
   fullscreen = new CheckButton ("Fullscreen-mode");
   fullscreen->setFlagName ("windowed", "q", 1);
-  fullscreen->saveable = true;
+  fullscreen->saveability();
   videoBox->fill (fullscreen);
   wireframe = new CheckButton ("WireFrame-mode");
   wireframe->setFlagName ("wireframe", "w", 0);
-  wireframe->saveable = true;
+  wireframe->saveability();
   videoBox->fill (wireframe);
 
