From 07c27b775c8d3997bf40891c2772ae8859eb534d Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Fri, 31 Aug 2012 19:35:49 +0200 Subject: WINTERMUTE: Cleanup the header-guards. --- engines/wintermute/ad/ad_actor.h | 2 +- engines/wintermute/ad/ad_types.h | 2 +- engines/wintermute/base/base.h | 4 ++-- engines/wintermute/base/base_active_rect.h | 4 ++-- engines/wintermute/base/base_dynamic_buffer.h | 4 ++-- engines/wintermute/base/base_fader.h | 4 ++-- engines/wintermute/base/base_file_manager.h | 4 ++-- engines/wintermute/base/base_frame.h | 4 ++-- engines/wintermute/base/base_game.h | 4 ++-- engines/wintermute/base/base_keyboard_state.h | 4 ++-- engines/wintermute/base/base_named_object.h | 4 ++-- engines/wintermute/base/base_object.h | 4 ++-- engines/wintermute/base/base_parser.h | 4 ++-- engines/wintermute/base/base_persistence_manager.h | 4 ++-- engines/wintermute/base/base_point.h | 4 ++-- engines/wintermute/base/base_quick_msg.h | 4 ++-- engines/wintermute/base/base_region.h | 4 ++-- engines/wintermute/base/base_save_thumb_helper.h | 4 ++-- engines/wintermute/base/base_script_holder.h | 4 ++-- engines/wintermute/base/base_scriptable.h | 4 ++-- engines/wintermute/base/base_sprite.h | 4 ++-- engines/wintermute/base/base_string_table.h | 4 ++-- engines/wintermute/base/base_sub_frame.h | 4 ++-- engines/wintermute/base/base_surface_storage.h | 4 ++-- engines/wintermute/base/base_transition_manager.h | 4 ++-- engines/wintermute/base/base_viewport.h | 4 ++-- engines/wintermute/base/file/base_disk_file.h | 4 ++-- engines/wintermute/base/file/base_file.h | 4 ++-- engines/wintermute/base/file/base_file_entry.h | 4 ++-- engines/wintermute/base/file/base_package.h | 4 ++-- engines/wintermute/base/file/base_resources.h | 4 ++-- engines/wintermute/base/file/base_save_thumb_file.h | 4 ++-- engines/wintermute/base/file/dcpackage.h | 2 +- engines/wintermute/base/font/base_font.h | 4 ++-- engines/wintermute/base/font/base_font_bitmap.h | 4 ++-- engines/wintermute/base/font/base_font_storage.h | 4 ++-- engines/wintermute/base/font/base_font_truetype.h | 4 ++-- engines/wintermute/base/gfx/base_image.h | 4 ++-- engines/wintermute/base/gfx/base_renderer.h | 4 ++-- engines/wintermute/base/gfx/base_surface.h | 4 ++-- engines/wintermute/base/gfx/osystem/base_render_osystem.h | 6 +++--- engines/wintermute/base/gfx/osystem/base_surface_osystem.h | 6 +++--- engines/wintermute/base/sound/base_sound.h | 4 ++-- engines/wintermute/base/sound/base_sound_buffer.h | 4 ++-- engines/wintermute/base/sound/base_sound_manager.h | 4 ++-- engines/wintermute/coll_templ.h | 2 +- engines/wintermute/dcgf.h | 2 +- engines/wintermute/math/math_util.h | 2 +- engines/wintermute/math/matrix4.h | 2 +- engines/wintermute/math/rect32.h | 2 +- engines/wintermute/math/vector2.h | 2 +- engines/wintermute/persistent.h | 2 +- engines/wintermute/utils/path_util.h | 2 +- engines/wintermute/utils/string_util.h | 2 +- engines/wintermute/wintypes.h | 2 +- 55 files changed, 99 insertions(+), 99 deletions(-) diff --git a/engines/wintermute/ad/ad_actor.h b/engines/wintermute/ad/ad_actor.h index 4bc1bae37f..370a91cc22 100644 --- a/engines/wintermute/ad/ad_actor.h +++ b/engines/wintermute/ad/ad_actor.h @@ -105,4 +105,4 @@ private: } // end of namespace Wintermute -#endif // WINTERMUTE_ADACTOR_H +#endif diff --git a/engines/wintermute/ad/ad_types.h b/engines/wintermute/ad/ad_types.h index b8cae58c6d..8db20bfc02 100644 --- a/engines/wintermute/ad/ad_types.h +++ b/engines/wintermute/ad/ad_types.h @@ -104,4 +104,4 @@ typedef enum { } // end of namespace Wintermute -#endif // WINTERMUTE_ADTYPES_H +#endif diff --git a/engines/wintermute/base/base.h b/engines/wintermute/base/base.h index b1b184b2f4..b07065ec0d 100644 --- a/engines/wintermute/base/base.h +++ b/engines/wintermute/base/base.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BBASE_H -#define WINTERMUTE_BBASE_H +#ifndef WINTERMUTE_BASE_BASE_H +#define WINTERMUTE_BASE_BASE_H #include "engines/wintermute/wintypes.h" #include "engines/wintermute/dctypes.h" diff --git a/engines/wintermute/base/base_active_rect.h b/engines/wintermute/base/base_active_rect.h index b446dadcce..848b77e56e 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_BACTIVERECT_H -#define WINTERMUTE_BACTIVERECT_H +#ifndef WINTERMUTE_BASE_ACTIVERECT_H +#define WINTERMUTE_BASE_BACTIVERECT_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 926728baa6..23aebfdf9f 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_BDYNBUFFER_H -#define WINTERMUTE_BDYNBUFFER_H +#ifndef WINTERMUTE_BASE_DYNBUFFER_H +#define WINTERMUTE_BASE_DYNBUFFER_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/base_fader.h b/engines/wintermute/base/base_fader.h index 34d0e7d3da..30072babfa 100644 --- a/engines/wintermute/base/base_fader.h +++ b/engines/wintermute/base/base_fader.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BFADER_H -#define WINTERMUTE_BFADER_H +#ifndef WINTERMUTE_BASE_FADER_H +#define WINTERMUTE_BASE_FADER_H #include "engines/wintermute/base/base_object.h" diff --git a/engines/wintermute/base/base_file_manager.h b/engines/wintermute/base/base_file_manager.h index 5e18a95786..3716dd0581 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_BFILEMANAGER_H -#define WINTERMUTE_BFILEMANAGER_H +#ifndef WINTERMUTE_BASE_FILEMANAGER_H +#define WINTERMUTE_BASE_FILEMANAGER_H #include "common/archive.h" #include "common/str.h" diff --git a/engines/wintermute/base/base_frame.h b/engines/wintermute/base/base_frame.h index b1eae6b659..c89fb49e61 100644 --- a/engines/wintermute/base/base_frame.h +++ b/engines/wintermute/base/base_frame.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BFRAME_H -#define WINTERMUTE_BFRAME_H +#ifndef WINTERMUTE_BASE_FRAME_H +#define WINTERMUTE_BASE_FRAME_H #include "engines/wintermute/base/base_scriptable.h" #include "engines/wintermute/coll_templ.h" diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h index 43efad1482..aecbe31722 100644 --- a/engines/wintermute/base/base_game.h +++ b/engines/wintermute/base/base_game.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BGAME_H -#define WINTERMUTE_BGAME_H +#ifndef WINTERMUTE_BASE_GAME_H +#define WINTERMUTE_BASE_GAME_H #include "engines/wintermute/base/gfx/base_renderer.h" #include "engines/wintermute/base/base_object.h" diff --git a/engines/wintermute/base/base_keyboard_state.h b/engines/wintermute/base/base_keyboard_state.h index 382dd9fbce..4b1826d483 100644 --- a/engines/wintermute/base/base_keyboard_state.h +++ b/engines/wintermute/base/base_keyboard_state.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BKEYBOARD_STATE_H -#define WINTERMUTE_BKEYBOARD_STATE_H +#ifndef WINTERMUTE_BASE_KEYBOARD_STATE_H +#define WINTERMUTE_BASE_KEYBOARD_STATE_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/base_named_object.h b/engines/wintermute/base/base_named_object.h index cd856bb008..ca71471521 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_BNAMEDOBJECT_H -#define WINTERMUTE_BNAMEDOBJECT_H +#ifndef WINTERMUTE_BASE_NAMEDOBJECT_H +#define WINTERMUTE_BASE_NAMEDOBJECT_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h index 34d9ca89ca..e1a21e91ba 100644 --- a/engines/wintermute/base/base_object.h +++ b/engines/wintermute/base/base_object.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BOBJECT_H -#define WINTERMUTE_BOBJECT_H +#ifndef WINTERMUTE_BASE_OBJECT_H +#define WINTERMUTE_BASE_OBJECT_H #include "engines/wintermute/base/base_script_holder.h" diff --git a/engines/wintermute/base/base_parser.h b/engines/wintermute/base/base_parser.h index 3d63668059..6b4f733d74 100644 --- a/engines/wintermute/base/base_parser.h +++ b/engines/wintermute/base/base_parser.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BPARSER_H -#define WINTERMUTE_BPARSER_H +#ifndef WINTERMUTE_BASE_PARSER_H +#define WINTERMUTE_BASE_PARSER_H #define TOKEN_DEF_START \ diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index fea8f231d1..4de1f84c64 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_BPERSISTMGR_H -#define WINTERMUTE_BPERSISTMGR_H +#ifndef WINTERMUTE_BASE_PERSISTMGR_H +#define WINTERMUTE_BASE_PERSISTMGR_H #include "engines/wintermute/dctypes.h" diff --git a/engines/wintermute/base/base_point.h b/engines/wintermute/base/base_point.h index 68a37c0110..43f8f960f1 100644 --- a/engines/wintermute/base/base_point.h +++ b/engines/wintermute/base/base_point.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BPOINT_H -#define WINTERMUTE_BPOINT_H +#ifndef WINTERMUTE_BASE_POINT_H +#define WINTERMUTE_BASE_POINT_H #include "engines/wintermute/persistent.h" #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/base_quick_msg.h b/engines/wintermute/base/base_quick_msg.h index bef81827b0..d00b302baf 100644 --- a/engines/wintermute/base/base_quick_msg.h +++ b/engines/wintermute/base/base_quick_msg.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BQUICKMSG_H -#define WINTERMUTE_BQUICKMSG_H +#ifndef WINTERMUTE_BASE_QUICKMSG_H +#define WINTERMUTE_BASE_QUICKMSG_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/base_region.h b/engines/wintermute/base/base_region.h index f456eb07fc..e7ae9bda13 100644 --- a/engines/wintermute/base/base_region.h +++ b/engines/wintermute/base/base_region.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BREGION_H -#define WINTERMUTE_BREGION_H +#ifndef WINTERMUTE_BASE_REGION_H +#define WINTERMUTE_BASE_REGION_H #include "engines/wintermute/base/base_point.h" #include "engines/wintermute/base/base_object.h" diff --git a/engines/wintermute/base/base_save_thumb_helper.h b/engines/wintermute/base/base_save_thumb_helper.h index 4131cf89d4..7c06384aa1 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_BSAVETHUMBHELPER_H -#define WINTERMUTE_BSAVETHUMBHELPER_H +#ifndef WINTERMUTE_BASE_SAVETHUMBHELPER_H +#define WINTERMUTE_BASE_SAVETHUMBHELPER_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/base_script_holder.h b/engines/wintermute/base/base_script_holder.h index 4f3d5f4ef9..cab0d4f693 100644 --- a/engines/wintermute/base/base_script_holder.h +++ b/engines/wintermute/base/base_script_holder.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BSCRIPTHOLDER_H -#define WINTERMUTE_BSCRIPTHOLDER_H +#ifndef WINTERMUTE_BASE_SCRIPTHOLDER_H +#define WINTERMUTE_BASE_SCRIPTHOLDER_H #include "engines/wintermute/coll_templ.h" #include "engines/wintermute/persistent.h" diff --git a/engines/wintermute/base/base_scriptable.h b/engines/wintermute/base/base_scriptable.h index 2501f34561..11cb0bcf9f 100644 --- a/engines/wintermute/base/base_scriptable.h +++ b/engines/wintermute/base/base_scriptable.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BSCRIPTABLE_H -#define WINTERMUTE_BSCRIPTABLE_H +#ifndef WINTERMUTE_BASE_SCRIPTABLE_H +#define WINTERMUTE_BASE_SCRIPTABLE_H #include "engines/wintermute/base/base_named_object.h" diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h index a02e69c63f..db9931c6f3 100644 --- a/engines/wintermute/base/base_sprite.h +++ b/engines/wintermute/base/base_sprite.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BSPRITE_H -#define WINTERMUTE_BSPRITE_H +#ifndef WINTERMUTE_BASE_SPRITE_H +#define WINTERMUTE_BASE_SPRITE_H #include "engines/wintermute/coll_templ.h" diff --git a/engines/wintermute/base/base_string_table.h b/engines/wintermute/base/base_string_table.h index c8df25810e..46295426fd 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_BSTRINGTABLE_H -#define WINTERMUTE_BSTRINGTABLE_H +#ifndef WINTERMUTE_BASE_STRINGTABLE_H +#define WINTERMUTE_BASE_STRINGTABLE_H #include "common/hashmap.h" diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h index 935fb667d4..e89a189e2d 100644 --- a/engines/wintermute/base/base_sub_frame.h +++ b/engines/wintermute/base/base_sub_frame.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BSUBFRAME_H -#define WINTERMUTE_BSUBFRAME_H +#ifndef WINTERMUTE_BASE_SUBFRAME_H +#define WINTERMUTE_BASE_SUBFRAME_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/base_surface_storage.h b/engines/wintermute/base/base_surface_storage.h index f1757b3a32..741177ae76 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_BSURFACESTORAGE_H -#define WINTERMUTE_BSURFACESTORAGE_H +#ifndef WINTERMUTE_BASE_SURFACESTORAGE_H +#define WINTERMUTE_BASE_SURFACESTORAGE_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 412361a543..daf2299c2f 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_BTRANSITIONMGR_H -#define WINTERMUTE_BTRANSITIONMGR_H +#ifndef WINTERMUTE_BASE_TRANSITIONMGR_H +#define WINTERMUTE_BASE_TRANSITIONMGR_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/base_viewport.h b/engines/wintermute/base/base_viewport.h index 1080c1d806..c94beeb2b1 100644 --- a/engines/wintermute/base/base_viewport.h +++ b/engines/wintermute/base/base_viewport.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BVIEWPORT_H -#define WINTERMUTE_BVIEWPORT_H +#ifndef WINTERMUTE_BASE_VIEWPORT_H +#define WINTERMUTE_BASE_VIEWPORT_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/file/base_disk_file.h b/engines/wintermute/base/file/base_disk_file.h index 8be06199de..69644408d0 100644 --- a/engines/wintermute/base/file/base_disk_file.h +++ b/engines/wintermute/base/file/base_disk_file.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BDISKFILE_H -#define WINTERMUTE_BDISKFILE_H +#ifndef WINTERMUTE_BASE_DISKFILE_H +#define WINTERMUTE_BASE_DISKFILE_H #include "common/stream.h" diff --git a/engines/wintermute/base/file/base_file.h b/engines/wintermute/base/file/base_file.h index f9947fe64f..7ae36d5ad1 100644 --- a/engines/wintermute/base/file/base_file.h +++ b/engines/wintermute/base/file/base_file.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BFILE_H -#define WINTERMUTE_BFILE_H +#ifndef WINTERMUTE_BASE_FILE_H +#define WINTERMUTE_BASE_FILE_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/file/base_file_entry.h b/engines/wintermute/base/file/base_file_entry.h index 7e71a486ef..6dd4bc08a4 100644 --- a/engines/wintermute/base/file/base_file_entry.h +++ b/engines/wintermute/base/file/base_file_entry.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BFILEENTRY_H -#define WINTERMUTE_BFILEENTRY_H +#ifndef WINTERMUTE_BASE_FILEENTRY_H +#define WINTERMUTE_BASE_FILEENTRY_H #include "common/archive.h" #include "common/str.h" diff --git a/engines/wintermute/base/file/base_package.h b/engines/wintermute/base/file/base_package.h index 676675b041..23d7d7690f 100644 --- a/engines/wintermute/base/file/base_package.h +++ b/engines/wintermute/base/file/base_package.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BPACKAGE_H -#define WINTERMUTE_BPACKAGE_H +#ifndef WINTERMUTE_BASE_PACKAGE_H +#define WINTERMUTE_BASE_PACKAGE_H #include "common/archive.h" #include "common/stream.h" diff --git a/engines/wintermute/base/file/base_resources.h b/engines/wintermute/base/file/base_resources.h index 596ac64dd7..48a0f534d0 100644 --- a/engines/wintermute/base/file/base_resources.h +++ b/engines/wintermute/base/file/base_resources.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BRESOURCES_H -#define WINTERMUTE_BRESOURCES_H +#ifndef WINTERMUTE_BASE_RESOURCES_H +#define WINTERMUTE_BASE_RESOURCES_H #include "common/stream.h" #include "common/str.h" diff --git a/engines/wintermute/base/file/base_save_thumb_file.h b/engines/wintermute/base/file/base_save_thumb_file.h index e68dc06904..377e06f02c 100644 --- a/engines/wintermute/base/file/base_save_thumb_file.h +++ b/engines/wintermute/base/file/base_save_thumb_file.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BSAVETHUMBFILE_H -#define WINTERMUTE_BSAVETHUMBFILE_H +#ifndef WINTERMUTE_BASE_SAVETHUMBFILE_H +#define WINTERMUTE_BASE_SAVETHUMBFILE_H #include "engines/wintermute/base/file/base_file.h" diff --git a/engines/wintermute/base/file/dcpackage.h b/engines/wintermute/base/file/dcpackage.h index 42c0b75e55..82f1998527 100644 --- a/engines/wintermute/base/file/dcpackage.h +++ b/engines/wintermute/base/file/dcpackage.h @@ -77,4 +77,4 @@ v2: uint32 TimeDate1 } // end of namespace Wintermute -#endif // _DCPACKAGE_H_ +#endif diff --git a/engines/wintermute/base/font/base_font.h b/engines/wintermute/base/font/base_font.h index aaf5aa2367..461a724160 100644 --- a/engines/wintermute/base/font/base_font.h +++ b/engines/wintermute/base/font/base_font.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BFONT_H -#define WINTERMUTE_BFONT_H +#ifndef WINTERMUTE_BASE_FONT_H +#define WINTERMUTE_BASE_FONT_H #include "engines/wintermute/base/base_object.h" diff --git a/engines/wintermute/base/font/base_font_bitmap.h b/engines/wintermute/base/font/base_font_bitmap.h index 22cd9c6ba8..14a6e1cc87 100644 --- a/engines/wintermute/base/font/base_font_bitmap.h +++ b/engines/wintermute/base/font/base_font_bitmap.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BFONTBITMAP_H -#define WINTERMUTE_BFONTBITMAP_H +#ifndef WINTERMUTE_BASE_FONTBITMAP_H +#define WINTERMUTE_BASE_FONTBITMAP_H #include "engines/wintermute/base/font/base_font.h" diff --git a/engines/wintermute/base/font/base_font_storage.h b/engines/wintermute/base/font/base_font_storage.h index 498096a5a8..733e1c5da3 100644 --- a/engines/wintermute/base/font/base_font_storage.h +++ b/engines/wintermute/base/font/base_font_storage.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BFONTSTORAGE_H -#define WINTERMUTE_BFONTSTORAGE_H +#ifndef WINTERMUTE_BASE_FONTSTORAGE_H +#define WINTERMUTE_BASE_FONTSTORAGE_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h index 93431b039c..a93e4efacb 100644 --- a/engines/wintermute/base/font/base_font_truetype.h +++ b/engines/wintermute/base/font/base_font_truetype.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BFONTTT_H -#define WINTERMUTE_BFONTTT_H +#ifndef WINTERMUTE_BASE_FONTTT_H +#define WINTERMUTE_BASE_FONTTT_H #include "engines/wintermute/base/font/base_font_storage.h" #include "engines/wintermute/base/font/base_font.h" diff --git a/engines/wintermute/base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h index 7bf901fe40..560a5f0d74 100644 --- a/engines/wintermute/base/gfx/base_image.h +++ b/engines/wintermute/base/gfx/base_image.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BIMAGE_H -#define WINTERMUTE_BIMAGE_H +#ifndef WINTERMUTE_BASE_IMAGE_H +#define WINTERMUTE_BASE_IMAGE_H #include "graphics/surface.h" #include "graphics/pixelformat.h" diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h index 1b284b044d..26d7e6db57 100644 --- a/engines/wintermute/base/gfx/base_renderer.h +++ b/engines/wintermute/base/gfx/base_renderer.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BRENDERER_H -#define WINTERMUTE_BRENDERER_H +#ifndef WINTERMUTE_BASE_RENDERER_H +#define WINTERMUTE_BASE_RENDERER_H #include "engines/wintermute/math/rect32.h" #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h index 3be61477ba..f45856f652 100644 --- a/engines/wintermute/base/gfx/base_surface.h +++ b/engines/wintermute/base/gfx/base_surface.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BSURFACE_H -#define WINTERMUTE_BSURFACE_H +#ifndef WINTERMUTE_BASE_SURFACE_H +#define WINTERMUTE_BASE_SURFACE_H #include "engines/wintermute/base/base.h" #include "engines/wintermute/math/rect32.h" diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h index 44acca0267..aebb4cf888 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BRENDERER_SDL_H -#define WINTERMUTE_BRENDERER_SDL_H +#ifndef WINTERMUTE_BASE_RENDERER_SDL_H +#define WINTERMUTE_BASE_RENDERER_SDL_H #include "engines/wintermute/base/gfx/base_renderer.h" #include "common/rect.h" @@ -128,4 +128,4 @@ private: } // end of namespace Wintermute -#endif // WINTERMUTE_BRENDERER_SDL_H +#endif diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h index 1b7146632e..b68fac4e3b 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BSURFACESDL_H -#define WINTERMUTE_BSURFACESDL_H +#ifndef WINTERMUTE_BASE_SURFACESDL_H +#define WINTERMUTE_BASE_SURFACESDL_H #include "graphics/surface.h" #include "engines/wintermute/base/gfx/base_surface.h" @@ -96,4 +96,4 @@ private: } // end of namespace Wintermute -#endif // WINTERMUTE_BSURFACESDL_H +#endif diff --git a/engines/wintermute/base/sound/base_sound.h b/engines/wintermute/base/sound/base_sound.h index fcc463ed06..d65757474a 100644 --- a/engines/wintermute/base/sound/base_sound.h +++ b/engines/wintermute/base/sound/base_sound.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BSOUND_H -#define WINTERMUTE_BSOUND_H +#ifndef WINTERMUTE_BASE_SOUND_H +#define WINTERMUTE_BASE_SOUND_H #include "engines/wintermute/base/base.h" #include "engines/wintermute/dctypes.h" // Added by ClassView diff --git a/engines/wintermute/base/sound/base_sound_buffer.h b/engines/wintermute/base/sound/base_sound_buffer.h index 3ec4d4d28b..29402ee76e 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.h +++ b/engines/wintermute/base/sound/base_sound_buffer.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BSOUNDBUFFER_H -#define WINTERMUTE_BSOUNDBUFFER_H +#ifndef WINTERMUTE_BASE_SOUNDBUFFER_H +#define WINTERMUTE_BASE_SOUNDBUFFER_H #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/base/sound/base_sound_manager.h b/engines/wintermute/base/sound/base_sound_manager.h index a0b9a4bc4b..d0b782b2b7 100644 --- a/engines/wintermute/base/sound/base_sound_manager.h +++ b/engines/wintermute/base/sound/base_sound_manager.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_BSOUNDMGR_H -#define WINTERMUTE_BSOUNDMGR_H +#ifndef WINTERMUTE_BASE_SOUNDMGR_H +#define WINTERMUTE_BASE_SOUNDMGR_H #include "engines/wintermute/coll_templ.h" #include "engines/wintermute/base/base.h" diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h index fbe2da1719..f1bf594769 100644 --- a/engines/wintermute/coll_templ.h +++ b/engines/wintermute/coll_templ.h @@ -83,4 +83,4 @@ public: } // end of namespace Wintermute -#endif // WINTERMUTE_COLL_TEMPL_H +#endif diff --git a/engines/wintermute/dcgf.h b/engines/wintermute/dcgf.h index c1a67ba4d1..867300e2d3 100644 --- a/engines/wintermute/dcgf.h +++ b/engines/wintermute/dcgf.h @@ -48,4 +48,4 @@ #define COMPRESSED_FILE_MAGIC 0x504D435A // ZCMP -#endif // WINTERMUTE_DCGF_H +#endif diff --git a/engines/wintermute/math/math_util.h b/engines/wintermute/math/math_util.h index 506317a2b0..5f13c416d7 100644 --- a/engines/wintermute/math/math_util.h +++ b/engines/wintermute/math/math_util.h @@ -39,4 +39,4 @@ public: } // end of namespace Wintermute -#endif // WINTERMUTE_MATHUTIL_H +#endif diff --git a/engines/wintermute/math/matrix4.h b/engines/wintermute/math/matrix4.h index 5891b4c5ec..5b68944397 100644 --- a/engines/wintermute/math/matrix4.h +++ b/engines/wintermute/math/matrix4.h @@ -56,4 +56,4 @@ public: } // end of namespace Wintermute -#endif // WINTERMUTE_MATRIX4_H +#endif diff --git a/engines/wintermute/math/rect32.h b/engines/wintermute/math/rect32.h index 1c959da1cf..190c1135cf 100644 --- a/engines/wintermute/math/rect32.h +++ b/engines/wintermute/math/rect32.h @@ -91,4 +91,4 @@ struct Rect32 { } // end of namespace Wintermute -#endif // WINTERMUTE_RECT32_H +#endif diff --git a/engines/wintermute/math/vector2.h b/engines/wintermute/math/vector2.h index ce7ebd331e..dfed1824f0 100644 --- a/engines/wintermute/math/vector2.h +++ b/engines/wintermute/math/vector2.h @@ -72,4 +72,4 @@ public: } // end of namespace Wintermute -#endif // WINTERMUTE_VECTOR2_H +#endif diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h index 54b13e8ffe..5bcf30787d 100644 --- a/engines/wintermute/persistent.h +++ b/engines/wintermute/persistent.h @@ -86,4 +86,4 @@ namespace Wintermute { } // end of namespace Wintermute -#endif // WINTERMUTE_PERSISTENT_H +#endif diff --git a/engines/wintermute/utils/path_util.h b/engines/wintermute/utils/path_util.h index ed8f3e91e8..92adfd91b8 100644 --- a/engines/wintermute/utils/path_util.h +++ b/engines/wintermute/utils/path_util.h @@ -46,4 +46,4 @@ public: } // end of namespace Wintermute -#endif // WINTERMUTE_PATHUTILS_H +#endif diff --git a/engines/wintermute/utils/string_util.h b/engines/wintermute/utils/string_util.h index 581ffc2ed4..87760971a8 100644 --- a/engines/wintermute/utils/string_util.h +++ b/engines/wintermute/utils/string_util.h @@ -53,4 +53,4 @@ public: } // end of namespace Wintermute -#endif // WINTERMUTE_STRINGUTIL_H +#endif diff --git a/engines/wintermute/wintypes.h b/engines/wintermute/wintypes.h index 7a84dd2810..a83a31f2ea 100644 --- a/engines/wintermute/wintypes.h +++ b/engines/wintermute/wintypes.h @@ -50,4 +50,4 @@ namespace Wintermute { } // end of namespace Wintermute -#endif // WINTERMUTE_WINTYPES_H +#endif -- cgit v1.2.3