Changeset 3315 in orxonox.OLD for orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc

Timestamp:

Jan 3, 2005, 12:13:38 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: code-standartisation updated in all files.

1. member → this→member
2. function (bla) → function(bla)
3. other small fixes

File:

• orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc (modified) (116 diffs)

orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc

@@ -50 +50 @@
   gdk_threads_init();
 #endif /* HAVE_GTHREAD */
-  gtk_init (&argc, &argv);
+  gtk_init(&argc, &argv);
   gtk_rc_parse( "rc" );
 #endif /* HAVE_GTK2 */
@@ -138 +138 @@
    This is still pretty crappy.
 */
-Widget::~Widget()
+Widget::~Widget(void)
 {
   this->destroy();
@@ -147 +147 @@
    Initializes the next Pointer and the other Widget-specific Defaults.
 */
-void Widget::init()
+void Widget::init(void)
 {
   next = NULL;
@@ -181 +181 @@
    \brief makes the widget visible.
 */
-void Widget::show()
-{
-#ifdef HAVE_GTK2
-  gtk_widget_show (this->widget);
+void Widget::show(void)
+{
+#ifdef HAVE_GTK2
+  gtk_widget_show(this->widget);
 #endif /* HAVE_GTK2 */
 }
@@ -191 +191 @@
    \brief hides the widget.
 */
-void Widget::hide()
-{
-#ifdef HAVE_GTK2
-  gtk_widget_hide (this->widget);
+void Widget::hide(void)
+{
+#ifdef HAVE_GTK2
+  gtk_widget_hide(this->widget);
 #endif /* HAVE_GTK2 */
 }
@@ -206 +206 @@
 {
 #ifdef HAVE_GTK2
-  gtk_widget_set_usize (this->widget, width, height);
+  gtk_widget_set_usize(this->widget, width, height);
 #endif /* HAVE_GTK2 */
 }
@@ -237 +237 @@
    \param depth the current depth. if > 0 then the next Widget will also be walked through.
 */
-void Widget::walkThrough (void (*function)(Widget*), unsigned int depth)
+void Widget::walkThrough(void(*function)(Widget*), unsigned int depth)
 {
   function(this);
   if (this->isOption < 0)
     {
-      static_cast<Packer*>(this)->down->walkThrough (function, depth+1);
+      static_cast<Packer*>(this)->down->walkThrough(function, depth+1);
     } 
 
@@ -255 +255 @@
    \param depth the current depth. if > 0 then the next Widget will also be walked through.
 */
-void Widget::walkThrough (void (*function)(Widget*, void*), void* data, unsigned int depth)
+void Widget::walkThrough(void(*function)(Widget*, void*), void* data, unsigned int depth)
 {
   function(this, data);
@@ -270 +270 @@
     \param widget specifies the widget that should be listed
 */
-void Widget::listOptionsAndGroups (Widget* widget)
+void Widget::listOptionsAndGroups(Widget* widget)
 {
   if (widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
@@ -284 +284 @@
     \param widget specifies the widget that should be listed
 */
-void Widget::listOptions (Widget* widget)
+void Widget::listOptions(Widget* widget)
 {
   if (widget->isOption >= 1 && widget->isOption <= 3)
@@ -297 +297 @@
     \param data A Counter, that always knows how many Options have been found yet.
 */
-void Widget::listOptions (Widget* widget, void* data)
+void Widget::listOptions(Widget* widget, void* data)
 {
   
   if (widget->isOption >= 1 && widget->isOption <= 3)
     {
-      int* count = (int*)data;
+      int* count =(int*)data;
       *count = *count +1;
       cout << *count << ": " << static_cast<Option*>(widget)->title <<" is : " << static_cast<Option*>(widget)->value <<endl;
@@ -308 +308 @@
   else if (widget->isOption == 5)
     {
-      int* count = (int*)data;
+      int* count =(int*)data;
       *count = *count +1;
       cout << *count << ": " << static_cast<Option*>(widget)->title <<" is : " << static_cast<OptionLabel*>(widget)->cValue <<endl;
@@ -315 +315 @@
 
 /** 
-    \brief Finds an Option by a given number (the n'th option found away from this Widget)
-    \param number The Count of options to wait (by reference)
+    \brief Finds an Option by a given number(the n'th option found away from this Widget)
+    \param number The Count of options to wait(by reference)
     \param depth The depth of the sarch. if 0 it will not search next pointer
     
@@ -349 +349 @@
 void Widget::listGroups(Widget* widget)
 {
-  if(widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
+  if (widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
     cout << "[" << static_cast<Packer*>(widget)->groupName << "]\n";
 }
@@ -356 +356 @@
     \brief This is for listing the Groups of "widget". It also displays the n'th number found.
     \param widget specifies the widget that should be listed
-    \param data the Counter, that will show the number (this function will raise it by one if a Group is fount.
+    \param data the Counter, that will show the number(this function will raise it by one if a Group is fount.
 */
 void Widget::listGroups(Widget* widget, void* data)
 {
-  if(widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
-    {
-      int* count = (int*)data;
+  if (widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
+    {
+      int* count =(int*)data;
       *count = *count +1;
       cout << *count <<": [" << static_cast<Packer*>(widget)->groupName << "]\n";
@@ -369 +369 @@
 
 /** 
-    \brief Finds a Group by a given number (the n'th Group found away from this Widget)
-    \param number The Count of options to wait (by reference)
+    \brief Finds a Group by a given number(the n'th Group found away from this Widget)
+    \param number The Count of options to wait(by reference)
     \param depth The depth of the sarch. if 0 it will not search next pointer
 */
@@ -399 +399 @@
     \param widget specifies the widget that should be set.
 */
-void Widget::setOptions (Widget* widget)
+void Widget::setOptions(Widget* widget)
 {
   if (widget->isOption >= 1)
@@ -412 +412 @@
   if (widget->isOption>=1)
     {      
-      Option* option = (Option*)widget;
-      char* name = (char*)flagName;
+      Option* option =(Option*)widget;
+      char* name =(char*)flagName;
       char* value = NULL;
       bool found = false;
       // check if long flag matches
-      if ((option->flagName && strlen(name)>2 && !strncmp(name+2, option->flagName, strlen(option->flagName)) && (name[strlen(option->flagName)+2] == '\0' || name[strlen(option->flagName)+2] == '=') ))
+      if ((option->flagName && strlen(name)>2 && !strncmp(name+2, option->flagName, strlen(option->flagName)) &&(name[strlen(option->flagName)+2] == '\0' || name[strlen(option->flagName)+2] == '=') ))
         {
           found = true;
@@ -425 +425 @@
             }
         }
-      else if (option->flagNameShort && strlen(name)>1 && !strncmp(name+1, option->flagNameShort, strlen(option->flagNameShort))&& (name[strlen(option->flagNameShort)+1] == '\0' || name[strlen(option->flagNameShort)+1] == '=')) // check if short flag matches
+      else if (option->flagNameShort && strlen(name)>1 && !strncmp(name+1, option->flagNameShort, strlen(option->flagNameShort))&&(name[strlen(option->flagNameShort)+1] == '\0' || name[strlen(option->flagNameShort)+1] == '=')) // check if short flag matches
         {
           found = true;
@@ -456 +456 @@
     \brief Connect any signal to any given Sub-widget
 */
-gulong Widget::connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*, void *))
-{
-  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), NULL);
+gulong Widget::connectSignal(char* event, gint(*signal)(GtkWidget*, GdkEvent*, void *))
+{
+  return g_signal_connect(G_OBJECT(this->widget), event, G_CALLBACK(signal), NULL);
 }
 
@@ -464 +464 @@
    \brief Connect a signal with additionally passing the whole Object
 */
-gulong Widget::connectSignal (char* event, gint (*signal)( GtkWidget*, Widget *))
-{
-  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), this);
+gulong Widget::connectSignal(char* event, gint(*signal)( GtkWidget*, Widget *))
+{
+  return g_signal_connect(G_OBJECT(this->widget), event, G_CALLBACK(signal), this);
 }
 
@@ -472 +472 @@
    \brief Connect a signal with additionally passing a whole external Object
 */
-gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEvent*, void *))
-{
-  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
+gulong Widget::connectSignal(char* event, void* extObj, gint(*signal)(GtkWidget*, GdkEvent*, void *))
+{
+  return g_signal_connect(G_OBJECT(this->widget), event, G_CALLBACK(signal), extObj);
 }
 
@@ -480 +480 @@
    \brief Connect a signal with additionally passing a whole external Object
 */
-gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, void *))
-{
-  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
+gulong Widget::connectSignal(char* event, void* extObj, gint(*signal)(GtkWidget*, void *))
+{
+  return g_signal_connect(G_OBJECT(this->widget), event, G_CALLBACK(signal), extObj);
 }
 
@@ -488 +488 @@
    \brief Connect a signal with additionally passing a whole external Object
 */
-gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEventKey*, void *))
-{
-  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
-}
-
-void Widget::disconnectSignal (gulong signalID)
-{
-  g_signal_handler_disconnect (G_OBJECT (this->widget), signalID);
+gulong Widget::connectSignal(char* event, void* extObj, gint(*signal)(GtkWidget*, GdkEventKey*, void *))
+{
+  return g_signal_connect(G_OBJECT(this->widget), event, G_CALLBACK(signal), extObj);
+}
+
+void Widget::disconnectSignal(gulong signalID)
+{
+  g_signal_handler_disconnect(G_OBJECT(this->widget), signalID);
 }
 
@@ -504 +504 @@
    \param nothing nothin.
 */
-gint Widget::doNothingSignal (GtkWidget *widget, GdkEvent* event, void* nothing)
+gint Widget::doNothingSignal(GtkWidget *widget, GdkEvent* event, void* nothing)
 {
 }
@@ -519 +519 @@
    Sets the down-pinter to NULL and other PackerSpecific-values to their defaults.
 */
-void Packer::init (void)
-{
-  down = NULL;
-  groupName = NULL;
+void Packer::init(void)
+{
+  this->down = NULL;
+  this->groupName = NULL;
 
 
@@ -536 +536 @@
   PRINTF(4)("deleting the Packer part.\n");
   
-  if (groupName)
-    delete []groupName;
+  if (this->groupName)
+    delete []this->groupName;
 
   //deleting recursively.
@@ -551 +551 @@
    \param name The name of the group.
 */
-void Packer::setGroupName (char* name)
-{
-  if (groupName)
-    delete groupName;
-  groupName = new char [strlen(name)+1];
-  strcpy(groupName, name);
+void Packer::setGroupName(char* name)
+{
+  if (this->groupName)
+    delete []this->groupName;
+  this->groupName = new char[strlen(name)+1];
+  strcpy(this->groupName, name);
 }
 
@@ -563 +563 @@
    \returns name The name of the group.
 */
-char* Packer::getGroupName (void)
-{
-  return groupName;
+char* Packer::getGroupName(void)
+{
+  return this->groupName;
 }
 
@@ -575 +575 @@
    sets the Container-Specific defaults.
 */
-void Container::init (void)
-{
-  isOption = -1;
+void Container::init(void)
+{
+  this->isOption = -1;
 
   static_cast<Packer*>(this)->init();
@@ -600 +600 @@
    It does this by filling up the down pointer only if down points to NULL.
 */
-void Container::fill (Widget *lowerWidget)
+void Container::fill(Widget *lowerWidget)
 {
   if (this->down == NULL)
     {
 #ifdef HAVE_GTK2
-      gtk_container_add (GTK_CONTAINER (this->widget), lowerWidget->widget);
+      gtk_container_add(GTK_CONTAINER(this->widget), lowerWidget->widget);
 #endif /* HAVE_GTK2 */
       this->down = lowerWidget;
@@ -613 +613 @@
 }
 
-// gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
+// gtk_container_set_border_width(GTK_CONTAINER(widget), 5);
 
 /* WINDOW */
@@ -622 +622 @@
    \brief Adds a new Window Windows to the List of Windows.
    \param windowToAdd The Windows that should be added to the List
-   \todo this instead of windowToAdd (possibly)
+   \todo this instead of windowToAdd(possibly)
 */
 void Window::addWindow(Window* windowToAdd)
@@ -633 +633 @@
 
   Widget* tmpWindow = mainWindow;
-  while (tmpWindow->next)
+  while(tmpWindow->next)
     tmpWindow = tmpWindow->next;
   tmpWindow->next = windowToAdd;
@@ -644 +644 @@
    \brief Creating a new Window without a Name
 */
-Window::Window (void)
+Window::Window(void)
 {
   this->init();
@@ -654 +654 @@
 */
 
-Window::Window (char* windowName)
+Window::Window(char* windowName)
 {
   this->init();
-  this->setTitle (windowName);
+  this->setTitle(windowName);
 }
 
@@ -671 +671 @@
    \brief initializes a new Window
 */
-void Window::init()
+void Window::init(void)
 {
   if (!mainWindow)
@@ -681 +681 @@
 
 #ifdef HAVE_GTK2
-  widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_policy (GTK_WINDOW(widget), TRUE, TRUE, TRUE);
+  widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_policy(GTK_WINDOW(widget), TRUE, TRUE, TRUE);
 #if !defined(__WIN32__)
-  //  gtk_window_set_decorated (GTK_WINDOW (widget), FALSE);
+  //  gtk_window_set_decorated(GTK_WINDOW(widget), FALSE);
 #endif 
-  gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
+  gtk_container_set_border_width(GTK_CONTAINER(widget), 3);
 #endif /* HAVE_GTK2 */
 }
@@ -708 +708 @@
    \brief Shows all Widgets that are included within this->widget.
 */
-void Window::showall ()
-{
-  if (!isOpen)
-    {
-      //      printf ("showall\n");
-#ifdef HAVE_GTK2
-      gtk_widget_show_all  (widget);
+void Window::showall(void)
+{
+  if (!this->isOpen)
+    {
+      //      printf("showall\n");
+#ifdef HAVE_GTK2
+      gtk_widget_show_all(this->widget);
 #endif /* HAVE_GTK2 */ 
-     isOpen = true;
+     this->isOpen = true;
     }
   else
     {
-      //      printf ("showone\n");
-#ifdef HAVE_GTK2
-      gtk_widget_show (widget);
+      //      printf("showone\n");
+#ifdef HAVE_GTK2
+      gtk_widget_show(this->widget);
 #endif /* HAVE_GTK2 */
     }
@@ -731 +731 @@
    \param title title the Window should get.
 */
-void Window::setTitle (char* title)
+void Window::setTitle(char* title)
 {
   if (this->title)
@@ -738 +738 @@
   strcpy(this->title, title);
 #ifdef HAVE_GTK2
-  gtk_window_set_title (GTK_WINDOW (widget), title);
+  gtk_window_set_title(GTK_WINDOW(widget), title);
 #endif /* HAVE_GTK2 */
 }
@@ -745 +745 @@
    \brief opens up a Window and fixes the Focus to it
 */
-void Window::open()
+void Window::open(void)
 {
   if (this != mainWindow)
@@ -751 +751 @@
       isOpen = true;
 #ifdef HAVE_GTK2
-      gtk_widget_show_all(widget);
-      gtk_grab_add(widget);
+      gtk_widget_show_all(this->widget);
+      gtk_grab_add(this->widget);
 #endif /* HAVE_GTK2 */
     }
@@ -760 +760 @@
    \brief closes up a Window and removes the Focus from it
 */
-void Window::close()
+void Window::close(void)
 {
   if (this != mainWindow)
     {
-      isOpen = false;
-#ifdef HAVE_GTK2
-      gtk_grab_remove(widget);
-      gtk_widget_hide (widget);
-#endif /* HAVE_GTK2 */
-    }
-}
-
-#ifdef HAVE_GTK2
-/**
-   \brief opens up a window (not topmost Window).
+      this->isOpen = false;
+#ifdef HAVE_GTK2
+      gtk_grab_remove(this->widget);
+      gtk_widget_hide(this->widget);
+#endif /* HAVE_GTK2 */
+    }
+}
+
+#ifdef HAVE_GTK2
+/**
+   \brief opens up a window(not topmost Window).
    this is the Signal that does it. !!SIGNALS ARE STATIC!!
    \param widget the widget that did it.
@@ -780 +780 @@
    \param window the Window that should be opened
 */
-gint Window::windowOpen (GtkWidget *widget, GdkEvent* event, void* window)
+gint Window::windowOpen(GtkWidget *widget, GdkEvent* event, void* window)
 {
   static_cast<Window*>(window)->open();
@@ -786 +786 @@
 
 /**
-   \brief closes a window (not topmost Window).
+   \brief closes a window(not topmost Window).
    this is the Signal that does it. !!SIGNALS ARE STATIC!!
    \param widget the widget that did it!
@@ -792 +792 @@
    \param window the Window that should be closed
 */
-gint Window::windowClose (GtkWidget *widget, GdkEvent* event, void* window)
+gint Window::windowClose(GtkWidget *widget, GdkEvent* event, void* window)
 {
   static_cast<Window*>(window)->close();
@@ -805 +805 @@
     \brief Creates a new Frame without a name
 */
-Frame::Frame (void)
+Frame::Frame(void)
 {
   this->init();
@@ -813 +813 @@
    \brief Creates a new Frame with name title
 */
-Frame::Frame (char* title)
+Frame::Frame(char* title)
 {
   this->init();
@@ -822 +822 @@
    \brief destrcucts a Frame
 */
-Frame::~Frame()
+Frame::~Frame(void)
 {
   this->destroy();
@@ -830 +830 @@
     \brief Initializes a new Frame with default settings
 */
-void Frame::init()
+void Frame::init(void)
 {
   static_cast<Container*>(this)->init();
 
 #ifdef HAVE_GTK2
-  widget = gtk_frame_new ("");
-  gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
+  this->widget = gtk_frame_new("");
+  gtk_container_set_border_width(GTK_CONTAINER(this->widget), 3);
 #endif /* HAVE_GTK2 */
 }
@@ -857 +857 @@
    \param title The title the Frame should get.
 */
-void Frame::setTitle (char* title)
+void Frame::setTitle(char* title)
 {
   if (this->title)
@@ -864 +864 @@
   strcpy(this->title, title);
 #ifdef HAVE_GTK2
-  gtk_frame_set_label (GTK_FRAME (widget), title);
+  gtk_frame_set_label(GTK_FRAME(widget), title);
 #endif /* HAVE_GTK2 */
 }
@@ -873 +873 @@
    \brief Creates a new EventBox with default settings.
 */
-EventBox::EventBox (void)
+EventBox::EventBox(void)
 {
   this->init();
@@ -880 +880 @@
 /**
    \brief Creates a new EventBox with name title
-   \param title title the Eventbox should get (only data-structure-internal)
-*/
-EventBox::EventBox (char* title)
+   \param title title the Eventbox should get(only data-structure-internal)
+*/
+EventBox::EventBox(char* title)
 {
   this->init();
@@ -902 +902 @@
 void EventBox::init(void)
 {
-  isOption = -1;
+  this->isOption = -1;
 
   static_cast<Container*>(this)->init();
 
 #ifdef HAVE_GTK2
-  widget = gtk_event_box_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
+  this->widget = gtk_event_box_new();
+  gtk_container_set_border_width(GTK_CONTAINER(this->widget), 3);
 #endif /* HAVE_GTK2 */
 }
@@ -926 +926 @@
 
 /**
-   \brief Sets the Title of the EventBox (not implemented)
-   \param title Name the EventBox should get (only datastructure-internal).
-*/
-void EventBox::setTitle (char* title)
+   \brief Sets the Title of the EventBox(not implemented)
+   \param title Name the EventBox should get(only datastructure-internal).
+*/
+void EventBox::setTitle(char* title)
 {
   if (this->title)
@@ -942 +942 @@
    \brief Creates a new horizontal Box
 */
-Box::Box (void)
+Box::Box(void)
 {
   this->init('h');
@@ -951 +951 @@
    \param boxtype if 'v' the Box will be vertically, if 'h' the Box will be horizontally
 */
-Box::Box (char boxtype)
+Box::Box(char boxtype)
 {
   this->init(boxtype);
@@ -970 +970 @@
 void Box::init(char boxtype)
 {
-  isOption = -2;
+  this->isOption = -2;
 
   static_cast<Packer*>(this)->init();
@@ -976 +976 @@
   if (boxtype == 'v')
     {
-      widget = gtk_vbox_new (FALSE, 0);
+      this->widget = gtk_vbox_new(FALSE, 0);
     }
   else
     {
-      widget = gtk_hbox_new (FALSE, 0);
+      this->widget = gtk_hbox_new(FALSE, 0);
     }
 #endif /* HAVE_GTK2 */
@@ -1004 +1004 @@
     It does this by apending the first one to its down-pointer and all its following ones to the preceding next-pointer. The last one will receive a NULL pointer as Next
 */
-void Box::fill (Widget *lowerWidget)
-{
-#ifdef HAVE_GTK2
-  gtk_box_pack_start (GTK_BOX (this->widget), lowerWidget->widget, TRUE, TRUE, 0);
+void Box::fill(Widget* lowerWidget)
+{
+#ifdef HAVE_GTK2
+  gtk_box_pack_start(GTK_BOX(this->widget), lowerWidget->widget, TRUE, TRUE, 0);
 #endif /* HAVE_GTK2 */
   if (this->down == NULL)
@@ -1015 +1015 @@
       Widget* tmp;
       tmp = this->down;
-      while (tmp->next != NULL)
+      while(tmp->next != NULL)
         {
           tmp = tmp->next;
@@ -1041 +1041 @@
    sets all Option-Specific-Values to their defaults.
 */
-void Option::init()
-{
-  value = 0;
-  flagName = NULL;
-  flagNameShort = NULL;
-  saveable = false;
-  defaultValue = 0;
+void Option::init(void)
+{
+  this->value = 0;
+  this->flagName = NULL;
+  this->flagNameShort = NULL;
+  this->saveable = false;
+  this->defaultValue = 0;
 
   static_cast<Widget*>(this)->init();
@@ -1060 +1060 @@
 { 
   PRINTF(4)("deleting the Option Part.\n");
-  if (flagName)
-    delete []flagName;
-  if (flagNameShort)
-    delete []flagNameShort;
+  if (this->flagName)
+    delete []this->flagName;
+  if (this->flagNameShort)
+    delete []this->flagNameShort;
 
   static_cast<Widget*>(this)->destroy();
@@ -1072 +1072 @@
    !! Options will be saved if flagname is different from NULL !!
    \param flagname the Name that will be displayed in the output
-   \param defaultvalue the default Value for this Option (see definition of defaultvalue
-*/
-void Option::setFlagName (char* flagname, int defaultvalue)
-{
-  if (flagName)
-    delete flagName;
-  flagName = new char [strlen(flagname)+1];
-  strcpy(flagName, flagname);
-  defaultValue = defaultvalue;
+   \param defaultvalue the default Value for this Option(see definition of defaultvalue
+*/
+void Option::setFlagName(char* flagname, int defaultvalue)
+{
+  if (this->flagName)
+    delete this->flagName;
+  this->flagName = new char [strlen(flagname)+1];
+  strcpy(this->flagName, flagname);
+  this->defaultValue = defaultvalue;
 
   //  cout << "Set Flagname of " << this->title << " to " << flagname << endl;
@@ -1086 +1086 @@
 
 /** 
-    \brief see Option::setFlagName (char* flagname, int defaultvalue)
+    \brief see Option::setFlagName(char* flagname, int defaultvalue)
     \param flagname the Name that will be displayed in the output
-    \param defaultvalue the default Value for this Option (see definition of defaultvalue
+    \param defaultvalue the default Value for this Option(see definition of defaultvalue
     \param flagnameshort a short flagname to be displayed in the output
 */
-void Option::setFlagName (char* flagname, char* flagnameshort,  int defaultvalue)
-{
-  if (flagName)
-    delete flagName;
-  flagName = new char [strlen(flagname)+1];
-  strcpy(flagName, flagname);
-
-  if (flagNameShort)
-    delete flagNameShort;
-  flagNameShort = new char [strlen(flagnameshort)+1];
-  strcpy(flagNameShort, flagnameshort);
-  defaultValue = defaultvalue;
+void Option::setFlagName(char* flagname, char* flagnameshort,  int defaultvalue)
+{
+  if (this->flagName)
+    delete []this->flagName;
+  this->flagName = new char [strlen(flagname)+1];
+  strcpy(this->flagName, flagname);
+
+  if (this->flagNameShort)
+    delete []this->flagNameShort;
+  this->flagNameShort = new char [strlen(flagnameshort)+1];
+  strcpy(this->flagNameShort, flagnameshort);
+  this->defaultValue = defaultvalue;
   //  cout << "Set Flagname of " << this->title << " to " << flagname << endl;
 }
@@ -1137 +1137 @@
     \param slider the Slider-Object that should receive the change.
 */
-gint Option::OptionChange (GtkWidget *widget, Widget* option)
+gint Option::OptionChange(GtkWidget *widget, Widget* option)
 {
   static_cast<Option*>(option)->changeOption();
-  flags->setTextFromFlags(orxonoxGUI);  //// must be different !!!
+  flags->setTextFromFlags(Window::mainWindow);  //// must be different !!!
 }
 #endif /* HAVE_GTK2 */
@@ -1175 +1175 @@
 
 #ifdef HAVE_GTK2
-  widget = gtk_button_new_with_label ("");
+  widget = gtk_button_new_with_label("");
 #endif /* HAVE_GTK2 */
 }
@@ -1196 +1196 @@
    \param title The name the Button should get
 */
-void Button::setTitle (char *title)
+void Button::setTitle(char *title)
 {
   if (this->title)
@@ -1203 +1203 @@
   strcpy(this->title, title);
 #ifdef HAVE_GTK2
-  gtk_button_set_label (GTK_BUTTON(widget), title);
+  gtk_button_set_label(GTK_BUTTON(widget), title);
 #endif /* HAVE_GTK2 */
 }
@@ -1211 +1211 @@
    not implemented yet
 */
-void Button::redraw (void)
+void Button::redraw(void)
 {
 }
@@ -1217 +1217 @@
 /**
    \brief Button can not be changed, optionChange is empty)
+
+   \todo Actions for non-GTK-mode
 */
 void Button::changeOption(void)
@@ -1229 +1231 @@
    \param buttonname The name the CheckButton should display.
 */
-CheckButton::CheckButton (char* buttonname)
+CheckButton::CheckButton(char* buttonname)
 {
   this->init();
@@ -1235 +1237 @@
 
 #ifdef HAVE_GTK2
-  this->connectSignal ("clicked", this->OptionChange);
+  this->connectSignal("clicked", this->OptionChange);
 #endif /* HAVE_GTK2 */
 }
@@ -1252 +1254 @@
 void CheckButton::init(void)
 {
-  isOption = 1;
+  this->isOption = 1;
 
   static_cast<Option*>(this)->init();
 
 #ifdef HAVE_GTK2
-  widget = gtk_check_button_new_with_label ("");
+  this->widget = gtk_check_button_new_with_label("");
 #endif /* HAVE_GTK2 */
 }
@@ -1289 +1291 @@
 }
 
-bool CheckButton::isActive()
+bool CheckButton::isActive(void)
 {
 #ifdef HAVE_GTK2
@@ -1299 +1301 @@
    \brief Changed the Option, call this Function
 */
-void CheckButton::changeOption()
-{
-#ifdef HAVE_GTK2
-  this->value = (int)gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (this->widget));
+void CheckButton::changeOption(void)
+{
+#ifdef HAVE_GTK2
+  this->value =(int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(this->widget));
 #else /* HAVE_GTK2 */
   char tmpChar[20];
@@ -1316 +1318 @@
 
 /**
-   \brief Redraws the CheckButton (if option has changed).
+   \brief Redraws the CheckButton(if option has changed).
    Example: if new settings are loaded the Button must be redrawn for the GUI to display that Change
 */
-void CheckButton::redraw ()
-{
-#ifdef HAVE_GTK2
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
+void CheckButton::redraw(void)
+{
+#ifdef HAVE_GTK2
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(this->widget), value);
 #endif /* HAVE_GTK2 */
 }
@@ -1334 +1336 @@
    \param end The maximal Value of the slider.
 */
-Slider::Slider (char* slidername, int start, int end)
+Slider::Slider(char* slidername, int start, int end)
 {
   this->init(start, end);
@@ -1340 +1342 @@
   this->setTitle(slidername);
 #ifdef HAVE_GTK2
-  this->connectSignal ("value_changed", this->OptionChange);
+  this->connectSignal("value_changed", this->OptionChange);
 #endif /* HAVE_GTK2 */
 }
@@ -1354 +1356 @@
 /**
    \brief Initializes a Slider with start and end Values
-   params: see Slider::Slider (char* slidername, int start, int end)
+   params: see Slider::Slider(char* slidername, int start, int end)
 */
 void Slider::init(int start, int end)
 {
-  isOption = 2;
+  this->isOption = 2;
 
   static_cast<Option*>(this)->init();
@@ -1365 +1367 @@
   this->end = end;
 #ifdef HAVE_GTK2
- widget = gtk_hscale_new_with_range (start, end, 5);
+ widget = gtk_hscale_new_with_range(this->start, this->end, 5);
 #endif /* HAVE_GTK2 */
 }
@@ -1406 +1408 @@
 /**
    \brief Redraws the widget
-   Example: see void CheckButton::redraw ()
-*/
-void Slider::redraw ()
-{
-#ifdef HAVE_GTK2
-  gtk_range_set_value (GTK_RANGE (widget), value);
+   Example: see void CheckButton::redraw(void)
+*/
+void Slider::redraw(void)
+{
+#ifdef HAVE_GTK2
+  gtk_range_set_value(GTK_RANGE(this->widget), value);
 #endif /* HAVE_GTK2 */
 }
@@ -1418 +1420 @@
    \brief Changed the Option, call this Function
 */
-void Slider::changeOption()
-{
-#ifdef HAVE_GTK2
-  this->value = (int)gtk_range_get_value(GTK_RANGE(this->widget));
+void Slider::changeOption(void)
+{
+#ifdef HAVE_GTK2
+  this->value =(int)gtk_range_get_value(GTK_RANGE(this->widget));
 #else /* HAVE_GTK2 */
   char tmpChar[20];
@@ -1443 +1445 @@
     \param ... items to be added to this Menu. !! Consider, that the last input argument has to be "lastItem" for this to work!!
 */
-Menu::Menu (char* menuname, ...)
+Menu::Menu(char* menuname, ...)
 {
   this->init();
@@ -1451 +1453 @@
 
 #ifdef HAVE_GTK2             /////////////////////// REINPLEMENT
-  va_start (itemlist, menuname);
-  while (strcmp (itemName = va_arg (itemlist, char*), "lastItem"))
+  va_start(itemlist, menuname);
+  while(strcmp(itemName = va_arg(itemlist, char*), "lastItem"))
     {
       this->addItem(itemName);
@@ -1460 +1462 @@
 
 #ifdef HAVE_GTK2
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (widget), menu);
-  this->connectSignal ("changed", this->OptionChange);
+  gtk_option_menu_set_menu(GTK_OPTION_MENU(this->widget), menu);
+  this->connectSignal("changed", this->OptionChange);
 #endif /* HAVE_GTK2 */
 }
@@ -1478 +1480 @@
 void Menu::init(void)
 {
-  isOption = 2;
+  this->isOption = 2;
 
   static_cast<Option*>(this)->init();
 
 #ifdef HAVE_GTK2
-  widget = gtk_option_menu_new ();
-  menu = gtk_menu_new ();
+  this->widget = gtk_option_menu_new();
+  this->menu = gtk_menu_new();
 #endif /* HAVE_GTK2 */
 
@@ -1519 +1521 @@
    \brief appends a new Item to the Menu-List.
    \param itemName the itemName to be appendet.
-*/
-void Menu::addItem (char* itemName)
-{
-#ifdef HAVE_GTK2
-  item = gtk_menu_item_new_with_label (itemName);
-  gtk_menu_shell_append(GTK_MENU_SHELL (menu), item);
+
+   \todo make the item-list readable without GTK
+*/
+void Menu::addItem(char* itemName)
+{
+#ifdef HAVE_GTK2
+  this->item = gtk_menu_item_new_with_label(itemName);
+  gtk_menu_shell_append(GTK_MENU_SHELL(this->menu), this->item);
 #endif /* HAVE_GTK2 */
 }
@@ -1530 +1534 @@
 /**
    \brief Redraws the widget
-   Example: see void CheckButton::redraw ()
-*/
-void Menu::redraw ()
-{
-#ifdef HAVE_GTK2
- gtk_option_menu_set_history (GTK_OPTION_MENU (widget), value);
+   Example: see void CheckButton::redraw(void)
+*/
+void Menu::redraw(void)
+{
+#ifdef HAVE_GTK2
+ gtk_option_menu_set_history(GTK_OPTION_MENU(this->widget), this->value);
 #endif /* HAVE_GTK2 */
 }
@@ -1542 +1546 @@
    \brief Changed the Option, call this Function
 */
-void Menu::changeOption()
-{
-#ifdef HAVE_GTK2
-  this->value = (int)gtk_option_menu_get_history (GTK_OPTION_MENU (this->widget));
+void Menu::changeOption(void)
+{
+#ifdef HAVE_GTK2
+  this->value =(int)gtk_option_menu_get_history(GTK_OPTION_MENU(this->widget));
 #else /* HAVE_GTK2 */
   char tmpChar[20];
-  cout << "\nPlease give me a new value for " << this->title << " (defualt:" << this->defaultValue << "): ";
+  cout << "\nPlease give me a new value for " << this->title << "(defualt:" << this->defaultValue << "): ";
   cin >> tmpChar;
   this->value = atoi(tmpChar);
@@ -1561 +1565 @@
    \brief Creates a new OptionLabel with a LabelName and a Value.
    \param label The name of the OptionLabel.
-   \param value The Value of the OptionLabel (what will be displayed).
+   \param value The Value of the OptionLabel(what will be displayed).
 */
 OptionLabel::OptionLabel(char* label, char* value)
 {
-  init();
-  setTitle(label);
-  setValue(value);
+  this->init();
+  this->setTitle(label);
+  this->setValue(value);
 }
 
@@ -1583 +1587 @@
 void OptionLabel::init(void)
 {
+  this->isOption = 5;
   static_cast<Option*>(this)->init();
-  isOption = 5;
+
   cValue = NULL;
 
 #ifdef HAVE_GTK2
-  widget = gtk_label_new ("");
+  this->widget = gtk_label_new("");
 #endif /* HAVE_GTK2 */
 }
@@ -1601 +1606 @@
   else 
     PRINTF(3)("deleting the OptionLabel.\n");
-  if (cValue)
-    delete []cValue;
+  if (this->cValue)
+    delete []this->cValue;
 
   static_cast<Option*>(this)->destroy();
@@ -1614 +1619 @@
 void OptionLabel::setValue(char* newValue)
 {
-  if (cValue)
-    delete cValue;
-  cValue = new char [strlen(newValue)+1];
-  strcpy(cValue, newValue);
-#ifdef HAVE_GTK2
-  gtk_label_set_text (GTK_LABEL (widget), cValue);
+  if (this->cValue)
+    delete []this->cValue;
+  this->cValue = new char [strlen(newValue)+1];
+  strcpy(this->cValue, newValue);
+#ifdef HAVE_GTK2
+  gtk_label_set_text(GTK_LABEL(this->widget), this->cValue);
 #endif /* HAVE_GTK2 */
 }
@@ -1633 +1638 @@
   this->title = new char [strlen(title)+1];
   strcpy(this->title, title);
-#ifdef HAVE_GTK2
-  gtk_label_set_text (GTK_LABEL(widget), title);
-#endif /* HAVE_GTK2 */
-}
-
-/**
-   \brief Redraws an OptionLabel (not implemented yet, but it works).
+  this->redraw();
+}
+
+/**
+   \brief Redraws an OptionLabel(not implemented yet, but it works).
 */
 void OptionLabel::redraw(void)
 {
-  
+#ifdef HAVE_GTK2
+  gtk_label_set_text(GTK_LABEL(widget), title);
+#endif /* HAVE_GTK2 */
 }
 
@@ -1649 +1654 @@
    \brief Changed the Option, call this Function
 */
-void OptionLabel::changeOption()
-{
-#ifdef HAVE_GTK2
-  this->cValue = (char*)gtk_label_get_text (GTK_LABEL(this->widget));
+void OptionLabel::changeOption(void)
+{
+#ifdef HAVE_GTK2
+  this->cValue =(char*)gtk_label_get_text(GTK_LABEL(this->widget));
 #else /* HAVE_GTK2 */
   cout << "\nPlease give me a new input for " << this->title << ": ";
@@ -1665 +1670 @@
    You migth consider adding Label::setTitle with this.
 */
-Label::Label ()
+Label::Label(void)
 {
   this->init();
@@ -1674 +1679 @@
    \param text The text to be displayed.
 */
-Label:: Label (char* text)
+Label:: Label(char* text)
 {
   this->init();
@@ -1693 +1698 @@
 void Label::init(void)
 {
-  isOption = 0;
+  this->isOption = 0;
 
   static_cast<Widget*>(this)->init();
 
 #ifdef HAVE_GTK2
-  widget = gtk_label_new ("");
-  gtk_label_set_line_wrap (GTK_LABEL(widget), TRUE);
+  this->widget = gtk_label_new("");
+  gtk_label_set_line_wrap(GTK_LABEL(this->widget), TRUE);
 #endif /* HAVE_GTK2 */
 }
@@ -1727 +1732 @@
   strcpy(this->title, text);
 #ifdef HAVE_GTK2
-  gtk_label_set_text (GTK_LABEL (this->widget), text);
+  gtk_label_set_text(GTK_LABEL(this->widget), this->title);
 #endif /* HAVE_GTK2 */
 }
@@ -1759 +1764 @@
   
 #ifdef HAVE_GTK2
-  gtk_label_set_text (GTK_LABEL (this->widget), title);
+  gtk_label_set_text(GTK_LABEL(this->widget), title);
 #endif /* HAVE_GTK2 */
 }
@@ -1771 +1776 @@
 void Label::appendInt(int intToAppend)
 {
-  char append [20];
+  char append [32];
   sprintf(append, "%d", intToAppend);
   this->appendText(append);
@@ -1781 +1786 @@
    \return The Text the Label holds.
 */
-char* Label::getText ()
+char* Label::getText(void)
 {
   return this->title;
@@ -1789 +1794 @@
    \brief Creates a new ProgressBar.
 */
-ProgressBar::ProgressBar (void)
-{
-  this->init ();
+ProgressBar::ProgressBar(void)
+{
+  this->init();
 }
 
@@ -1798 +1803 @@
    \param label The name you want to get the ProgressBar.
 */
-ProgressBar::ProgressBar (char* label)
+ProgressBar::ProgressBar(char* label)
 {
   this->init();
-  this->setTitle (label);
+  this->setTitle(label);
 }
 
@@ -1807 +1812 @@
    \brief destructs a ProgressBar
 */
-ProgressBar::~ProgressBar ()
+ProgressBar::~ProgressBar(void)
 {
   this->destroy();
@@ -1815 +1820 @@
    \brief Initializes a ProgressBar
 */
-void ProgressBar::init (void)
-{
-  isOption = 0;
-  progress = 0.0;
-  totalSize = 0.0;
+void ProgressBar::init(void)
+{
+  this->isOption = 0;
+  this->progress = 0.0;
+  this->totalSize = 0.0;
 
   static_cast<Widget*>(this)->init();
 #ifdef HAVE_GTK2
-  adjustment = (GtkAdjustment*)gtk_adjustment_new(0, 0, 100, 0, 0, 0);
-  widget = gtk_progress_bar_new_with_adjustment(adjustment);
+  this->adjustment =(GtkAdjustment*)gtk_adjustment_new(0, 0, 100, 0, 0, 0);
+  this->widget = gtk_progress_bar_new_with_adjustment(this->adjustment);
 #endif /* HAVE_GTK2 */
 }
@@ -1854 +1859 @@
 
 /**
-   \brief Sets the Total size of the Bar. (ex. The maximum one can download)
-*/
-void ProgressBar::setTotalSize (double totalSize)
+   \brief Sets the Total size of the Bar.(ex. The maximum one can download)
+*/
+void ProgressBar::setTotalSize(double totalSize)
 {
   this->totalSize = totalSize;
@@ -1864 +1869 @@
    \brief Sets the progress maximum is this->totalSize
 */
-void ProgressBar::setProgress (double progress)
+void ProgressBar::setProgress(double progress)
 {
   this->progress = progress;
@@ -1874 +1879 @@
   gtk_progress_set_value(GTK_PROGRESS(widget), this->progress*100.0/this->totalSize);
 #endif /* HAVE_GTK2 */
-  PRINTF(3)("Progress: %f\n", progress*100.0/totalSize);
+  PRINTF(3)("Progress: %f\n", this->progress*100.0/this->totalSize);
 }
 
@@ -1880 +1885 @@
     \brief returns the Progress Status
 */
-double ProgressBar::getProgress (void)
+double ProgressBar::getProgress(void)
 {
   return this->progress;
@@ -1891 +1896 @@
    \param imagename the location of the Image on the Hard Disc
 */
-Image::Image (char* imagename)
+Image::Image(char* imagename)
 {
   this->init();
@@ -1900 +1905 @@
 
 #ifdef HAVE_GTK2
-  widget = gtk_image_new_from_file (imagename);
+  widget = gtk_image_new_from_file(imagename);
 #endif /* HAVE_GTK2 */
 }
@@ -1915 +1920 @@
     \brief Initializes a new Image
 */
-void Image::init()
+void Image::init(void)
 {
   isOption = 0;