From e8bca8b8fe0f80e0d5053b190840b034f50ae163 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 30 Jul 2010 09:02:39 +0000 Subject: SWORD25: Fixed rest of the include paths svn-id: r53181 --- engines/sword25/gfx/image/b25sloader.cpp | 4 ++-- engines/sword25/gfx/image/b25sloader.h | 12 ++++++------ engines/sword25/gfx/image/image.h | 14 +++++++------- engines/sword25/gfx/image/imageloader.cpp | 4 ++-- engines/sword25/gfx/image/imageloader.h | 14 +++++++------- engines/sword25/gfx/image/imageloader_ids.h | 6 +++--- engines/sword25/gfx/image/pngloader.cpp | 6 +++--- engines/sword25/gfx/image/pngloader.h | 12 ++++++------ engines/sword25/gfx/image/vectorimage.cpp | 4 ++-- engines/sword25/gfx/image/vectorimage.h | 10 +++++----- engines/sword25/gfx/image/vectorimagerenderer.cpp | 4 ++-- engines/sword25/gfx/image/vectorimagerenderer.h | 6 +++--- 12 files changed, 48 insertions(+), 48 deletions(-) (limited to 'engines/sword25/gfx/image') diff --git a/engines/sword25/gfx/image/b25sloader.cpp b/engines/sword25/gfx/image/b25sloader.cpp index 55aaf7a2c5..a4e3ad1235 100755 --- a/engines/sword25/gfx/image/b25sloader.cpp +++ b/engines/sword25/gfx/image/b25sloader.cpp @@ -26,8 +26,8 @@ #include using namespace std; -#include "b25sloader.h" -#include "pngloader.h" +#include "sword25/gfx/image/b25sloader.h" +#include "sword25/gfx/image/pngloader.h" #define BS_LOG_PREFIX "B25SLOADER" diff --git a/engines/sword25/gfx/image/b25sloader.h b/engines/sword25/gfx/image/b25sloader.h index bafea87365..f562d3c6c7 100755 --- a/engines/sword25/gfx/image/b25sloader.h +++ b/engines/sword25/gfx/image/b25sloader.h @@ -17,15 +17,15 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // ----------------------------------------------------------------------------- -#ifndef BS_B25SLOADER_H -#define BS_B25SLOADER_H +#ifndef SWORD25_B25SLOADER_H +#define SWORD25_B25SLOADER_H // ----------------------------------------------------------------------------- // Includes // ----------------------------------------------------------------------------- -#include "kernel/common.h" -#include "imageloader.h" +#include "sword25/kernel/common.h" +#include "sword25/gfx/image/imageloader.h" // ----------------------------------------------------------------------------- // Klassendeklaration @@ -36,9 +36,9 @@ class BS_B25SLoader : public BS_ImageLoader public: static BS_ImageLoader * CreateInstance() { - #include "kernel/memlog_off.h" + #include "sword25/kernel/memlog_off.h" return static_cast(new BS_B25SLoader()); - #include "kernel/memlog_on.h" + #include "sword25/kernel/memlog_on.h" } protected: diff --git a/engines/sword25/gfx/image/image.h b/engines/sword25/gfx/image/image.h index 8f6fe9cab9..a022150bf6 100755 --- a/engines/sword25/gfx/image/image.h +++ b/engines/sword25/gfx/image/image.h @@ -24,16 +24,16 @@ Autor: Malte Thiesen */ -#ifndef BS_IMAGE_H -#define BS_IMAGE_H +#ifndef SWORD25_IMAGE_H +#define SWORD25_IMAGE_H // Includes -#include "kernel/memlog_off.h" +#include "sword25/kernel/memlog_off.h" #include -#include "kernel/memlog_on.h" -#include "kernel/common.h" -#include "math/rect.h" -#include "gfx/graphicengine.h" +#include "sword25/kernel/memlog_on.h" +#include "sword25/kernel/common.h" +#include "sword25/math/rect.h" +#include "sword25/gfx/graphicengine.h" class BS_Image { diff --git a/engines/sword25/gfx/image/imageloader.cpp b/engines/sword25/gfx/image/imageloader.cpp index 18d94a4e21..ace05b9812 100755 --- a/engines/sword25/gfx/image/imageloader.cpp +++ b/engines/sword25/gfx/image/imageloader.cpp @@ -17,8 +17,8 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // ----------------------------------------------------------------------------- -#include "imageloader.h" -#include "imageloader_ids.h" +#include "sword25/gfx/image/imageloader.h" +#include "sword25/gfx/image/imageloader_ids.h" #define BS_LOG_PREFIX "IMAGELOADER" diff --git a/engines/sword25/gfx/image/imageloader.h b/engines/sword25/gfx/image/imageloader.h index 952c36b093..a8a4fd899f 100755 --- a/engines/sword25/gfx/image/imageloader.h +++ b/engines/sword25/gfx/image/imageloader.h @@ -24,18 +24,18 @@ Autor: Malte Thiesen */ -#ifndef BS_IMAGELOADER_H -#define BS_IMAGELOADER_H +#ifndef SWORD25_IMAGELOADER_H +#define SWORD25_IMAGELOADER_H // Includes -#include "kernel/bs_stdint.h" -#include "kernel/common.h" -#include "../graphicengine.h" +#include "sword25/kernel/bs_stdint.h" +#include "sword25/kernel/common.h" +#include "sword25/gfx/graphicengine.h" // Die folgenden Header vertragen sich nicht mit der Memoryleak-Detection, daher wird sie kurzzeitig deaktiviert -#include "kernel/memlog_off.h" +#include "sword25/kernel/memlog_off.h" #include -#include "kernel/memlog_on.h" +#include "sword25/kernel/memlog_on.h" /** @brief Über die statischen Methoden dieser Klasse werden alle unterstützten Bildformate geladen. diff --git a/engines/sword25/gfx/image/imageloader_ids.h b/engines/sword25/gfx/image/imageloader_ids.h index 4564996a0f..e18f2dd64f 100755 --- a/engines/sword25/gfx/image/imageloader_ids.h +++ b/engines/sword25/gfx/image/imageloader_ids.h @@ -26,11 +26,11 @@ Autor: Malte Thiesen */ -#include "imageloader.h" +#include "sword25/gfx/image/imageloader.h" // Die Headerdateien der ImageLoader müssen hier eingebunden werden -#include "pngloader.h" -#include "b25sloader.h" +#include "sword25/gfx/image/pngloader.h" +#include "sword25/gfx/image/b25sloader.h" // Die Tabelle enthält Pointer auf statische Member-Funktionen innerhalb der Klassen, die eine Instanz der Klasse // erzeugen diff --git a/engines/sword25/gfx/image/pngloader.cpp b/engines/sword25/gfx/image/pngloader.cpp index 3815f4e4ff..f97de5f6e8 100755 --- a/engines/sword25/gfx/image/pngloader.cpp +++ b/engines/sword25/gfx/image/pngloader.cpp @@ -21,9 +21,9 @@ // Includes // ----------------------------------------------------------------------------- -#include "image.h" -#include "pngloader.h" -#include "util/libpng/png.h" +#include "sword25/gfx/image/image.h" +#include "sword25/gfx/image/pngloader.h" +#include #define BS_LOG_PREFIX "PNGLOADER" diff --git a/engines/sword25/gfx/image/pngloader.h b/engines/sword25/gfx/image/pngloader.h index 5fdedf49fc..dfe38dbe6a 100755 --- a/engines/sword25/gfx/image/pngloader.h +++ b/engines/sword25/gfx/image/pngloader.h @@ -25,12 +25,12 @@ Autor: Malte Thiesen */ -#ifndef BS_PNGLOADER2_H -#define BS_PNGLOADER2_H +#ifndef SWORD25_PNGLOADER2_H +#define SWORD25_PNGLOADER2_H // Includes -#include "kernel/common.h" -#include "imageloader.h" +#include "sword25/kernel/common.h" +#include "sword25/gfx/image/imageloader.h" // Klassendefinition class BS_PNGLoader : public BS_ImageLoader @@ -38,9 +38,9 @@ class BS_PNGLoader : public BS_ImageLoader public: static BS_ImageLoader* CreateInstance() { - #include "kernel/memlog_off.h" + #include "sword25/kernel/memlog_off.h" return (BS_ImageLoader*) new BS_PNGLoader(); - #include "kernel/memlog_on.h" + #include "sword25/kernel/memlog_on.h" } // Alle virtuellen Methoden von BS_ImageLoader sind hier als static-Methode implementiert, damit sie von BS_B25SLoader aufgerufen werden können. diff --git a/engines/sword25/gfx/image/vectorimage.cpp b/engines/sword25/gfx/image/vectorimage.cpp index 035d572149..4cbd0d5cfd 100755 --- a/engines/sword25/gfx/image/vectorimage.cpp +++ b/engines/sword25/gfx/image/vectorimage.cpp @@ -21,8 +21,8 @@ // Includes // ----------------------------------------------------------------------------- -#include "kernel/bs_stdint.h" -#include "vectorimage.h" +#include "sword25/kernel/bs_stdint.h" +#include "sword25/gfx/image/vectorimage.h" #include #include diff --git a/engines/sword25/gfx/image/vectorimage.h b/engines/sword25/gfx/image/vectorimage.h index 74f6c860d9..a807452b67 100755 --- a/engines/sword25/gfx/image/vectorimage.h +++ b/engines/sword25/gfx/image/vectorimage.h @@ -17,16 +17,16 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // ----------------------------------------------------------------------------- -#ifndef BS_VECTORIMAGE_H -#define BS_VECTORIMAGE_H +#ifndef SWORD25_VECTORIMAGE_H +#define SWORD25_VECTORIMAGE_H // ----------------------------------------------------------------------------- // Includes // ----------------------------------------------------------------------------- -#include "kernel/common.h" -#include "gfx/image/image.h" -#include "math/rect.h" +#include "sword25/kernel/common.h" +#include "sword25/gfx/image/image.h" +#include "sword25/math/rect.h" #include #include "agg_path_storage.h" diff --git a/engines/sword25/gfx/image/vectorimagerenderer.cpp b/engines/sword25/gfx/image/vectorimagerenderer.cpp index 76f2330a65..9d582f623d 100755 --- a/engines/sword25/gfx/image/vectorimagerenderer.cpp +++ b/engines/sword25/gfx/image/vectorimagerenderer.cpp @@ -21,8 +21,8 @@ // Includes // ----------------------------------------------------------------------------- -#include "vectorimagerenderer.h" -#include "vectorimage.h" +#include "sword25/gfx/image/vectorimagerenderer.h" +#include "sword25/gfx/image/vectorimage.h" #include "agg_conv_curve.h" #include "agg_path_storage.h" #include "agg_conv_stroke.h" diff --git a/engines/sword25/gfx/image/vectorimagerenderer.h b/engines/sword25/gfx/image/vectorimagerenderer.h index 2dc29c480e..b79798e2e2 100755 --- a/engines/sword25/gfx/image/vectorimagerenderer.h +++ b/engines/sword25/gfx/image/vectorimagerenderer.h @@ -17,14 +17,14 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // ----------------------------------------------------------------------------- -#ifndef BS_VECTORIMAGERENDERER_H -#define BS_VECTORIMAGERENDERER_H +#ifndef SWORD25_VECTORIMAGERENDERER_H +#define SWORD25_VECTORIMAGERENDERER_H // ----------------------------------------------------------------------------- // Includes // ----------------------------------------------------------------------------- -#include "kernel/common.h" +#include "sword25/kernel/common.h" #include #include "agg_rendering_buffer.h" -- cgit v1.2.3