From 0be30cdc5d25f85a7a0bbf3a2c2aeddae3d301d7 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 24 Feb 2009 20:39:34 +0000 Subject: [PATCH] SCI: Renamed gfx/gfx_operations.h to gfx/operations.h (matching the source file); moved include/sci_widgets.h to gfx/ (matching location of source file); renamed gfx/widgets.cpp to gfx/gfx_widgets.cpp (matching the header) svn-id: r38852 --- engines/sci/engine/kernel.cpp | 2 +- engines/sci/engine/kgraphics.cpp | 2 +- engines/sci/engine/kmenu.cpp | 2 +- engines/sci/engine/savegame.cfsml | 2 +- engines/sci/engine/savegame.cpp | 2 +- engines/sci/engine/scriptdebug.cpp | 2 +- engines/sci/gfx/gfx_state_internal.h | 2 +- engines/sci/gfx/{widgets.cpp => gfx_widgets.cpp} | 0 engines/sci/gfx/menubar.h | 2 +- engines/sci/gfx/operations.cpp | 2 +- engines/sci/gfx/{gfx_operations.h => operations.h} | 0 engines/sci/gfx/sci_widgets.cpp | 4 ++-- engines/sci/{include => gfx}/sci_widgets.h | 0 engines/sci/module.mk | 2 +- engines/sci/scicore/sciconsole.h | 2 +- 15 files changed, 13 insertions(+), 13 deletions(-) rename engines/sci/gfx/{widgets.cpp => gfx_widgets.cpp} (100%) rename engines/sci/gfx/{gfx_operations.h => operations.h} (100%) rename engines/sci/{include => gfx}/sci_widgets.h (100%) diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index 396d415d355..0263142d380 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -39,7 +39,7 @@ #include "sci/engine/kernel.h" #include "sci/include/sciresource.h" #include "sci/include/engine.h" -#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/operations.h" #include "sci/engine/kernel_types.h" namespace Sci { diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 2eb3372ea54..ef47e04ada2 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -27,7 +27,7 @@ #include "sci/include/sciresource.h" #include "sci/include/engine.h" -#include "sci/include/sci_widgets.h" +#include "sci/gfx/sci_widgets.h" #include "sci/gfx/gfx_widgets.h" #include "sci/engine/sci_graphics.h" #include "sci/engine/kernel.h" diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp index 8eac3fa270a..be5b8b9c228 100644 --- a/engines/sci/engine/kmenu.cpp +++ b/engines/sci/engine/kmenu.cpp @@ -25,7 +25,7 @@ #include "sci/include/sciresource.h" #include "sci/include/engine.h" -#include "sci/include/sci_widgets.h" +#include "sci/gfx/sci_widgets.h" #include "sci/gfx/menubar.h" #include "sci/engine/kernel.h" diff --git a/engines/sci/engine/savegame.cfsml b/engines/sci/engine/savegame.cfsml index ff55fe0a552..088d5952e6a 100644 --- a/engines/sci/engine/savegame.cfsml +++ b/engines/sci/engine/savegame.cfsml @@ -33,7 +33,7 @@ #include "common/stream.h" #include "common/system.h" #include "sci/sci_memory.h" -#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/operations.h" #include "sci/gfx/menubar.h" #include "sci/sfx/sfx_engine.h" #include "sci/include/engine.h" diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index beff271865e..eb47d763164 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -33,7 +33,7 @@ #include "common/stream.h" #include "common/system.h" #include "sci/sci_memory.h" -#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/operations.h" #include "sci/gfx/menubar.h" #include "sci/sfx/sfx_engine.h" #include "sci/include/engine.h" diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index 2aee9f9fc4c..26c8131a9ff 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -34,7 +34,7 @@ #include "sci/engine/kernel.h" #include "sci/engine/kernel_types.h" #include "sci/include/sci_midi.h" -#include "sci/include/sci_widgets.h" +#include "sci/gfx/sci_widgets.h" #include "sci/sci.h" #include "sci/gfx/gfx_widgets.h" diff --git a/engines/sci/gfx/gfx_state_internal.h b/engines/sci/gfx/gfx_state_internal.h index b5be8740513..abce1fbae20 100644 --- a/engines/sci/gfx/gfx_state_internal.h +++ b/engines/sci/gfx/gfx_state_internal.h @@ -28,7 +28,7 @@ #include "sci/gfx/gfx_tools.h" #include "sci/gfx/gfx_options.h" -#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/operations.h" #include "sci/gfx/gfx_resmgr.h" #include "sci/gfx/gfx_system.h" diff --git a/engines/sci/gfx/widgets.cpp b/engines/sci/gfx/gfx_widgets.cpp similarity index 100% rename from engines/sci/gfx/widgets.cpp rename to engines/sci/gfx/gfx_widgets.cpp diff --git a/engines/sci/gfx/menubar.h b/engines/sci/gfx/menubar.h index c262cd5bbfd..5255ccb96ab 100644 --- a/engines/sci/gfx/menubar.h +++ b/engines/sci/gfx/menubar.h @@ -29,7 +29,7 @@ #define SCI_GFX_SCI_MENUBAR_H #include "sci/include/vm_types.h" -#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/operations.h" #include "sci/gfx/gfx_widgets.h" namespace Sci { diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index 26b02076951..bcdc12223e2 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -26,7 +26,7 @@ // Graphical operations, called from the widget state manager #include "sci/sci_memory.h" -#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/operations.h" #include "common/system.h" diff --git a/engines/sci/gfx/gfx_operations.h b/engines/sci/gfx/operations.h similarity index 100% rename from engines/sci/gfx/gfx_operations.h rename to engines/sci/gfx/operations.h diff --git a/engines/sci/gfx/sci_widgets.cpp b/engines/sci/gfx/sci_widgets.cpp index 398f3152858..d6ab47b4d2e 100644 --- a/engines/sci/gfx/sci_widgets.cpp +++ b/engines/sci/gfx/sci_widgets.cpp @@ -23,11 +23,11 @@ * */ -#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/operations.h" #include "sci/gfx/gfx_widgets.h" #include "sci/include/engine.h" #include "sci/gfx/menubar.h" -#include "sci/include/sci_widgets.h" +#include "sci/gfx/sci_widgets.h" #include "common/system.h" diff --git a/engines/sci/include/sci_widgets.h b/engines/sci/gfx/sci_widgets.h similarity index 100% rename from engines/sci/include/sci_widgets.h rename to engines/sci/gfx/sci_widgets.h diff --git a/engines/sci/module.mk b/engines/sci/module.mk index 8803549f3d5..963316a01d7 100644 --- a/engines/sci/module.mk +++ b/engines/sci/module.mk @@ -38,12 +38,12 @@ MODULE_OBJS = \ gfx/gfx_resource.o \ gfx/gfx_support.o \ gfx/gfx_tools.o \ + gfx/gfx_widgets.o \ gfx/menubar.o \ gfx/operations.o \ gfx/resmgr.o \ gfx/sbtree.o \ gfx/sci_widgets.o \ - gfx/widgets.o \ gfx/resource/sci_cursor_0.o \ gfx/resource/sci_font.o \ gfx/resource/sci_pal_1.o \ diff --git a/engines/sci/scicore/sciconsole.h b/engines/sci/scicore/sciconsole.h index 8aae95ce76c..8ea75cc0530 100644 --- a/engines/sci/scicore/sciconsole.h +++ b/engines/sci/scicore/sciconsole.h @@ -39,7 +39,7 @@ #include "sci/include/vm_types.h" #define SCI_CONSOLE -#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/operations.h" namespace Sci {