Refactor|GameMap: Moved GameMap to namespace de

Note that the global theMap variable was also moved.

doomsday/api/api_thinker.h

@@ -58,7 +58,15 @@ DENG_API_TYPEDEF(Thinker)
     void (*Run)(void);
     void (*Add)(thinker_t* th);
     void (*Remove)(thinker_t* th);
-    void (*SetStasis)(thinker_t* th, boolean on);
+
+    /**
+     * Change the 'in stasis' state of a thinker (stop it from thinking).
+     *
+     * @param th  The thinker to change.
+     * @param on  @c true, put into stasis.
+     */
+    void (*SetStasis)(thinker_t *th, boolean on);
+
     int (*Iterate)(thinkfunc_t func, int (*callback) (thinker_t*, void*), void* context);
 }
 DENG_API_T(Thinker);

doomsday/client/include/audio/s_environ.h

@@ -24,7 +24,10 @@
 
 #include "api_uri.h"
 
+namespace de {
 class GameMap;
+}
+
 class Sector;
 
 typedef enum audioenvironmentclass_e {
@@ -59,7 +62,7 @@ void S_MarkSectorReverbDirty(Sector *sec);
  * two dimensions at least), they do not move and are not created/destroyed
  * once the map has been loaded; this step can be pre-processed.
  */
-void S_DetermineBspLeafsAffectingSectorReverb(GameMap *map);
+void S_DetermineBspLeafsAffectingSectorReverb(de::GameMap *map);
 
 /**
  * Recalculates reverb properties for a sector. One must first mark the sector

doomsday/client/include/edit_map.h

@@ -22,13 +22,15 @@
 #include <QList>
 #include "Vertex"
 
+namespace de {
 class GameMap;
+}
 
 DENG_EXTERN_C int bspFactor;
 
 void MPE_Register();
 
-GameMap *MPE_GetLastBuiltMap();
+de::GameMap *MPE_GetLastBuiltMap();
 
 bool MPE_GetLastBuiltMapResult();
 

doomsday/client/include/map/bsp/partitioner.h

@@ -28,13 +28,15 @@
 
 #include "map/bsp/bsptreenode.h" /// @todo remove me
 
-class GameMap;
 class BspLeaf;
 class Segment;
 class Line;
 class Sector;
 
 namespace de {
+
+class GameMap;
+
 namespace bsp {
 
 /// Minimum length of a half-edge post partitioning. Used in cost evaluation.

doomsday/client/include/map/gamemap.h

@@ -1,4 +1,4 @@
-/** @file gamemap.h World Map.
+/** @file map/gamemap.h World Map.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
@@ -72,6 +72,8 @@ typedef enum {
 struct clplane_s;
 struct clpolyobj_s;
 
+namespace de {
+
 /**
  * World map.
  *
@@ -98,7 +100,7 @@ class GameMap
     typedef QSet<Surface *> SurfaceSet;
 
 public:
-    de::Uri _uri;
+    Uri _uri;
     char _oldUniqueId[256];
 
     struct thinkers_s {
@@ -146,7 +148,7 @@ class GameMap
      * This ID is the name of the lump tag that marks the beginning of map
      * data, e.g. "MAP03" or "E2M8".
      */
-    de::Uri uri() const;
+    Uri uri() const;
 
     /// @return  The old 'unique' identifier of the map.
     char const *oldUniqueId() const;
@@ -235,7 +237,7 @@ class GameMap
     /**
      * Returns the root element for the map's BSP tree.
      */
-    de::MapElement *bspRoot() const;
+    MapElement *bspRoot() const;
 
     /**
      * Provides access to the list of line segments for efficient traversal.
@@ -278,7 +280,7 @@ class GameMap
      *
      * @return  BspLeaf instance for that BSP node's leaf.
      */
-    BspLeaf *bspLeafAtPoint(de::Vector2d const &point) const;
+    BspLeaf *bspLeafAtPoint(Vector2d const &point) const;
 
     /**
      * @copydoc bspLeafAtPoint()
@@ -287,7 +289,7 @@ class GameMap
      * with vanilla DOOM. Note that this means there is a maximum size for the
      * point: it cannot exceed the fixed-point 16.16 range (about 65k units).
      */
-    BspLeaf *bspLeafAtPoint_FixedPrecision(de::Vector2d const &point) const;
+    BspLeaf *bspLeafAtPoint_FixedPrecision(Vector2d const &point) const;
 
     int mobjsBoxIterator(AABoxd const &box,
         int (*callback) (struct mobj_s *, void *), void *parameters = 0) const;
@@ -625,7 +627,7 @@ class GameMap
      *
      * @see hasLightGrid()
      */
-    de::LightGrid &lightGrid();
+    LightGrid &lightGrid();
 
     /**
      * Initialize the ambient lighting grid (smoothed sector lighting).
@@ -727,4 +729,6 @@ void GameMap_SetMobjID(GameMap *map, thid_t id, boolean inUse);
 // The current map.
 DENG_EXTERN_C GameMap *theMap;
 
+} // namespace de
+
 #endif // DENG_WORLD_MAP_H

doomsday/client/include/map/sector.h

@@ -38,9 +38,12 @@
 #endif
 
 class BspLeaf;
-class GameMap;
 class Surface;
 
+namespace de {
+class GameMap;
+}
+
 /**
  * @defgroup sectorFrameFlags Sector frame flags
  * @ingroup map
@@ -212,7 +215,7 @@ class Sector : public de::MapElement,
      *
      * @param map  Map to collate sides from. @todo Refactor away.
      */
-    void buildSides(GameMap const &map);
+    void buildSides(de::GameMap const &map);
 
     /**
      * Provides access to the list of BSP leafs which reference the sector, for
@@ -230,7 +233,7 @@ class Sector : public de::MapElement,
      *
      * @param map  Map to collate BSP leafs from. @todo Refactor away.
      */
-    void buildBspLeafs(GameMap const &map);
+    void buildBspLeafs(de::GameMap const &map);
 
     /**
      * Provides access to the list of BSP leafs which contribute to the environmental

doomsday/client/include/render/lightgrid.h

@@ -24,11 +24,12 @@
 
 #include <de/Vector>
 
-class GameMap;
 class Sector;
 
 namespace de {
 
+class GameMap;
+
 /**
  * Simple global illumination method utilizing a 2D grid of light levels, achieving
  * smoothed ambient sector lighting.

doomsday/client/include/resource/maparchive.h

@@ -23,10 +23,10 @@
 #include "dd_share.h"
 #include "uri.hh"
 
-class GameMap;
-
 namespace de {
 
+class GameMap;
+
 /**
  * @ingroup resource
  */

doomsday/client/src/audio/s_environ.cpp

@@ -35,6 +35,8 @@
 
 #include "audio/s_environ.h"
 
+using namespace de;
+
 // Used for vertex sector owners, side line owners and reverb BSP leafs.
 typedef struct ownernode_s {
     void *data;
@@ -72,7 +74,7 @@ const char* S_AudioEnvironmentName(AudioEnvironmentClass env)
     return "";
 }
 
-AudioEnvironmentClass S_AudioEnvironmentForMaterial(const Uri* uri)
+AudioEnvironmentClass S_AudioEnvironmentForMaterial(uri_s const *uri)
 {
     if(uri)
     {
@@ -81,7 +83,7 @@ AudioEnvironmentClass S_AudioEnvironmentForMaterial(const Uri* uri)
         {
             for(int k = 0; k < env->count.num; ++k)
             {
-                Uri* ref = env->materials[k];
+                uri_s *ref = env->materials[k];
                 if(!ref || !Uri_Equality(ref, uri)) continue;
 
                 // See if we recognise the material name.

doomsday/client/src/client/cl_main.cpp

@@ -32,6 +32,8 @@
 #include "map/gamemap.h"
 #include "render/r_main.h"
 
+using namespace de;
+
 extern int gotFrame;
 
 ident_t clientID;

doomsday/client/src/client/cl_mobj.cpp

@@ -31,6 +31,8 @@
 #include "de_play.h"
 #include "de_audio.h"
 
+using namespace de;
+
 /// Convert 8.8/10.6 fixed point to 16.16.
 #define UNFIXED8_8(x)   (((x) << 16) / 256)
 #define UNFIXED10_6(x)  (((x) << 16) / 64)

doomsday/client/src/client/cl_sound.cpp

@@ -1,4 +1,4 @@
-/** @file
+/** @file cl_sound.cpp Clientside Sounds.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
@@ -17,12 +17,6 @@
  * http://www.gnu.org/licenses</small>
  */
 
-/**
- * cl_sound.c: Clientside Sounds
- */
-
-// HEADER FILES ------------------------------------------------------------
-
 #include "de_base.h"
 #include "de_console.h"
 #include "de_network.h"
@@ -31,23 +25,7 @@
 
 #include "client/cl_sound.h"
 
-// MACROS ------------------------------------------------------------------
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-// CODE --------------------------------------------------------------------
+using namespace de;
 
 /**
  * Read a sound delta from the message buffer and play it.

doomsday/client/src/client/cl_world.cpp

@@ -35,6 +35,8 @@
 #include "client/cl_world.h"
 #include "r_util.h"
 
+using namespace de;
+
 #define MAX_TRANSLATIONS    16384
 
 #define MVF_CEILING         0x1 // Move ceiling.

doomsday/client/src/edit_bias.cpp

@@ -36,6 +36,8 @@
 
 #include "map/gamemap.h"
 
+using namespace de;
+
 D_CMD(BLEditor);
 
 void SBE_MenuSave(ui_object_t *ob);

doomsday/client/src/map/gamemap.cpp

@@ -1,4 +1,4 @@
-/** @file gamemap.cpp World Map.
+/** @file map/gamemap.cpp World Map.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
@@ -39,7 +39,7 @@
 /// Size of Blockmap blocks in map units. Must be an integer power of two.
 #define MAPBLOCKUNITS               (128)
 
-using namespace de;
+namespace de {
 
 DENG2_PIMPL(GameMap)
 {
@@ -684,7 +684,7 @@ void GameMap::initLightGrid()
 
 #endif // __CLIENT__
 
-de::Uri GameMap::uri() const
+Uri GameMap::uri() const
 {
     return _uri;
 }
@@ -2004,3 +2004,5 @@ void GameMap::updateMissingMaterialsForLinesOfSector(Sector const &sec)
 }
 
 #endif // __CLIENT__
+
+} // namespace de

doomsday/client/src/map/mesh.cpp

@@ -21,6 +21,7 @@
 
 #include "HEdge"
 #include "Face"
+#include "Vertex"
 
 #include "map/mesh.h"
 

doomsday/client/src/map/p_data.cpp

@@ -55,8 +55,12 @@ static EntityDefIdMap entityDefIdMap;
 
 extern "C" boolean mapSetup; // We are currently setting up a map.
 
+namespace de {
+
 GameMap *theMap; // Available globally inside the engine.
 
+}
+
 #undef P_MapExists
 DENG_EXTERN_C boolean P_MapExists(char const *uriCString)
 {