[Scummvm-cvs-logs] SF.net SVN: scummvm:[53262] scummvm/trunk/engines/sword25/gfx

sev at users.sourceforge.net sev at users.sourceforge.net
Wed Oct 13 01:07:30 CEST 2010


Revision: 53262
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53262&view=rev
Author:   sev
Date:     2010-10-12 23:07:29 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: Removed last traces of STL

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/animation.cpp
    scummvm/trunk/engines/sword25/gfx/animation.h
    scummvm/trunk/engines/sword25/gfx/animationresource.h
    scummvm/trunk/engines/sword25/gfx/animationtemplate.h
    scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp
    scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h
    scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
    scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
    scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
    scummvm/trunk/engines/sword25/gfx/fontresource.cpp
    scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
    scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp
    scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp
    scummvm/trunk/engines/sword25/gfx/image/image.h
    scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp
    scummvm/trunk/engines/sword25/gfx/image/imageloader.h
    scummvm/trunk/engines/sword25/gfx/image/vectorimage.h
    scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h
    scummvm/trunk/engines/sword25/gfx/renderobject.cpp
    scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
    scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp
    scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
    scummvm/trunk/engines/sword25/gfx/screenshot.h
    scummvm/trunk/engines/sword25/gfx/text.h

Modified: scummvm/trunk/engines/sword25/gfx/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/animation.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -32,8 +32,6 @@
  *
  */
 
-#include <memory>
-
 #include "sword25/gfx/animation.h"
 
 #include "sword25/kernel/kernel.h"

Modified: scummvm/trunk/engines/sword25/gfx/animation.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/animation.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -39,10 +39,6 @@
 #include "sword25/kernel/common.h"
 #include "sword25/gfx/timedrenderobject.h"
 
-#include "sword25/kernel/memlog_off.h"
-#include <vector>
-#include "sword25/kernel/memlog_on.h"
-
 namespace Sword25 {
 
 // Forward declarations

Modified: scummvm/trunk/engines/sword25/gfx/animationresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationresource.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/animationresource.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -44,10 +44,6 @@
 #include "sword25/gfx/animationdescription.h"
 #include "sword25/gfx/animation.h"
 
-#include "sword25/kernel/memlog_off.h"
-#include <vector>
-#include "sword25/kernel/memlog_on.h"
-
 class TiXmlElement;
 
 namespace Sword25 {

Modified: scummvm/trunk/engines/sword25/gfx/animationtemplate.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplate.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplate.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -43,10 +43,6 @@
 #include "sword25/kernel/persistable.h"
 #include "sword25/gfx/animationdescription.h"
 
-#include "sword25/kernel/memlog_off.h"
-#include <vector>
-#include "sword25/kernel/memlog_on.h"
-
 namespace Sword25 {
 
 // -----------------------------------------------------------------------------

Modified: scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -49,14 +49,8 @@
 
 namespace Sword25 {
 
-// -----------------------------------------------------------------------------
-// Implementation
-// -----------------------------------------------------------------------------
+Common::ScopedPtr<AnimationTemplateRegistry> AnimationTemplateRegistry::m_InstancePtr;
 
-std::auto_ptr<AnimationTemplateRegistry> AnimationTemplateRegistry::m_InstancePtr;
-
-// -----------------------------------------------------------------------------
-
 void AnimationTemplateRegistry::LogErrorLn(const char *Message) const {
 	BS_LOG_ERRORLN(Message);
 }

Modified: scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -43,9 +43,7 @@
 #include "sword25/kernel/persistable.h"
 #include "sword25/kernel/objectregistry.h"
 
-#include "sword25/kernel/memlog_off.h"
-#include <memory>
-#include "sword25/kernel/memlog_on.h"
+#include "common/ptr.h"
 
 namespace Sword25 {
 
@@ -73,7 +71,7 @@
 	virtual void LogErrorLn(const char *Message) const;
 	virtual void LogWarningLn(const char *Message) const;
 
-	static std::auto_ptr<AnimationTemplateRegistry> m_InstancePtr;
+	static Common::ScopedPtr<AnimationTemplateRegistry> m_InstancePtr;
 };
 
 } // End of namespace Sword25

Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -32,8 +32,6 @@
  *
  */
 
-#include <memory>
-
 #include "sword25/gfx/bitmapresource.h"
 #include "sword25/kernel/kernel.h"
 #include "sword25/gfx/graphicengine.h"

Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -41,8 +41,6 @@
 #include "sword25/package/packagemanager.h"
 #include "sword25/kernel/inputpersistenceblock.h"
 
-#include <vector>
-
 namespace Sword25 {
 
 // -----------------------------------------------------------------------------

Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -40,14 +40,12 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "sword25/kernel/memlog_off.h"
-#include <memory>
-#include "sword25/kernel/memlog_on.h"
-
 #include "sword25/kernel/common.h"
 #include "sword25/gfx/bitmap.h"
 #include "sword25/gfx/opengl/glimage.h"
 
+#include "common/ptr.h"
+
 namespace Sword25 {
 
 // -----------------------------------------------------------------------------
@@ -81,7 +79,7 @@
 
 	bool CreateGLImage(unsigned int Width, unsigned int Height);
 
-	std::auto_ptr<GLImage> m_Image;
+	Common::ScopedPtr<GLImage> m_Image;
 };
 
 } // End of namespace Sword25

Modified: scummvm/trunk/engines/sword25/gfx/fontresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -38,8 +38,6 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include <memory>
-
 #include "sword25/kernel/kernel.h"
 #include "sword25/kernel/string.h"
 #include "sword25/package/packagemanager.h"

Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -36,10 +36,6 @@
 
 #include "sword25/gfx/image/image.h"
 #include "sword25/gfx/screenshot.h"
-#include "sword25/kernel/memlog_off.h"
-#include <memory>
-#include <vector>
-#include "sword25/kernel/memlog_on.h"
 #include "sword25/kernel/inputpersistenceblock.h"
 #include "sword25/kernel/outputpersistenceblock.h"
 #include "sword25/gfx/graphicengine.h"

Modified: scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -36,9 +36,6 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include <algorithm>
-#include <string>
-
 #include "sword25/kernel/common.h"
 #include "sword25/kernel/kernel.h"
 #include "sword25/kernel/callbackregistry.h"
@@ -84,8 +81,8 @@
 	}
 };
 
-std::auto_ptr<LuaCallback> LoopPointCallbackPtr;
-std::auto_ptr<ActionCallback> ActionCallbackPtr;
+Common::ScopedPtr<LuaCallback> LoopPointCallbackPtr;
+Common::ScopedPtr<ActionCallback> ActionCallbackPtr;
 
 // -------------------------------------------------------------------------
 

Modified: scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -36,11 +36,6 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include <string>
-#include <sstream>
-#include <algorithm>
-using namespace std;
-
 #include "sword25/gfx/image/b25sloader.h"
 #include "sword25/gfx/image/pngloader.h"
 
@@ -52,6 +47,7 @@
 
 namespace {
 unsigned int FindEmbeddedPNG(const char *FileDataPtr, unsigned int FileSize) {
+#if 0
 	// Einen Stringstream mit dem Anfang der Datei intialisieren. 512 Byte sollten hierf\xFCr gen\xFCgen.
 	istringstream StringStream(string(FileDataPtr, FileDataPtr + min(static_cast<unsigned int>(512), FileSize)));
 
@@ -66,6 +62,9 @@
 		// Offset zum PNG innerhalb des Spielstandes berechnen und zur\xFCckgeben.
 		return static_cast<unsigned int>(StringStream.tellg()) + CompressedGamedataSize + 1;
 	}
+#else
+	warning("STUB:FindEmbeddedPNG()");
+#endif
 
 	return 0;
 }

Modified: scummvm/trunk/engines/sword25/gfx/image/image.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/image.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/image/image.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -43,9 +43,6 @@
 #define SWORD25_IMAGE_H
 
 // Includes
-#include "sword25/kernel/memlog_off.h"
-#include <vector>
-#include "sword25/kernel/memlog_on.h"
 #include "sword25/kernel/common.h"
 #include "sword25/math/rect.h"
 #include "sword25/gfx/graphicengine.h"

Modified: scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -40,7 +40,7 @@
 #define BS_LOG_PREFIX "IMAGELOADER"
 
 // Statische Elemente der Klasse BS_ImageLoader intialisieren.
-std::list<ImageLoader *> ImageLoader::_ImageLoaderList;
+Common::List<ImageLoader *> ImageLoader::_ImageLoaderList;
 bool ImageLoader::_ImageLoaderListInitialized = false;
 
 // Lade Methode
@@ -113,7 +113,7 @@
 
 ImageLoader *ImageLoader::_FindSuitableImageLoader(const char *pFileData, unsigned int FileSize) {
 	// Alle BS_ImageLoader-Objekte durchgehen, bis eins gefunden wurde, dass das Bild laden kann
-	std::list<ImageLoader *>::iterator Iter = _ImageLoaderList.begin();
+	Common::List<ImageLoader *>::iterator Iter = _ImageLoaderList.begin();
 	for (; Iter != _ImageLoaderList.end(); ++Iter) {
 		// Falls ein geeigneter BS-ImageLoader gefunden wurde, wird er zur\xFCckgegeben.
 		if ((*Iter)->IsCorrectImageFormat(pFileData, FileSize)) {

Modified: scummvm/trunk/engines/sword25/gfx/image/imageloader.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/imageloader.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/image/imageloader.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -47,11 +47,6 @@
 #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 "sword25/kernel/memlog_off.h"
-#include <list>
-#include "sword25/kernel/memlog_on.h"
-
 namespace Sword25 {
 
 /**
@@ -356,7 +351,7 @@
 	*/
 	static ImageLoader *_FindSuitableImageLoader(const char *pFileData, unsigned int FileSize);
 
-	static std::list<ImageLoader *>   _ImageLoaderList;              // Die Liste aller BS_ImageLoader-Objekte
+	static Common::List<ImageLoader *>   _ImageLoaderList;              // Die Liste aller BS_ImageLoader-Objekte
 	static bool                         _ImageLoaderListInitialized;    // Gibt an, ob die Liste schon intialisiert wurde
 };
 

Modified: scummvm/trunk/engines/sword25/gfx/image/vectorimage.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/vectorimage.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/image/vectorimage.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -44,7 +44,6 @@
 #include "sword25/math/rect.h"
 
 #if 0
-#include <vector>
 #include "agg_path_storage.h"
 #endif
 

Modified: scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -100,7 +100,7 @@
 
 	RenderObjectPtr<Panel> m_MainPanelPtr;
 
-	std::auto_ptr<RenderObjectManager>   m_RenderObjectManagerPtr;
+	Common::ScopedPtr<RenderObjectManager>   m_RenderObjectManagerPtr;
 
 	struct DebugLine {
 		DebugLine(const Vertex &_Start, const Vertex &_End, unsigned int _Color) :

Modified: scummvm/trunk/engines/sword25/gfx/renderobject.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobject.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/renderobject.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -34,8 +34,6 @@
 
 #include "sword25/gfx/renderobject.h"
 
-#include <algorithm>
-
 #include "sword25/kernel/outputpersistenceblock.h"
 #include "sword25/kernel/inputpersistenceblock.h"
 

Modified: scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -46,10 +46,6 @@
 #define SWORD25_RENDEROBJECTMANAGER_H
 
 // Includes
-#include "sword25/kernel/memlog_off.h"
-#include <vector>
-#include "sword25/kernel/memlog_on.h"
-
 #include "sword25/kernel/common.h"
 #include "sword25/gfx/renderobjectptr.h"
 #include "sword25/kernel/persistable.h"

Modified: scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp	2010-10-12 23:07:29 UTC (rev 53262)
@@ -38,6 +38,8 @@
 
 #include "sword25/gfx/renderobjectregistry.h"
 
+#include "common/ptr.h"
+
 namespace Sword25 {
 
 // -----------------------------------------------------------------------------
@@ -46,14 +48,8 @@
 
 #define BS_LOG_PREFIX "RENDEROBJECTREGISTRY"
 
-// -----------------------------------------------------------------------------
-// Implementation
-// -----------------------------------------------------------------------------
+Common::ScopedPtr<RenderObjectRegistry> RenderObjectRegistry::m_InstancePtr;
 
-std::auto_ptr<RenderObjectRegistry> RenderObjectRegistry::m_InstancePtr;
-
-// -----------------------------------------------------------------------------
-
 void RenderObjectRegistry::LogErrorLn(const char *Message) const {
 	BS_LOG_ERRORLN(Message);
 }

Modified: scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -42,9 +42,7 @@
 #include "sword25/kernel/common.h"
 #include "sword25/kernel/objectregistry.h"
 
-#include "sword25/kernel/memlog_off.h"
-#include <memory>
-#include "sword25/kernel/memlog_on.h"
+#include "common/ptr.h"
 
 namespace Sword25 {
 
@@ -71,7 +69,7 @@
 	virtual void LogErrorLn(const char *Message) const;
 	virtual void LogWarningLn(const char *Message) const;
 
-	static std::auto_ptr<RenderObjectRegistry> m_InstancePtr;
+	static Common::ScopedPtr<RenderObjectRegistry> m_InstancePtr;
 };
 
 } // End of namespace Sword25

Modified: scummvm/trunk/engines/sword25/gfx/screenshot.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/screenshot.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/screenshot.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -40,10 +40,6 @@
 // -----------------------------------------------------------------------------
 
 #include "sword25/kernel/common.h"
-#include "sword25/kernel/memlog_off.h"
-#include <string>
-#include <vector>
-#include "sword25/kernel/memlog_on.h"
 
 namespace Sword25 {
 

Modified: scummvm/trunk/engines/sword25/gfx/text.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.h	2010-10-12 22:59:01 UTC (rev 53261)
+++ scummvm/trunk/engines/sword25/gfx/text.h	2010-10-12 23:07:29 UTC (rev 53262)
@@ -43,10 +43,6 @@
 #include "sword25/math/rect.h"
 #include "sword25/gfx/renderobject.h"
 
-#include "sword25/kernel/memlog_off.h"
-#include <vector>
-#include "sword25/kernel/memlog_on.h"
-
 namespace Sword25 {
 
 // -----------------------------------------------------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list