Minor cleanup.

codereader · Dec 19, 2017 · 1579119 · 1579119
1 parent 2d4dfdb
commit 1579119
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/plugins/eclassmgr/EClassManager.h b/plugins/eclassmgr/EClassManager.h
@@ -4,7 +4,6 @@
 #include "icommandsystem.h"
 #include "ifilesystem.h"
 #include "itextstream.h"
-#include "moduleobservers.h"
 #include "ThreadedDefLoader.h"
 
 #include "Doom3EntityClass.h"
@@ -27,8 +26,6 @@ namespace eclass
  * which in turn kicks off the parse process (including the resolution of
  * inheritance).
  *
- * It also accomodates ModuleObservers, presumably to be notified when the
- * dependency modules are realised. This one depends on the VFS.
  */
 class EClassManager :
     public IEntityClassManager,

diff --git a/plugins/shaders/Doom3ShaderSystem.h b/plugins/shaders/Doom3ShaderSystem.h
@@ -61,11 +61,10 @@ class Doom3ShaderSystem :
 	// Gets called on shutdown
     void onFileSystemShutdown() override;
 
-	// greebo: This parses the material files and calls realise() on any
-	// attached moduleobservers
+	// greebo: This parses the material files and emits the defs loaded signal
     void realise() override;
 
-	// greebo: Unrealises the attached ModuleObservers and frees the shaders
+	// greebo: Emits the defs unloaded signal and frees the shaders
     void unrealise() override;
 
 	// Flushes the shaders from memory and reloads the material files

diff --git a/plugins/skins/Doom3ModelSkin.h b/plugins/skins/Doom3ModelSkin.h
@@ -1,8 +1,6 @@
-#ifndef DOOM3MODELSKIN_H_
-#define DOOM3MODELSKIN_H_
+#pragma once
 
 #include "modelskin.h"
-#include "moduleobservers.h"
 
 #include <string>
 #include <map>
@@ -64,5 +62,3 @@ typedef std::shared_ptr<Doom3ModelSkin> Doom3ModelSkinPtr;
 
 
 }
-
-#endif /*DOOM3MODELSKIN_H_*/
diff --git a/plugins/vfspk3/Doom3FileSystem.cpp b/plugins/vfspk3/Doom3FileSystem.cpp
@@ -28,7 +28,6 @@
 #include "string/join.h"
 #include "os/path.h"
 #include "os/dir.h"
-#include "moduleobservers.h"
 
 #include "string/split.h"