[Scummvm-git-logs] scummvm master -> 7a152e9af490825130f9f8fdaf4178d81c0ef485

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7a152e9af4 JANITORIAL: #include "engine.h" -> "engines/engine.h"


Commit: 7a152e9af490825130f9f8fdaf4178d81c0ef485
    https://github.com/scummvm/scummvm/commit/7a152e9af490825130f9f8fdaf4178d81c0ef485
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-10T23:45:43+02:00

Commit Message:
JANITORIAL: #include "engine.h" -> "engines/engine.h"

Changed paths:
    backends/platform/ds/arm9/source/dsmain.cpp
    backends/platform/psp/powerman.cpp
    engines/sci/graphics/video32.cpp
    engines/sci/sound/audio32.cpp
    gui/debugger.h


diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 782903c415..14719b0fb2 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -103,7 +103,7 @@
 #ifdef USE_PROFILER
 #include "profiler/cyg-profile.h"
 #endif
-#include "engine.h"
+#include "engines/engine.h"
 
 #include "backends/plugins/ds/ds-provider.h"
 #include "backends/fs/ds/ds-fs.h"
diff --git a/backends/platform/psp/powerman.cpp b/backends/platform/psp/powerman.cpp
index 3cd663e3c7..a656a37232 100644
--- a/backends/platform/psp/powerman.cpp
+++ b/backends/platform/psp/powerman.cpp
@@ -24,7 +24,7 @@
 #include <pspthreadman.h>
 
 #include "backends/platform/psp/powerman.h"
-#include "engine.h"
+#include "engines/engine.h"
 
 //#define __PSP_DEBUG_FUNCS__	/* can put this locally too */
 //#define __PSP_DEBUG_PRINT__
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index da806d48b2..6d4e321a08 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -28,7 +28,7 @@
 #endif
 #include "common/util.h"                 // for ARRAYSIZE
 #include "common/system.h"               // for g_system
-#include "engine.h"                      // for Engine, g_engine
+#include "engines/engine.h"              // for Engine, g_engine
 #include "graphics/colormasks.h"         // for createPixelFormat
 #include "graphics/palette.h"            // for PaletteManager
 #include "graphics/transparent_surface.h" // for TransparentSurface
@@ -513,7 +513,7 @@ QuickTimePlayer::QuickTimePlayer(EventManager *eventMan) :
 
 void QuickTimePlayer::play(const Common::String& fileName) {
 	_decoder.reset(new Video::QuickTimeDecoder());
-	
+
 	if (!VideoPlayer::open(fileName)) {
 		_decoder.reset();
 		return;
diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp
index 045dc06238..7e95d3875c 100644
--- a/engines/sci/sound/audio32.cpp
+++ b/engines/sci/sound/audio32.cpp
@@ -36,7 +36,7 @@
 #include "common/system.h"          // for OSystem, g_system
 #include "common/textconsole.h"     // for warning
 #include "common/types.h"           // for Flag::NO
-#include "engine.h"                 // for Engine, g_engine
+#include "engines/engine.h"         // for Engine, g_engine
 #include "sci/console.h"            // for Console
 #include "sci/engine/features.h"    // for GameFeatures
 #include "sci/engine/guest_additions.h" // for GuestAdditions
diff --git a/gui/debugger.h b/gui/debugger.h
index 9ffef6bb05..adbdfec461 100644
--- a/gui/debugger.h
+++ b/gui/debugger.h
@@ -31,7 +31,7 @@
 #include "common/str.h"
 #include "common/str-array.h"
 
-#include "engine.h"
+#include "engines/engine.h"
 
 namespace GUI {