Cleanup: Removed include/de_misc.h

skyjake · Jul 22, 2015 · e30a96a · e30a96a
1 parent b2ee694
commit e30a96a
Show file tree

Hide file tree

Showing 29 changed files with 71 additions and 215 deletions.
diff --git a/doomsday/apps/client/include/de_misc.h b/doomsday/apps/client/include/de_misc.h
diff --git a/doomsday/apps/client/src/audio/audiodriver.cpp b/doomsday/apps/client/src/audio/audiodriver.cpp
@@ -1,8 +1,7 @@
 /** @file audiodriver.cpp  Audio driver loading and interface management.
- * @ingroup audio
  *
  * @authors Copyright © 2012-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2013-2015 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -20,13 +19,13 @@
  */
 
 #include "de_base.h"
-#include "de_console.h"
-#include "de_misc.h"
-#include "de_audio.h"
-#include "audio/sys_audio.h"
+#include "audio/audiodriver.h"
 
 #include <de/Library>
 #include <de/LibraryFile>
+#include "de_audio.h"
+#include "de_console.h"
+#include "audio/sys_audio.h"
 
 typedef struct driver_s {
     Library* library;

diff --git a/doomsday/apps/client/src/audio/s_cache.cpp b/doomsday/apps/client/src/audio/s_cache.cpp
@@ -1,7 +1,7 @@
-/** @file s_cache.cpp Sound Sample Cache
+/** @file s_cache.cpp  Sound Sample Cache.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2006-2015 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -17,14 +17,14 @@
  * http://www.gnu.org/licenses</small>
  */
 
-#include <cstring>
-
 #include "de_base.h"
+#include "audio/s_cache.h"
+
+#include <cstring>
+#include "de_audio.h"
 #include "de_console.h"
-#include "de_system.h"
 #include "de_filesys.h"
-#include "de_audio.h"
-#include "de_misc.h"
+#include "de_system.h"
 
 using namespace de;
 

diff --git a/doomsday/apps/client/src/audio/s_sfx.cpp b/doomsday/apps/client/src/audio/s_sfx.cpp
@@ -21,11 +21,11 @@
 #include "de_base.h"
 #include "audio/s_sfx.h"
 
+#include <de/vector1.h>
 #include <de/Log>
 #include "de_audio.h"
 #include "de_console.h"
 #include "de_graphics.h"
-#include "de_misc.h"
 #include "de_play.h"
 #include "de_system.h"
 

diff --git a/doomsday/apps/client/src/audio/sys_audiod_dummy.cpp b/doomsday/apps/client/src/audio/sys_audiod_dummy.cpp
@@ -1,4 +1,7 @@
-/** @file
+/** @file sys_audiod_dummy.c  Dummy Audio Driver.
+ *
+ * Used in dedicated server mode, when it's necessary to simulate sound playing
+ * but not actually play anything.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2007-2013 Daniel Swanson <danij@dengine.net>
@@ -17,31 +20,13 @@
  * http://www.gnu.org/licenses</small>
  */
 
-/**
- * sys_audiod_dummy.c: Dummy Audio Driver.
- *
- * Used in dedicated server mode, when it's necessary to simulate
- * sound playing but not actually play anything.
- */
-
-// HEADER FILES ------------------------------------------------------------
-
 #include "de_base.h"
 #include "de_console.h"
 #include "de_system.h"
-#include "de_misc.h"
 
 #include "api_audiod.h"
 #include "api_audiod_sfx.h"
 
-// MACROS ------------------------------------------------------------------
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
 int         DS_DummyInit(void);
 void        DS_DummyShutdown(void);
 void        DS_DummyEvent(int type);
@@ -60,12 +45,6 @@ void        DS_Dummy_SFX_Listener(int prop, float value);
 void        DS_Dummy_SFX_Listenerv(int prop, float* values);
 int         DS_Dummy_SFX_Getv(int prop, void* values);
 
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
 DENG_EXTERN_C audiodriver_t        audiod_dummy;
 DENG_EXTERN_C audiointerface_sfx_t audiod_dummy_sfx;
 
@@ -92,12 +71,8 @@ audiointerface_sfx_t audiod_dummy_sfx = { {
     DS_Dummy_SFX_Getv
 } };
 
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
 static dd_bool inited;
 
-// CODE --------------------------------------------------------------------
-
 /**
  * Initialization of the sound driver.
  * @return @c true if successful.

diff --git a/doomsday/apps/client/src/audio/sys_audiod_sdlmixer.cpp b/doomsday/apps/client/src/audio/sys_audiod_sdlmixer.cpp
@@ -1,7 +1,7 @@
-/**\file sys_audiod_sdlmixer.cpp
+/** @file sys_audiod_sdlmixer.cpp  SDL_mixer, for SFX, Ext and Mus interfaces.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2007-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2007-2015 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -17,44 +17,27 @@
  * http://www.gnu.org/licenses</small>
  */
 
-/**
- * SDL_mixer, for SFX, Ext and Mus interfaces.
- */
-
 #ifndef DENG_DISABLE_SDLMIXER
 
-// HEADER FILES ------------------------------------------------------------
-
-#include <stdlib.h>
-#include <string.h>
+#include "de_base.h"
+#include "audio/sys_audiod_sdlmixer.h"
 
+#include <cstdlib>
+#include <cstring>
 #include <SDL.h>
 #include <SDL_mixer.h>
 #undef main
 
-#include "de_base.h"
+#include <de/Log>
 #include "de_console.h"
 #include "de_system.h"
-#include "de_misc.h"
 
 #include "api_audiod.h"
 #include "api_audiod_sfx.h"
 #include "api_audiod_mus.h"
 
-#include "audio/sys_audiod_sdlmixer.h"
-
-#include <de/Log>
-
-// MACROS ------------------------------------------------------------------
-
 #define DEFAULT_MIDI_COMMAND    "" //"timidity"
 
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
 int         DS_SDLMixerInit(void);
 void        DS_SDLMixerShutdown(void);
 void        DS_SDLMixerEvent(int type);
@@ -81,12 +64,6 @@ void        DS_SDLMixer_Music_Pause(int pause);
 void        DS_SDLMixer_Music_Stop(void);
 int         DS_SDLMixer_Music_PlayFile(const char* fileName, int looped);
 
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
 dd_bool sdlInitOk = false;
 
 audiodriver_t audiod_sdlmixer = {

diff --git a/doomsday/apps/client/src/dd_loop.cpp b/doomsday/apps/client/src/dd_loop.cpp
@@ -30,7 +30,6 @@
 #include "de_graphics.h"
 #include "de_audio.h"
 #include "de_ui.h"
-#include "de_misc.h"
 
 #ifdef __CLIENT__
 #  include "clientapp.h"

diff --git a/doomsday/apps/client/src/gl/dgl_common.cpp b/doomsday/apps/client/src/gl/dgl_common.cpp
@@ -30,7 +30,6 @@
 
 #include "de_console.h"
 #include "de_graphics.h"
-#include "de_misc.h"
 #include "de_filesys.h"
 
 #include "api_gl.h"

diff --git a/doomsday/apps/client/src/gl/dgl_draw.cpp b/doomsday/apps/client/src/gl/dgl_draw.cpp
@@ -1,7 +1,7 @@
 /** @file dgl_draw.cpp  Drawing Operations and Vertex Arrays.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2007-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2007-2015 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -20,15 +20,15 @@
 #define DENG_NO_API_MACROS_GL
 
 #include "de_base.h"
-#include "de_console.h"
-#include "de_graphics.h"
-#include "de_misc.h"
-#include "sys_system.h"
-#include "gl/sys_opengl.h"
+#include "gl/gl_main.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <de/concurrency.h>
+#include "de_console.h"
+#include "de_graphics.h"
+#include "sys_system.h"
+#include "gl/sys_opengl.h"
 
 using namespace de;
 

diff --git a/doomsday/apps/client/src/gl/gl_draw.cpp b/doomsday/apps/client/src/gl/gl_draw.cpp
@@ -28,7 +28,6 @@
 #include <de/concurrency.h>
 #include "de_console.h"
 #include "de_graphics.h"
-#include "de_misc.h"
 #include "de_play.h"
 
 #include "api_render.h"

diff --git a/doomsday/apps/client/src/gl/sys_opengl.cpp b/doomsday/apps/client/src/gl/sys_opengl.cpp
@@ -1,7 +1,7 @@
-/**\file sys_opengl.cpp
+/** @file sys_opengl.cpp
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2007-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2007-2015 Daniel Swanson <danij@dengine.net>
  * @authors Copyright © 2006 Jamie Jones <yagisan@dengine.net>
  *
  * @par License
@@ -18,21 +18,18 @@
  * http://www.gnu.org/licenses</small>
  */
 
-#include "de_platform.h"
 #include "de_base.h"
-#include "de_console.h"
-#include "de_graphics.h"
-#include "de_misc.h"
-
-#include "sys_system.h"
 #include "gl/sys_opengl.h"
 
+#include <QSet>
+#include <QStringList>
 #include <de/libcore.h>
 #include <de/concurrency.h>
 #include <de/GLInfo>
 #include <de/GLState>
-#include <QSet>
-#include <QStringList>
+#include "de_console.h"
+#include "de_graphics.h"
+#include "sys_system.h"
 
 #ifdef WIN32
 #   define GETPROC(Type, x)   x = de::function_cast<Type>(wglGetProcAddress(#x))

diff --git a/doomsday/apps/client/src/m_misc.cpp b/doomsday/apps/client/src/m_misc.cpp
@@ -1,7 +1,7 @@
 /** @file m_misc.cpp  Miscellanous utility routines.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2006-2015 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -20,7 +20,7 @@
 #define DENG_NO_API_MACROS_FILESYS
 
 #include "de_platform.h"
-#include "de_console.h"
+#include "m_misc.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -43,15 +43,16 @@
 #endif
 
 #include "de_base.h"
+#include "de_console.h"
 #include "de_system.h"
 #include "de_filesys.h"
 #include "de_graphics.h"
-#include "de_misc.h"
 #include "de_play.h"
 
 #include "lzss.h"
 
 #include <de/str.h>
+#include <de/vector1.h>
 #include <cstdlib>
 #include <cctype>
 #include <cmath>