From 90104b39aec42210bf823a1a5f23e1822f32c038 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 4 Feb 2010 18:37:14 +0100 Subject: Revert automatic renames that were wrong Seems my rename script didn't handle C++ namespaces that well. --- client/gui/softtexture.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'client/gui/softtexture.h') diff --git a/client/gui/softtexture.h b/client/gui/softtexture.h index f3797d9a..37617f29 100644 --- a/client/gui/softtexture.h +++ b/client/gui/softtexture.h @@ -13,14 +13,14 @@ namespace CEGUI public: SoftTexture(Renderer* owner); SoftTexture(Renderer* owner, uint size); - SoftTexture(Renderer* owner, const SpiceString& filename, - const SpiceString& resourceGroup); + SoftTexture(Renderer* owner, const String& filename, + const String& resourceGroup); virtual ~SoftTexture(); virtual ushort getWidth(void) const { return _width;} virtual ushort getHeight(void) const { return _height;} - virtual void loadFromFile(const SpiceString& filename, const SpiceString& resourceGroup); + virtual void loadFromFile(const String& filename, const String& resourceGroup); virtual void loadFromMemory(const void* buffPtr, uint buffWidth, uint buffHeight, PixelFormat pixelFormat); -- cgit