Changeset 9715 in orxonox.OLD for branches/new_class_id/src/lib/graphics/text_engine

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/graphics/text_engine

Files:

• font.cc (modified) (1 diff)
• font.h (modified) (1 diff)
• limited_width_text.cc (modified) (1 diff)
• limited_width_text.h (modified) (1 diff)
• multi_line_text.cc (modified) (1 diff)
• multi_line_text.h (modified) (1 diff)
• text.cc (modified) (1 diff)
• text.h (modified) (1 diff)
• text_engine.cc (modified) (2 diffs)
• text_engine.h (modified) (1 diff)

branches/new_class_id/src/lib/graphics/text_engine/font.cc

@@ -29 +29 @@
 #include "compiler.h"
 
-NewObjectListDefinition(Font);
+ObjectListDefinition(Font);
 
 Font::Font()

branches/new_class_id/src/lib/graphics/text_engine/font.h

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

branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.cc

@@ -19 +19 @@
 #include "font.h"
 
-NewObjectListDefinition(LimitedWidthText);
+ObjectListDefinition(LimitedWidthText);
 /**
  * @brief creates a new Text Element

branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.h

@@ -14 +14 @@
 class LimitedWidthText : public Text
 {
-  NewObjectListDeclaration(LimitedWidthText);
+  ObjectListDeclaration(LimitedWidthText);
   public:
     typedef enum {

branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.cc

@@ -19 +19 @@
 #include "font.h"
 
-NewObjectListDefinition(MultiLineText);
+ObjectListDefinition(MultiLineText);
 
 /**

branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.h

@@ -14 +14 @@
 class MultiLineText : public Text
 {
-  NewObjectListDeclaration(MultiLineText);
+  ObjectListDeclaration(MultiLineText);
   public:
     MultiLineText(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE, float lineWidth = 100.0);

branches/new_class_id/src/lib/graphics/text_engine/text.cc

@@ -22 +22 @@
 #include "debug.h"
 
-NewObjectListDefinition(Text);
+ObjectListDefinition(Text);
 
 /**

branches/new_class_id/src/lib/graphics/text_engine/text.h

@@ -26 +26 @@
 class Text : public Element2D
 {
-  NewObjectListDeclaration(Text);
+  ObjectListDeclaration(Text);
   public:
     Text(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE);

branches/new_class_id/src/lib/graphics/text_engine/text_engine.cc

@@ -39 +39 @@
 /// TEXT-ENGINE ///
 ///////////////////
-NewObjectListDefinition(TextEngine);
+ObjectListDefinition(TextEngine);
 /**
  *  standard constructor
@@ -124 +124 @@
   PRINT(0)("Reference: %p; Text Counts: %d\n", this, Text::objectList().size());
 
-  for (NewObjectList<Text>::const_iterator it = Text::objectList().begin();
+  for (ObjectList<Text>::const_iterator it = Text::objectList().begin();
        it != Text::objectList().end();
        ++it)

branches/new_class_id/src/lib/graphics/text_engine/text_engine.h

@@ -24 +24 @@
 class TextEngine : public BaseObject
 {
-  NewObjectListDeclaration(TextEngine);
+  ObjectListDeclaration(TextEngine);
   public:
   virtual ~TextEngine();