Changeset 7779 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

May 23, 2006, 10:04:17 PM (18 years ago)

Author:

bensch

Message:

3088 linews changed : trunk: namespaces

Location:

trunk/src/world_entities/weapons

Files:

• weapon.cc (modified) (1 diff)
• weapon.h (modified) (3 diffs)

trunk/src/world_entities/weapons/weapon.cc

@@ -307 +307 @@
 }
 
-GLGuiWidget* Weapon::getEnergyWidget()
+OrxGui::GLGuiWidget* Weapon::getEnergyWidget()
 {
   if (this->energyWidget == NULL)
   {
-    this->energyWidget = new GLGuiBar;
+    this->energyWidget = new OrxGui::GLGuiBar;
     this->energyWidget->setSize2D( 20, 100);
     this->energyWidget->setMaximum(this->getEnergyMax());

trunk/src/world_entities/weapons/weapon.h

@@ -25 +25 @@
 class TiXmlElement;
 class FastFactory;
+namespace OrxGui{ class GLGuiWidget; }
 template<class T> class tFastFactory;
-class GLGuiWidget;
 
 //! An enumerator defining Actions a Weapon can take
@@ -156 +156 @@
     Animation3D* copyAnimation(WeaponState from, WeaponState to);
 
-    GLGuiWidget* getEnergyWidget();
+    OrxGui::GLGuiWidget* getEnergyWidget();
 
     // FLOW
@@ -211 +211 @@
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
 
-    GLGuiBar*            energyWidget;
+    OrxGui::GLGuiBar*    energyWidget;
 
     PNode*               defaultTarget;                    //!< A target for targeting Weapons.