From 59b1bbfa158b308d2674ca07efa77dbc7dbefaea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Einar=20Johan=20Tr=C3=B8an=20S=C3=B8ma=CC=8Aen?=
 <einarjohants@gmail.com>
Date: Fri, 31 Aug 2012 20:52:23 +0200
Subject: [PATCH] WINTERMUTE: Even more fixes to header-guards.

---
 engines/wintermute/base/base_active_rect.h         | 4 ++--
 engines/wintermute/base/base_dynamic_buffer.h      | 4 ++--
 engines/wintermute/base/base_file_manager.h        | 4 ++--
 engines/wintermute/base/base_named_object.h        | 4 ++--
 engines/wintermute/base/base_persistence_manager.h | 4 ++--
 engines/wintermute/base/base_save_thumb_helper.h   | 4 ++--
 engines/wintermute/base/base_string_table.h        | 4 ++--
 engines/wintermute/base/base_surface_storage.h     | 4 ++--
 engines/wintermute/base/base_transition_manager.h  | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/engines/wintermute/base/base_active_rect.h b/engines/wintermute/base/base_active_rect.h
index 651b8530ac1..3c2cccfeed2 100644
--- a/engines/wintermute/base/base_active_rect.h
+++ b/engines/wintermute/base/base_active_rect.h
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#ifndef WINTERMUTE_BASE_ACTIVERECT_H
-#define WINTERMUTE_BASE_ACTIVERECT_H
+#ifndef WINTERMUTE_BASE_ACTIVE_RECT_H
+#define WINTERMUTE_BASE_ACTIVE_RECT_H
 
 #include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/base/base.h"
diff --git a/engines/wintermute/base/base_dynamic_buffer.h b/engines/wintermute/base/base_dynamic_buffer.h
index 23aebfdf9f6..df35ad817df 100644
--- a/engines/wintermute/base/base_dynamic_buffer.h
+++ b/engines/wintermute/base/base_dynamic_buffer.h
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#ifndef WINTERMUTE_BASE_DYNBUFFER_H
-#define WINTERMUTE_BASE_DYNBUFFER_H
+#ifndef WINTERMUTE_BASE_DYNAMIC_BUFFER_H
+#define WINTERMUTE_BASE_DYNAMIC_BUFFER_H
 
 
 #include "engines/wintermute/base/base.h"
diff --git a/engines/wintermute/base/base_file_manager.h b/engines/wintermute/base/base_file_manager.h
index 3716dd0581d..1b93f7dee47 100644
--- a/engines/wintermute/base/base_file_manager.h
+++ b/engines/wintermute/base/base_file_manager.h
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#ifndef WINTERMUTE_BASE_FILEMANAGER_H
-#define WINTERMUTE_BASE_FILEMANAGER_H
+#ifndef WINTERMUTE_BASE_FILE_MANAGER_H
+#define WINTERMUTE_BASE_FILE_MANAGER_H
 
 #include "common/archive.h"
 #include "common/str.h"
diff --git a/engines/wintermute/base/base_named_object.h b/engines/wintermute/base/base_named_object.h
index ca714715217..9818708605a 100644
--- a/engines/wintermute/base/base_named_object.h
+++ b/engines/wintermute/base/base_named_object.h
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#ifndef WINTERMUTE_BASE_NAMEDOBJECT_H
-#define WINTERMUTE_BASE_NAMEDOBJECT_H
+#ifndef WINTERMUTE_BASE_NAMED_OBJECT_H
+#define WINTERMUTE_BASE_NAMED_OBJECT_H
 
 
 #include "engines/wintermute/base/base.h"
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index 4de1f84c64a..fb5a73d0d3d 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#ifndef WINTERMUTE_BASE_PERSISTMGR_H
-#define WINTERMUTE_BASE_PERSISTMGR_H
+#ifndef WINTERMUTE_BASE_PERSISTENCE_MANAGER_H
+#define WINTERMUTE_BASE_PERSISTENCE_MANAGER_H
 
 
 #include "engines/wintermute/dctypes.h"
diff --git a/engines/wintermute/base/base_save_thumb_helper.h b/engines/wintermute/base/base_save_thumb_helper.h
index 7c06384aa1c..0af3103f717 100644
--- a/engines/wintermute/base/base_save_thumb_helper.h
+++ b/engines/wintermute/base/base_save_thumb_helper.h
@@ -25,8 +25,8 @@
  * http://dead-code.org/redir.php?target=wmelite
  * Copyright (c) 2011 Jan Nedoma
  */
-#ifndef WINTERMUTE_BASE_SAVETHUMBHELPER_H
-#define WINTERMUTE_BASE_SAVETHUMBHELPER_H
+#ifndef WINTERMUTE_BASE_SAVE_THUMB_HELPER_H
+#define WINTERMUTE_BASE_SAVE_THUMB_HELPER_H
 
 
 #include "engines/wintermute/base/base.h"
diff --git a/engines/wintermute/base/base_string_table.h b/engines/wintermute/base/base_string_table.h
index 46295426fd1..09d8aecce43 100644
--- a/engines/wintermute/base/base_string_table.h
+++ b/engines/wintermute/base/base_string_table.h
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#ifndef WINTERMUTE_BASE_STRINGTABLE_H
-#define WINTERMUTE_BASE_STRINGTABLE_H
+#ifndef WINTERMUTE_BASE_STRING_TABLE_H
+#define WINTERMUTE_BASE_STRING_TABLE_H
 
 
 #include "common/hashmap.h"
diff --git a/engines/wintermute/base/base_surface_storage.h b/engines/wintermute/base/base_surface_storage.h
index 741177ae766..28c36bebca0 100644
--- a/engines/wintermute/base/base_surface_storage.h
+++ b/engines/wintermute/base/base_surface_storage.h
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#ifndef WINTERMUTE_BASE_SURFACESTORAGE_H
-#define WINTERMUTE_BASE_SURFACESTORAGE_H
+#ifndef WINTERMUTE_BASE_SURFACE_STORAGE_H
+#define WINTERMUTE_BASE_SURFACE_STORAGE_H
 
 #include "engines/wintermute/base/base.h"
 #include "common/array.h"
diff --git a/engines/wintermute/base/base_transition_manager.h b/engines/wintermute/base/base_transition_manager.h
index daf2299c2f0..1a989fbcfdd 100644
--- a/engines/wintermute/base/base_transition_manager.h
+++ b/engines/wintermute/base/base_transition_manager.h
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#ifndef WINTERMUTE_BASE_TRANSITIONMGR_H
-#define WINTERMUTE_BASE_TRANSITIONMGR_H
+#ifndef WINTERMUTE_BASE_TRANSITION_MANAGER_H
+#define WINTERMUTE_BASE_TRANSITION_MANAGER_H
 
 #include "engines/wintermute/base/base.h"