[Scummvm-cvs-logs] SF.net SVN: scummvm:[53214] scummvm/trunk/engines/sword25/gfx
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed Oct 13 00:27:04 CEST 2010
Revision: 53214
http://scummvm.svn.sourceforge.net/scummvm/?rev=53214&view=rev
Author: sev
Date: 2010-10-12 22:27:03 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
SWORD25: Mass-putting of all files in gfx/ into Sword25 namespace
Modified Paths:
--------------
scummvm/trunk/engines/sword25/gfx/animation.cpp
scummvm/trunk/engines/sword25/gfx/animation.h
scummvm/trunk/engines/sword25/gfx/animationdescription.cpp
scummvm/trunk/engines/sword25/gfx/animationdescription.h
scummvm/trunk/engines/sword25/gfx/animationresource.cpp
scummvm/trunk/engines/sword25/gfx/animationresource.h
scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp
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/bitmap.cpp
scummvm/trunk/engines/sword25/gfx/bitmap.h
scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
scummvm/trunk/engines/sword25/gfx/bitmapresource.h
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/fontresource.h
scummvm/trunk/engines/sword25/gfx/framecounter.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/b25sloader.h
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/imageloader_ids.h
scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp
scummvm/trunk/engines/sword25/gfx/image/pngloader.h
scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp
scummvm/trunk/engines/sword25/gfx/image/vectorimage.h
scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.cpp
scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.h
scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp
scummvm/trunk/engines/sword25/gfx/opengl/glimage.h
scummvm/trunk/engines/sword25/gfx/opengl/glvectorimageblit.cpp
scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp
scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h
scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp
scummvm/trunk/engines/sword25/gfx/opengl/swimage.h
scummvm/trunk/engines/sword25/gfx/panel.cpp
scummvm/trunk/engines/sword25/gfx/panel.h
scummvm/trunk/engines/sword25/gfx/renderobject.cpp
scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp
scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
scummvm/trunk/engines/sword25/gfx/renderobjectptr.h
scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp
scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
scummvm/trunk/engines/sword25/gfx/rootrenderobject.h
scummvm/trunk/engines/sword25/gfx/screenshot.cpp
scummvm/trunk/engines/sword25/gfx/screenshot.h
scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp
scummvm/trunk/engines/sword25/gfx/staticbitmap.h
scummvm/trunk/engines/sword25/gfx/text.cpp
scummvm/trunk/engines/sword25/gfx/text.h
scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp
scummvm/trunk/engines/sword25/gfx/timedrenderobject.h
Modified: scummvm/trunk/engines/sword25/gfx/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/animation.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -50,6 +50,8 @@
#include "sword25/gfx/bitmapresource.h"
#include "sword25/gfx/graphicengine.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "ANIMATION"
// Konstruktion / Destruktion
@@ -891,3 +893,5 @@
if (m_AnimationResourcePtr) return m_AnimationResourcePtr;
else return BS_AnimationTemplateRegistry::GetInstance().ResolveHandle(m_AnimationTemplateHandle);
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/animation.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/animation.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -43,6 +43,8 @@
#include <vector>
#include "sword25/kernel/memlog_on.h"
+namespace Sword25 {
+
// Forward declarations
class BS_Kernel;
class BS_PackageManager;
@@ -221,4 +223,6 @@
void InitializeAnimationResource(const std::string &FileName);
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/animationdescription.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationdescription.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/animationdescription.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -40,6 +40,8 @@
#include "sword25/kernel/inputpersistenceblock.h"
#include "sword25/gfx/animationdescription.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Persistenz
// -----------------------------------------------------------------------------
@@ -71,3 +73,5 @@
return Reader.IsGood();
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/animationdescription.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationdescription.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/animationdescription.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -43,6 +43,8 @@
#include "sword25/kernel/persistable.h"
#include "sword25/gfx/animation.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Klassendefinition
// -----------------------------------------------------------------------------
@@ -102,4 +104,6 @@
bool m_ColorModulationAllowed;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/animationresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationresource.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/animationresource.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -44,6 +44,8 @@
#include <tinyxml.h>
#include "sword25/gfx/bitmapresource.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
#define BS_LOG_PREFIX "ANIMATIONRESOURCE"
@@ -336,3 +338,5 @@
return true;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/animationresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationresource.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/animationresource.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -48,6 +48,8 @@
#include <vector>
#include "sword25/kernel/memlog_on.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Forward Declarations
// -----------------------------------------------------------------------------
@@ -95,4 +97,6 @@
bool PrecacheAllFrames() const;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -47,6 +47,8 @@
#include "sword25/gfx/animationtemplate.h"
#include "sword25/gfx/animationtemplateregistry.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Konstruktion / Destruktion
// -----------------------------------------------------------------------------
@@ -306,3 +308,5 @@
return m_SourceAnimationPtr && Reader.IsGood() && Result;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplate.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplate.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplate.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -47,6 +47,8 @@
#include <vector>
#include "sword25/kernel/memlog_on.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Forward declarations
// -----------------------------------------------------------------------------
@@ -120,4 +122,6 @@
bool ValidateDestIndex(unsigned int Index) const;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -32,6 +32,8 @@
*
*/
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Logging
// -----------------------------------------------------------------------------
@@ -124,3 +126,5 @@
return Reader.IsGood() && Result;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -47,6 +47,8 @@
#include <memory>
#include "sword25/kernel/memlog_on.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Forward Deklarationen
// -----------------------------------------------------------------------------
@@ -76,4 +78,6 @@
static std::auto_ptr<BS_AnimationTemplateRegistry> m_InstancePtr;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/bitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmap.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/bitmap.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -40,6 +40,8 @@
#include "sword25/kernel/outputpersistenceblock.h"
#include "sword25/kernel/inputpersistenceblock.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Logging
// -----------------------------------------------------------------------------
@@ -227,3 +229,5 @@
return Reader.IsGood() && Result;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/bitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmap.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/bitmap.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -42,6 +42,8 @@
#include "sword25/kernel/common.h"
#include "sword25/gfx/renderobject.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Klassendeklaration
// -----------------------------------------------------------------------------
@@ -179,4 +181,6 @@
int m_OriginalHeight;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -40,6 +40,8 @@
#include "sword25/gfx/image/imageloader.h"
#include "sword25/package/packagemanager.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "BITMAP"
// Konstruktion / Destruktion
@@ -67,3 +69,5 @@
return m_pImage->GetPixel(X, Y);
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -40,6 +40,8 @@
#include "sword25/kernel/resource.h"
#include "sword25/gfx/image/image.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Forward Declarations
// -----------------------------------------------------------------------------
@@ -189,4 +191,6 @@
bool m_Valid;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -43,6 +43,8 @@
#include <vector>
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Logging
// -----------------------------------------------------------------------------
@@ -204,3 +206,5 @@
return Reader.IsGood() && Result;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -48,6 +48,8 @@
#include "sword25/gfx/bitmap.h"
#include "sword25/gfx/opengl/glimage.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Klassendeklaration
// -----------------------------------------------------------------------------
@@ -83,4 +85,6 @@
std::auto_ptr<BS_GLImage> m_Image;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/fontresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -47,6 +47,8 @@
#include "sword25/gfx/fontresource.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Konstanten
// -----------------------------------------------------------------------------
@@ -256,3 +258,5 @@
return true;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/fontresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -43,6 +43,8 @@
#include "sword25/kernel/resource.h"
#include "sword25/math/rect.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Forward declarations
// -----------------------------------------------------------------------------
@@ -116,4 +118,6 @@
bool _ParseCharacterTag(TiXmlElement & Tag, int & Code, BS_Rect & Rect) const;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/framecounter.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/framecounter.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/framecounter.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -35,6 +35,8 @@
#include "sword25/gfx/framecounter.h"
#include "sword25/kernel/timer.h"
+namespace Sword25 {
+
BS_Framecounter::BS_Framecounter(int UpdateFrequency) :
m_FPS(0),
m_FPSCount(0),
@@ -66,3 +68,5 @@
}
}
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -49,6 +49,8 @@
#include "sword25/util/lua/lauxlib.h"
}
+namespace Sword25 {
+
using namespace std;
// -----------------------------------------------------------------------------
@@ -231,3 +233,5 @@
Reader.Read(m_TimerActive);
return Reader.IsGood();
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -56,6 +56,8 @@
#include "sword25/gfx/animationtemplate.h"
#include "sword25/gfx/animationtemplateregistry.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "GRAPHICENGINE"
// -----------------------------------------------------------------------------
@@ -1735,3 +1737,5 @@
return true;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -44,6 +44,8 @@
#include "sword25/gfx/image/b25sloader.h"
#include "sword25/gfx/image/pngloader.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "B25SLOADER"
// -----------------------------------------------------------------------------
@@ -114,3 +116,5 @@
return false;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/image/b25sloader.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/b25sloader.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/b25sloader.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -42,6 +42,8 @@
#include "sword25/kernel/common.h"
#include "sword25/gfx/image/imageloader.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Klassendeklaration
// -----------------------------------------------------------------------------
@@ -64,4 +66,6 @@
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/image/image.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/image.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/image.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -50,6 +50,8 @@
#include "sword25/math/rect.h"
#include "sword25/gfx/graphicengine.h"
+namespace Sword25 {
+
class BS_Image
{
public:
@@ -220,4 +222,6 @@
//@}
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -35,6 +35,8 @@
#include "sword25/gfx/image/imageloader.h"
#include "sword25/gfx/image/imageloader_ids.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "IMAGELOADER"
// Statische Elemente der Klasse BS_ImageLoader intialisieren.
@@ -133,3 +135,5 @@
BS_LOG_ERRORLN("Could not find suitable image loader for image data.");
return NULL;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/image/imageloader.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/imageloader.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/imageloader.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -52,6 +52,8 @@
#include <list>
#include "sword25/kernel/memlog_on.h"
+namespace Sword25 {
+
/**
@brief \xDCber die statischen Methoden dieser Klasse werden alle unterst\xFCtzten Bildformate geladen.
@@ -370,4 +372,6 @@
static bool _ImageLoaderListInitialized; // Gibt an, ob die Liste schon intialisiert wurde
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/image/imageloader_ids.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/imageloader_ids.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/imageloader_ids.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -47,6 +47,8 @@
#include "sword25/gfx/image/pngloader.h"
#include "sword25/gfx/image/b25sloader.h"
+namespace Sword25 {
+
// Die Tabelle enth\xE4lt Pointer auf statische Member-Funktionen innerhalb der Klassen, die eine Instanz der Klasse
// erzeugen
typedef BS_ImageLoader* (*BS_IMAGELOADER_NEW)();
@@ -57,3 +59,5 @@
};
const int BS_IMAGELOADER_COUNT = sizeof(BS_IMAGELOADER_IDS) / sizeof(BS_IMAGELOADER_NEW);
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -40,6 +40,8 @@
#include "sword25/gfx/image/pngloader.h"
#include <png.h>
+namespace Sword25 {
+
#define BS_LOG_PREFIX "PNGLOADER"
// -----------------------------------------------------------------------------
@@ -402,3 +404,5 @@
{
return DoIsCorrectImageFormat(FileDataPtr, FileSize);
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/image/pngloader.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/pngloader.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/pngloader.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -47,6 +47,8 @@
#include "sword25/kernel/common.h"
#include "sword25/gfx/image/imageloader.h"
+namespace Sword25 {
+
// Klassendefinition
class BS_PNGLoader : public BS_ImageLoader
{
@@ -76,4 +78,6 @@
bool ImageProperties(const char * FileDatePtr, unsigned int FileSize, BS_GraphicEngine::COLOR_FORMATS & ColorFormat, int & Width, int & Height);
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -45,6 +45,8 @@
using namespace std;
+namespace Sword25 {
+
#define BS_LOG_PREFIX "VECTORIMAGE"
@@ -584,3 +586,5 @@
BS_LOG_ERRORLN("SetContent() is not supported.");
return 0;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/image/vectorimage.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/vectorimage.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/vectorimage.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -48,6 +48,8 @@
#include "agg_color_rgba.h"
+namespace Sword25 {
+
class BS_VectorImage;
/**
@@ -179,4 +181,6 @@
BS_Rect m_BoundingBox;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -43,6 +43,8 @@
#include "agg_conv_stroke.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// CompoundShape
// -----------------------------------------------------------------------------
@@ -211,3 +213,5 @@
return true;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -52,6 +52,8 @@
#include "agg_trans_affine.h"
#include "agg_span_allocator.h"
+namespace Sword25 {
+
class BS_VectorImage;
@@ -88,4 +90,6 @@
agg::span_allocator<agg::rgba8> Alloc;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -42,6 +42,8 @@
#include "sword25/gfx/opengl/openglgfx.h"
#include "sword25/gfx/opengl/glimage.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "GLIMAGE"
// -----------------------------------------------------------------------------
@@ -221,3 +223,5 @@
return Result == GLS_OK;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/opengl/glimage.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/glimage.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/opengl/glimage.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -45,6 +45,8 @@
#include <vector>
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// FORWARD DECLARATION
// -----------------------------------------------------------------------------
@@ -97,4 +99,6 @@
int m_Height;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/opengl/glvectorimageblit.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/glvectorimageblit.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/opengl/glvectorimageblit.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -41,6 +41,9 @@
#include "sword25/util/glsprites/glsprites.h"
#include <vector>
+
+namespace Sword25 {
+
using namespace std;
#define BS_LOG_PREFIX "GLVECTORIMAGEBLIT"
@@ -146,3 +149,5 @@
return Result == GLS_OK;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -57,6 +57,8 @@
#include <algorithm>
+namespace Sword25 {
+
using namespace std;
#define BS_LOG_PREFIX "OPENGLGFX"
@@ -518,3 +520,5 @@
return result && Reader.IsGood();
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -49,6 +49,8 @@
#include "sword25/gfx/renderobjectptr.h"
#include "sword25/util/glsprites/glsprites.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// FORWARD DECLARATIONS
// -----------------------------------------------------------------------------
@@ -126,4 +128,6 @@
static void FlipImagedataVertical(unsigned int Width, unsigned int Height, std::vector<unsigned int> & Data);
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -41,6 +41,8 @@
#include "sword25/gfx/opengl/swimage.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "SWIMAGE"
@@ -138,3 +140,5 @@
return _ImageDataPtr[m_Width * Y + X];
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/opengl/swimage.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/swimage.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/opengl/swimage.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -44,6 +44,8 @@
#include "sword25/gfx/graphicengine.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// CLASS DEFINITION
// -----------------------------------------------------------------------------
@@ -81,4 +83,6 @@
int m_Height;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/panel.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/panel.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/panel.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -43,6 +43,8 @@
#include "sword25/gfx/graphicengine.h"
#include "sword25/gfx/image/image.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
#define BS_LOG_PREFIX "PANEL"
@@ -136,3 +138,5 @@
return Reader.IsGood() && Result;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/panel.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/panel.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/panel.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -42,6 +42,8 @@
#include "sword25/kernel/common.h"
#include "sword25/gfx/renderobject.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Class Definition
// -----------------------------------------------------------------------------
@@ -70,4 +72,6 @@
unsigned int m_Color;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/renderobject.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobject.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/renderobject.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -51,6 +51,8 @@
#include "sword25/gfx/text.h"
#include "sword25/gfx/animationtemplate.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "RENDEROBJECT"
// Konstruktion / Destruktion
@@ -584,3 +586,5 @@
// Falls der Z-Wert gleich ist, wird das weiter oben gelegenen Objekte zuerst gezeichnet.
return lhs->m_Y < rhs->m_Y;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -48,6 +48,8 @@
#include "sword25/gfx/timedrenderobject.h"
#include "sword25/gfx/rootrenderobject.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "RENDEROBJECTMANAGER"
// -----------------------------------------------------------------------------
@@ -176,3 +178,5 @@
return Result;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -54,6 +54,8 @@
#include "sword25/gfx/renderobjectptr.h"
#include "sword25/kernel/persistable.h"
+namespace Sword25 {
+
// Klassendefinition
class BS_Kernel;
class BS_Rect;
@@ -127,4 +129,6 @@
BS_RenderObjectPtr<BS_RenderObject> m_RootPtr; // Die Wurzel der Baumes
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectptr.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectptr.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectptr.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -42,6 +42,8 @@
#include "sword25/kernel/common.h"
#include "sword25/gfx/renderobjectregistry.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Forward Declarations
// -----------------------------------------------------------------------------
@@ -92,4 +94,6 @@
unsigned int m_Handle;
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -33,16 +33,18 @@
*/
// -----------------------------------------------------------------------------
-// Logging
+// Includes
// -----------------------------------------------------------------------------
-#define BS_LOG_PREFIX "RENDEROBJECTREGISTRY"
+#include "sword25/gfx/renderobjectregistry.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
-// Includes
+// Logging
// -----------------------------------------------------------------------------
-#include "sword25/gfx/renderobjectregistry.h"
+#define BS_LOG_PREFIX "RENDEROBJECTREGISTRY"
// -----------------------------------------------------------------------------
// Implementation
@@ -63,3 +65,5 @@
{
BS_LOG_WARNINGLN(Message);
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -46,6 +46,8 @@
#include <memory>
#include "sword25/kernel/memlog_on.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Forward Deklarationen
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/gfx/rootrenderobject.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/rootrenderobject.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/rootrenderobject.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -39,6 +39,8 @@
#include "sword25/kernel/common.h"
#include "sword25/gfx/renderobject.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Forward Declarations
// -----------------------------------------------------------------------------
@@ -65,4 +67,6 @@
virtual bool DoRender() { return true; }
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/screenshot.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/screenshot.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/screenshot.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -41,6 +41,8 @@
#include "sword25/gfx/screenshot.h"
#include <png.h>
+namespace Sword25 {
+
using namespace std;
// -----------------------------------------------------------------------------
@@ -215,3 +217,5 @@
// Bild als PNG Speichern.
return SaveToFile(200, 125, ThumbnailData, Filename);
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/screenshot.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/screenshot.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/screenshot.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -45,6 +45,8 @@
#include <vector>
#include "sword25/kernel/memlog_on.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Class declaration
// -----------------------------------------------------------------------------
@@ -56,4 +58,6 @@
static bool SaveThumbnailToFile(unsigned int Width, unsigned int Height, const std::vector<unsigned int> & Data, const std::string & Filename);
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -42,6 +42,8 @@
#include "sword25/kernel/outputpersistenceblock.h"
#include "sword25/kernel/inputpersistenceblock.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Logging
// -----------------------------------------------------------------------------
@@ -231,3 +233,5 @@
return Reader.IsGood() && Result;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/staticbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/staticbitmap.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/staticbitmap.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -42,6 +42,8 @@
#include "sword25/kernel/common.h"
#include "sword25/gfx/bitmap.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Klassendeklaration
// -----------------------------------------------------------------------------
@@ -81,4 +83,6 @@
bool InitBitmapResource(const std::string & Filename);
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/text.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/text.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -36,8 +36,6 @@
// Entweder Fontfile absolut abspeichern, oder Verzeichniswechseln verbieten
// Eine relative Fontfile-Angabe k\xF6nnte verwandt werden nachdem das Verzeichnis bereits gewechselt wurde und die Datei w\xFCrde nicht mehr gefunden
-#define BS_LOG_PREFIX "TEXT"
-
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
@@ -50,7 +48,10 @@
#include "sword25/gfx/text.h"
+namespace Sword25 {
+#define BS_LOG_PREFIX "TEXT"
+
// -----------------------------------------------------------------------------
// Konstanten
// -----------------------------------------------------------------------------
@@ -417,3 +418,5 @@
return Reader.IsGood() && Result;
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/text.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/text.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -47,6 +47,8 @@
#include <vector>
#include "sword25/kernel/memlog_on.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Forward Declarations
// -----------------------------------------------------------------------------
@@ -168,4 +170,6 @@
BS_FontResource * LockFontResource();
};
+} // End of namespace Sword25
+
#endif
Modified: scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp 2010-10-12 22:27:03 UTC (rev 53214)
@@ -36,6 +36,8 @@
#include "sword25/gfx/renderobjectmanager.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Konstruktion / Destruktion
// -----------------------------------------------------------------------------
@@ -52,3 +54,5 @@
BS_ASSERT(GetManager());
GetManager()->DetatchTimedRenderObject(this);
}
+
+} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/timedrenderobject.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/timedrenderobject.h 2010-10-12 22:25:18 UTC (rev 53213)
+++ scummvm/trunk/engines/sword25/gfx/timedrenderobject.h 2010-10-12 22:27:03 UTC (rev 53214)
@@ -43,6 +43,8 @@
#include "sword25/kernel/common.h"
#include "sword25/gfx/renderobject.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// Forward Declarations
// -----------------------------------------------------------------------------
@@ -70,3 +72,5 @@
*/
virtual void FrameNotification(int TimeElapsed) = 0;
};
+
+} // End of 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