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

15 files changed, 13 insertions, 13 deletions

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 396d415d35..0263142d38 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 2eb3372ea5..ef47e04ada 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 8eac3fa270..be5b8b9c22 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 ff55fe0a55..088d5952e6 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 beff271865..eb47d76316 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 2aee9f9fc4..26c8131a9f 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 b5be874051..abce1fbae2 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
index 02bf37b314..02bf37b314 100644
--- a/engines/sci/gfx/widgets.cpp
+++ b/engines/sci/gfx/gfx_widgets.cpp
diff --git a/engines/sci/gfx/menubar.h b/engines/sci/gfx/menubar.h
index c262cd5bbf..5255ccb96a 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 26b0207695..bcdc12223e 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
index d3cdedceac..d3cdedceac 100644
--- a/engines/sci/gfx/gfx_operations.h
+++ b/engines/sci/gfx/operations.h
diff --git a/engines/sci/gfx/sci_widgets.cpp b/engines/sci/gfx/sci_widgets.cpp
index 398f315285..d6ab47b4d2 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
index ea7199dcc1..ea7199dcc1 100644
--- a/engines/sci/include/sci_widgets.h
+++ b/engines/sci/gfx/sci_widgets.h
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 8803549f3d..963316a01d 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 8aae95ce76..8ea75cc053 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 {