[Orxonox-commit 1673] r6391 - in code/branches/presentation2/src/orxonox: . items sound

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-12-21 14:03:59 +0100 (Mon, 21 Dec 2009)
New Revision: 6391

Modified:
   code/branches/presentation2/src/orxonox/OrxonoxPrereqs.h
   code/branches/presentation2/src/orxonox/items/MultiStateEngine.h
   code/branches/presentation2/src/orxonox/sound/BaseSound.h
   code/branches/presentation2/src/orxonox/sound/SoundManager.h
Log:
Moved forward declarations to the Prereqs files.

Modified: code/branches/presentation2/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- code/branches/presentation2/src/orxonox/OrxonoxPrereqs.h	2009-12-21 12:49:34 UTC (rev 6390)
+++ code/branches/presentation2/src/orxonox/OrxonoxPrereqs.h	2009-12-21 13:03:59 UTC (rev 6391)
@@ -151,7 +151,9 @@
     //sound
     class AmbientSound;
     class BaseSound;
+    class SoundBuffer;
     class SoundManager;
+    class SoundStreamer;
     class WorldSound;
 
     // weaponsystem
@@ -168,6 +170,7 @@
     class BigExplosion;
     class CameraPosition;
     class ControllableEntity;
+    class EffectContainer;
     class ExplosionChunk;
     class MobileEntity;
     class MovableEntity;
@@ -209,5 +212,6 @@
 typedef struct ALCdevice_struct ALCdevice;
 typedef unsigned int ALuint;
 typedef int ALint;
+typedef int ALenum;
 
 #endif /* _OrxonoxPrereqs_H__ */

Modified: code/branches/presentation2/src/orxonox/items/MultiStateEngine.h
===================================================================
--- code/branches/presentation2/src/orxonox/items/MultiStateEngine.h	2009-12-21 12:49:34 UTC (rev 6390)
+++ code/branches/presentation2/src/orxonox/items/MultiStateEngine.h	2009-12-21 13:03:59 UTC (rev 6391)
@@ -37,9 +37,6 @@
 
 namespace orxonox
 {
-    // forward declaration
-    class EffectContainer;
-
     class _OrxonoxExport MultiStateEngine : public Engine
     {
         public:

Modified: code/branches/presentation2/src/orxonox/sound/BaseSound.h
===================================================================
--- code/branches/presentation2/src/orxonox/sound/BaseSound.h	2009-12-21 12:49:34 UTC (rev 6390)
+++ code/branches/presentation2/src/orxonox/sound/BaseSound.h	2009-12-21 13:03:59 UTC (rev 6391)
@@ -38,9 +38,6 @@
 
 namespace orxonox
 {
-    // forward declaration
-    class SoundBuffer;
-
     /**
      * The BaseSound class is the base class for all sound file loader classes.
      * It server as main interface to the OpenAL library.

Modified: code/branches/presentation2/src/orxonox/sound/SoundManager.h
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundManager.h	2009-12-21 12:49:34 UTC (rev 6390)
+++ code/branches/presentation2/src/orxonox/sound/SoundManager.h	2009-12-21 13:03:59 UTC (rev 6391)
@@ -41,15 +41,9 @@
 #include "core/OrxonoxClass.h"
 #include "core/SmartPtr.h"
 
-// forward declaration
-typedef int ALenum;
-
 // tolua_begin
 namespace orxonox
 {
-    // forward declaration
-    class SoundBuffer;
-
     //! Enum for the sound type.
     namespace SoundType
     {