From cb8fca46c5495d8f27c96ab4aa5b23c16910df0e Mon Sep 17 00:00:00 2001
From: Bendegúz Nagy
Date: Sat, 3 Sep 2016 10:47:16 +0200
Subject: DM: Fix include headers

Add DM_ prefix
Add missing include guards
---
 engines/dm/console.h    | 4 ++--
 engines/dm/dialog.h     | 5 +++++
 engines/dm/dm.h         | 4 ++--
 engines/dm/dungeonman.h | 4 ++--
 engines/dm/gfx.h        | 4 ++--
 engines/dm/inventory.h  | 5 +++++
 engines/dm/lzw.h        | 5 +++++
 engines/dm/objectman.h  | 5 +++++
 engines/dm/sounds.h     | 5 +++++
 9 files changed, 33 insertions(+), 8 deletions(-)

(limited to 'engines/dm')

diff --git a/engines/dm/console.h b/engines/dm/console.h
index 546711e303..eee72aaf18 100644
--- a/engines/dm/console.h
+++ b/engines/dm/console.h
@@ -25,11 +25,11 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
-#include "gui/debugger.h"
-
 #ifndef DM_CONSOLE_H
 #define DM_CONSOLE_H
 
+#include "gui/debugger.h"
+
 namespace DM {
 
 class DMEngine;
diff --git a/engines/dm/dialog.h b/engines/dm/dialog.h
index bf6618a264..c736f35b63 100644
--- a/engines/dm/dialog.h
+++ b/engines/dm/dialog.h
@@ -25,6 +25,9 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
+#ifndef DM_DIALOG_H
+#define DM_DIALOG_H
+
 #include "dm/dm.h"
 
 namespace DM {
@@ -54,3 +57,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/engines/dm/dm.h b/engines/dm/dm.h
index 979301d412..35a1f394c7 100644
--- a/engines/dm/dm.h
+++ b/engines/dm/dm.h
@@ -25,8 +25,8 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
-#ifndef DM_H
-#define DM_H
+#ifndef DM_DM_H
+#define DM_DM_H
 
 #include "engines/engine.h"
 #include "engines/savestate.h"
diff --git a/engines/dm/dungeonman.h b/engines/dm/dungeonman.h
index 450cd7faf8..100ce75f68 100644
--- a/engines/dm/dungeonman.h
+++ b/engines/dm/dungeonman.h
@@ -25,8 +25,8 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
-#ifndef DUNGEONMAN_H
-#define DUNGEONMAN_H
+#ifndef DM_DUNGEONMAN_H
+#define DM_DUNGEONMAN_H
 
 #include "dm/dm.h"
 #include "dm/gfx.h"
diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h
index f3e6a5d5da..319ac90b57 100644
--- a/engines/dm/gfx.h
+++ b/engines/dm/gfx.h
@@ -25,8 +25,8 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
-#ifndef GFX_H
-#define GFX_H
+#ifndef DM_GFX_H
+#define DM_GFX_H
 
 #include "common/scummsys.h"
 #include "common/rect.h"
diff --git a/engines/dm/inventory.h b/engines/dm/inventory.h
index e5bc490c44..c4685575c2 100644
--- a/engines/dm/inventory.h
+++ b/engines/dm/inventory.h
@@ -25,6 +25,9 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
+#ifndef DM_INVENTORY_H
+#define DM_INVENTORY_H
+
 #include "dm/dm.h"
 #include "dm/gfx.h"
 #include "dm/champion.h"
@@ -92,3 +95,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/engines/dm/lzw.h b/engines/dm/lzw.h
index b476c11cd8..3603423718 100644
--- a/engines/dm/lzw.h
+++ b/engines/dm/lzw.h
@@ -25,6 +25,9 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
+#ifndef DM_LZW_H
+#define DM_LZW_H
+
 #include "common/file.h"
 
 #include "dm/dm.h"
@@ -62,3 +65,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/engines/dm/objectman.h b/engines/dm/objectman.h
index 6c128eaa82..9d42d6b93f 100644
--- a/engines/dm/objectman.h
+++ b/engines/dm/objectman.h
@@ -25,6 +25,9 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
+#ifndef DM_OBJECTMAN_H
+#define DM_OBJECTMAN_H
+
 #include "dm/dm.h"
 #include "dm/champion.h"
 
@@ -69,3 +72,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/engines/dm/sounds.h b/engines/dm/sounds.h
index 1d0996372c..f50d481307 100644
--- a/engines/dm/sounds.h
+++ b/engines/dm/sounds.h
@@ -25,6 +25,9 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
+#ifndef DM_SOUND_H
+#define DM_SOUND_H
+
 #include "dm/dm.h"
 
 namespace DM {
@@ -94,3 +97,5 @@ public:
 };
 
 }
+
+#endif
-- 
cgit v1.2.3