Changeset 9722 in orxonox.OLD for branches

Timestamp:

Sep 4, 2006, 11:54:30 PM (18 years ago)

Author:

bensch

Message:

orxonox: now it is gcc-4.1.1 conform

strangely before this, it was possible to compare and set std::list::iterators to NULL values.
also it now is not allowed to use
void ClassName::functionName(); inside of the header… quite nice feature, and i think compiling is faster too

Gentoo Rocks
GCC rocks also with nptl

Location:

branches/new_class_id/src

Files:

• lib/graphics/importer/md2/md2Model.h (modified) (1 diff)
• lib/gui/gl/glmenu/glmenu_imagescreen.h (modified) (1 diff)
• lib/network/network_game_manager.h (modified) (1 diff)
• lib/parser/ini_parser/ini_parser.cc (modified) (4 diffs)
• lib/parser/ini_parser/ini_parser.h (modified) (1 diff)
• lib/shell/shell_completion.h (modified) (1 diff)
• lib/util/sigslot/signal.h (modified) (9 diffs)
• world_entities/power_ups/laser_power_up.h (modified) (1 diff)
• world_entities/power_ups/turret_power_up.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

branches/new_class_id/src/lib/graphics/importer/md2/md2Model.h

@@ -160 +160 @@
   virtual void setAnimation(int firstFrame, int lastFrame, int fps, int bStoppable, int animPlayback);
   /**  returns the current animation @returns animation type */
-  inline int MD2Model::getAnimation() { return this->animationState.type; }
+  inline int getAnimation() { return this->animationState.type; }
   virtual void setAnimationSpeed(float speed) { this->animationSpeed = speed; }
   virtual bool isAnimationFinished() { return (this->animationState.currentFrame == this->animationState.endFrame )?true:false; }

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

@@ -33 +33 @@
   void setMaximum (int maxValue);
   /** @returns the maximum of countable steps*/
-  inline int GLMenuImageScreen::getMaximum() const { return this->maxValue; };
+  inline int getMaximum() const { return this->maxValue; };
 
   void setValue (int currentValue);

branches/new_class_id/src/lib/network/network_game_manager.h

@@ -37 +37 @@
     virtual ~NetworkGameManager();
 
-    static NetworkGameManager* NetworkGameManager::getInstance()
+    static NetworkGameManager* getInstance()
     { if (!NetworkGameManager::singletonRef) NetworkGameManager::singletonRef = new NetworkGameManager(); return NetworkGameManager::singletonRef; }
 

branches/new_class_id/src/lib/parser/ini_parser/ini_parser.cc

@@ -165 +165 @@
       else if( (ptr = strchr( lineBegin, '=')) != NULL)
       {
-        if (currentSection == NULL)
+        if (currentSection == this->sections.end())
         {
           PRINTF(2)("Not in a Section yet for %s\n", lineBegin);
@@ -470 +470 @@
   {
     std::list<IniEntry>::const_iterator entry = this->getEntryIT(entryName, sectionName);
-    if (entry != NULL &&  (*entry).name == entryName)
+    if (/** FIXME entry != NULL && */  (*entry).name == entryName)
       return (*entry).value;
     PRINTF(2)("Entry '%s' in section '%s' not found.\n", entryName.c_str(), sectionName.c_str());
@@ -627 +627 @@
       if ((*entry).name == entryName)
         break;
-  if (entry == (*section).entries.end())
-    return NULL;
-  else
-    return entry;
+  return entry;
 }
 
@@ -650 +647 @@
       if ((*entry).name == entryName)
         break;
-  if (entry == (*section).entries.end())
-    return NULL;
-  else
-    return entry;
+  return entry;
 }
 

branches/new_class_id/src/lib/parser/ini_parser/ini_parser.h

@@ -66 +66 @@
     bool addVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "" );
     const std::string& getVar(const std::string& entryName, const std::string& sectionName, const std::string& defaultValue = "") const;
-    bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "", bool createMissing = true);
+    bool editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "", bool createMissing = true);
     void setEntryComment(const std::string& comment, const std::string& entryName, const std::string& sectionName);
     const std::string& getEntryComment(const std::string& entryName, const std::string& sectionName) const;

branches/new_class_id/src/lib/shell/shell_completion.h

@@ -51 +51 @@
       bool autoComplete(std::string& input);
 
-      static const std::string& ShellCompletion::typeToString(ShellCompletion::CompletionType type);
+      static const std::string& typeToString(ShellCompletion::CompletionType type);
 
     private:

branches/new_class_id/src/lib/util/sigslot/signal.h

@@ -96 +96 @@
   {
   public:
+    virtual ~_connection_base0() {};
     virtual has_slots<mt_policy>* getdest() const = 0;
     virtual void emit() = 0;
@@ -106 +107 @@
   {
   public:
+    virtual ~_connection_base1() {};
     virtual has_slots<mt_policy>* getdest() const = 0;
     virtual void emit(arg1_type) = 0;
@@ -116 +118 @@
   {
   public:
+    virtual ~_connection_base2() {};
     virtual has_slots<mt_policy>* getdest() const = 0;
     virtual void emit(arg1_type, arg2_type) = 0;
@@ -126 +129 @@
   {
   public:
+    virtual ~_connection_base3() {};
     virtual has_slots<mt_policy>* getdest() const = 0;
     virtual void emit(arg1_type, arg2_type, arg3_type) = 0;
@@ -136 +140 @@
   {
   public:
+    virtual ~_connection_base4() {};
     virtual has_slots<mt_policy>* getdest() const = 0;
     virtual void emit(arg1_type, arg2_type, arg3_type, arg4_type) = 0;
@@ -147 +152 @@
   {
   public:
+    virtual ~_connection_base5() {};
     virtual has_slots<mt_policy>* getdest() const = 0;
     virtual void emit(arg1_type, arg2_type, arg3_type, arg4_type,
@@ -161 +167 @@
   {
   public:
+    virtual ~_connection_base6() {};
     virtual has_slots<mt_policy>* getdest() const = 0;
     virtual void emit(arg1_type, arg2_type, arg3_type, arg4_type, arg5_type,
@@ -175 +182 @@
   {
   public:
+    virtual ~_connection_base7() {};
     virtual has_slots<mt_policy>* getdest() const = 0;
     virtual void emit(arg1_type, arg2_type, arg3_type, arg4_type, arg5_type,
@@ -189 +197 @@
   {
   public:
+    virtual ~_connection_base8() {};
     virtual has_slots<mt_policy>* getdest() const = 0;
     virtual void emit(arg1_type, arg2_type, arg3_type, arg4_type, arg5_type,

branches/new_class_id/src/world_entities/power_ups/laser_power_up.h

@@ -23 +23 @@
 
 
-  virtual void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
+  virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void tick(float dt);
   virtual void draw() const;

branches/new_class_id/src/world_entities/power_ups/turret_power_up.h

@@ -21 +21 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  virtual void TurretPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
+  virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void tick(float dt);
   virtual void draw() const;

branches/new_class_id/src/world_entities/world_entity.cc

@@ -74 +74 @@
   this->objectListNumber = OM_INIT;
   this->lastObjectListNumber = OM_INIT;
-  this->objectListIterator = NULL;
 
   // reset all collision handles to NULL == unsubscribed state