Changeset 9715 in orxonox.OLD for branches/new_class_id/src/lib/gui/gl

Timestamp:

Sep 1, 2006, 8:06:39 PM (18 years ago)

Author:

bensch

Message:

renamed newclassid to classid and newobjectlist to objectlist

Location:

branches/new_class_id/src/lib/gui/gl

Files:

• glgui_bar.cc (modified) (1 diff)
• glgui_bar.h (modified) (1 diff)
• glgui_box.cc (modified) (1 diff)
• glgui_box.h (modified) (1 diff)
• glgui_button.cc (modified) (1 diff)
• glgui_button.h (modified) (1 diff)
• glgui_checkbutton.cc (modified) (1 diff)
• glgui_checkbutton.h (modified) (1 diff)
• glgui_colorselector.h (modified) (1 diff)
• glgui_container.cc (modified) (1 diff)
• glgui_container.h (modified) (1 diff)
• glgui_cursor.cc (modified) (1 diff)
• glgui_cursor.h (modified) (1 diff)
• glgui_fixedposition_box.cc (modified) (1 diff)
• glgui_fixedposition_box.h (modified) (1 diff)
• glgui_frame.cc (modified) (1 diff)
• glgui_frame.h (modified) (1 diff)
• glgui_handler.cc (modified) (4 diffs)
• glgui_handler.h (modified) (1 diff)
• glgui_image.cc (modified) (1 diff)
• glgui_image.h (modified) (1 diff)
• glgui_inputline.cc (modified) (1 diff)
• glgui_inputline.h (modified) (1 diff)
• glgui_mainwidget.cc (modified) (1 diff)
• glgui_mainwidget.h (modified) (1 diff)
• glgui_menu.cc (modified) (1 diff)
• glgui_menu.h (modified) (1 diff)
• glgui_pushbutton.cc (modified) (1 diff)
• glgui_pushbutton.h (modified) (1 diff)
• glgui_slider.cc (modified) (1 diff)
• glgui_slider.h (modified) (1 diff)
• glgui_table.cc (modified) (1 diff)
• glgui_table.h (modified) (1 diff)
• glgui_text.cc (modified) (1 diff)
• glgui_text.h (modified) (1 diff)
• glgui_textfield.cc (modified) (1 diff)
• glgui_textfield.h (modified) (1 diff)
• glgui_widget.cc (modified) (1 diff)
• glgui_widget.h (modified) (1 diff)
• glgui_window.cc (modified) (1 diff)
• glgui_window.h (modified) (1 diff)
• glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• glmenu/glmenu_imagescreen.h (modified) (1 diff)
• specials/glgui_notifier.cc (modified) (1 diff)
• specials/glgui_notifier.h (modified) (1 diff)

branches/new_class_id/src/lib/gui/gl/glgui_bar.cc

@@ -23 +23 @@
 {
 
-  NewObjectListDefinition(GLGuiBar);
+  ObjectListDefinition(GLGuiBar);
   /**
    * @brief standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_bar.h

@@ -21 +21 @@
   class GLGuiBar : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiBar);
+    ObjectListDeclaration(GLGuiBar);
   public:
     GLGuiBar();

branches/new_class_id/src/lib/gui/gl/glgui_box.cc

@@ -22 +22 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiBox);
+  ObjectListDefinition(GLGuiBox);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_box.h

@@ -19 +19 @@
   class GLGuiBox : public GLGuiContainer
   {
-    NewObjectListDeclaration(GLGuiBox);
+    ObjectListDeclaration(GLGuiBox);
   public:
     GLGuiBox(OrxGui::Orientation orientation = OrxGui::Vertical);

branches/new_class_id/src/lib/gui/gl/glgui_button.cc

@@ -23 +23 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiButton);
+  ObjectListDefinition(GLGuiButton);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_button.h

@@ -31 +31 @@
   class GLGuiButton : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiButton);
+    ObjectListDeclaration(GLGuiButton);
     public:
       GLGuiButton(const std::string& label);

branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.cc

@@ -22 +22 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiCheckButton);
+  ObjectListDefinition(GLGuiCheckButton);
 
   /**

branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.h

@@ -21 +21 @@
   class GLGuiCheckButton : public GLGuiButton
   {
-    NewObjectListDeclaration(GLGuiCheckButton);
+    ObjectListDeclaration(GLGuiCheckButton);
   public:
     GLGuiCheckButton(const std::string& label = "", bool active = false);

branches/new_class_id/src/lib/gui/gl/glgui_colorselector.h

@@ -21 +21 @@
   class GLGui : public GLGui
   {
-    NewObjectListDeclaration(GLGuiColorSelector);
+    ObjectListDeclaration(GLGuiColorSelector);
   public:
     GLGui();

branches/new_class_id/src/lib/gui/gl/glgui_container.cc

@@ -20 +20 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiContainer);
+  ObjectListDefinition(GLGuiContainer);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_container.h

@@ -20 +20 @@
   class GLGuiContainer : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiContainer);
+    ObjectListDeclaration(GLGuiContainer);
   public:
     GLGuiContainer();

branches/new_class_id/src/lib/gui/gl/glgui_cursor.cc

@@ -23 +23 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiCursor);
+  ObjectListDefinition(GLGuiCursor);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_cursor.h

@@ -26 +26 @@
   class GLGuiCursor : public GLGuiWidget, public EventListener
   {
-    NewObjectListDeclaration(GLGuiCursor);
+    ObjectListDeclaration(GLGuiCursor);
   public:
     GLGuiCursor();

branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.cc

@@ -23 +23 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiFixedpositionBox);
+  ObjectListDefinition(GLGuiFixedpositionBox);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.h

@@ -21 +21 @@
   class GLGuiFixedpositionBox : public OrxGui::GLGuiBox, EventListener
   {
-    NewObjectListDeclaration(GLGuiFixedpositionBox);
+    ObjectListDeclaration(GLGuiFixedpositionBox);
     public:
       GLGuiFixedpositionBox(OrxGui::Position position = OrxGui::Center, OrxGui::Orientation orientation = OrxGui::Vertical);

branches/new_class_id/src/lib/gui/gl/glgui_frame.cc

@@ -21 +21 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiFrame);
+  ObjectListDefinition(GLGuiFrame);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_frame.h

@@ -20 +20 @@
   class GLGuiFrame : public GLGuiContainer
   {
-    NewObjectListDeclaration(GLGuiFrame);
+    ObjectListDeclaration(GLGuiFrame);
   public:
     GLGuiFrame();

branches/new_class_id/src/lib/gui/gl/glgui_handler.cc

@@ -34 +34 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiHandler);
+  ObjectListDefinition(GLGuiHandler);
   /**
    * standard constructor
@@ -116 +116 @@
   {
     // retrieve Objects.
-    NewObjectList<GLGuiWidget>::const_iterator it, currentIt;
+    ObjectList<GLGuiWidget>::const_iterator it, currentIt;
     currentIt = GLGuiWidget::objectList().end();
 
@@ -154 +154 @@
   void GLGuiHandler::selectPrevious()
   {
-    NewObjectList<GLGuiWidget>::const_iterator it, currentIt;
+    ObjectList<GLGuiWidget>::const_iterator it, currentIt;
     currentIt = GLGuiWidget::objectList().begin();
 
@@ -286 +286 @@
     if (this->_cursor != NULL)
     {
-      for (NewObjectList<GLGuiWidget>::const_iterator it = GLGuiWidget::objectList().begin();
+      for (ObjectList<GLGuiWidget>::const_iterator it = GLGuiWidget::objectList().begin();
            it != GLGuiWidget::objectList().end();
            it++)

branches/new_class_id/src/lib/gui/gl/glgui_handler.h

@@ -19 +19 @@
   class GLGuiHandler : public EventListener
   {
-    NewObjectListDeclaration(GLGuiHandler);
+    ObjectListDeclaration(GLGuiHandler);
   public:
     /** @returns a Pointer to the only object of this Class */

branches/new_class_id/src/lib/gui/gl/glgui_image.cc

@@ -22 +22 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiImage);
+  ObjectListDefinition(GLGuiImage);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_image.h

@@ -21 +21 @@
   class GLGuiImage : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiImage);
+    ObjectListDeclaration(GLGuiImage);
   public:
     GLGuiImage();

branches/new_class_id/src/lib/gui/gl/glgui_inputline.cc

@@ -20 +20 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiInputLine);
+  ObjectListDefinition(GLGuiInputLine);
   /**
    * @brief standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_inputline.h

@@ -25 +25 @@
   class GLGuiInputLine : public OrxGui::GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiInputLine);
+    ObjectListDeclaration(GLGuiInputLine);
   public:
     GLGuiInputLine();

branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.cc

@@ -20 +20 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiMainWidget);
+  ObjectListDefinition(GLGuiMainWidget);
 
   /**

branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.h

@@ -15 +15 @@
   class GLGuiMainWidget : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiMainWidget);
+    ObjectListDeclaration(GLGuiMainWidget);
   public:
     virtual ~GLGuiMainWidget(void);

branches/new_class_id/src/lib/gui/gl/glgui_menu.cc

@@ -20 +20 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiMenu);
+  ObjectListDefinition(GLGuiMenu);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_menu.h

@@ -19 +19 @@
   class GLGuiMenu : public GLGuiMenu
   {
-    NewObjectListDeclaration(GLGuiMenu);
+    ObjectListDeclaration(GLGuiMenu);
   public:
     GLGuiMenu();

branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.cc

@@ -23 +23 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiPushButton);
+  ObjectListDefinition(GLGuiPushButton);
   /**
    * @brief standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.h

@@ -21 +21 @@
   class GLGuiPushButton : public GLGuiButton
   {
-    NewObjectListDeclaration(GLGuiPushButton);
+    ObjectListDeclaration(GLGuiPushButton);
   public:
     GLGuiPushButton(const std::string& label = "");

branches/new_class_id/src/lib/gui/gl/glgui_slider.cc

@@ -23 +23 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiSlider);
+  ObjectListDefinition(GLGuiSlider);
   /**
    * @brief standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_slider.h

@@ -21 +21 @@
   class GLGuiSlider : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiSlider);
+    ObjectListDeclaration(GLGuiSlider);
   public:
     GLGuiSlider();

branches/new_class_id/src/lib/gui/gl/glgui_table.cc

@@ -23 +23 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiTable);
+  ObjectListDefinition(GLGuiTable);
   /**
    * @brief standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_table.h

@@ -25 +25 @@
   class GLGuiTable : public OrxGui::GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiTable);
+    ObjectListDeclaration(GLGuiTable);
   public:
     GLGuiTable(unsigned int rows, unsigned int columns);

branches/new_class_id/src/lib/gui/gl/glgui_text.cc

@@ -22 +22 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiText);
+  ObjectListDefinition(GLGuiText);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_text.h

@@ -20 +20 @@
   class GLGuiText : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiText);
+    ObjectListDeclaration(GLGuiText);
   public:
     GLGuiText();

branches/new_class_id/src/lib/gui/gl/glgui_textfield.cc

@@ -22 +22 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiTextfield);
+  ObjectListDefinition(GLGuiTextfield);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_textfield.h

@@ -20 +20 @@
   class GLGuiTextfield : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiTextfield);
+    ObjectListDeclaration(GLGuiTextfield);
   public:
     GLGuiTextfield();

branches/new_class_id/src/lib/gui/gl/glgui_widget.cc

@@ -31 +31 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiWidget);
+  ObjectListDefinition(GLGuiWidget);
   /**
    * @brief standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_widget.h

@@ -30 +30 @@
   class GLGuiWidget : public Element2D
   {
-    NewObjectListDeclaration(GLGuiWidget);
+    ObjectListDeclaration(GLGuiWidget);
   public:
     GLGuiWidget(GLGuiWidget* parent = NULL);

branches/new_class_id/src/lib/gui/gl/glgui_window.cc

@@ -20 +20 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiWindow);
+  ObjectListDefinition(GLGuiWindow);
   /**
    * standard constructor

branches/new_class_id/src/lib/gui/gl/glgui_window.h

@@ -20 +20 @@
   class GLGuiWindow : public GLGuiContainer
   {
-    NewObjectListDeclaration(GLGuiWindow);
+    ObjectListDeclaration(GLGuiWindow);
   public:
     GLGuiWindow();

branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc

@@ -26 +26 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
+ObjectListDefinitionID(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
 CREATE_FACTORY(GLMenuImageScreen);
 

branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.h

@@ -15 +15 @@
 class GLMenuImageScreen : public BaseObject
 {
-  NewObjectListDeclaration(GLMenuImageScreen);
+  ObjectListDeclaration(GLMenuImageScreen);
 public:
   GLMenuImageScreen (const TiXmlElement* root = NULL);

branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.cc

@@ -23 +23 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiNotifier);
+  ObjectListDefinition(GLGuiNotifier);
   /**
    * @brief standard constructor

branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.h

@@ -24 +24 @@
   class GLGuiNotifier : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiNotifier);
+    ObjectListDeclaration(GLGuiNotifier);
   public:
     GLGuiNotifier();