summaryrefslogtreecommitdiffstats
path: root/client/gui/softtexture.h
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-02-04 18:37:14 +0100
committerAlexander Larsson <alexl@redhat.com>2010-02-04 18:49:05 +0100
commit90104b39aec42210bf823a1a5f23e1822f32c038 (patch)
tree1d898b1b2c45d5f04ffe5464e244bd701feab75b /client/gui/softtexture.h
parent16540e99531b301d55e896c2244ca099895e6062 (diff)
downloadspice-90104b39aec42210bf823a1a5f23e1822f32c038.tar.gz
spice-90104b39aec42210bf823a1a5f23e1822f32c038.tar.xz
spice-90104b39aec42210bf823a1a5f23e1822f32c038.zip
Revert automatic renames that were wrong
Seems my rename script didn't handle C++ namespaces that well.
Diffstat (limited to 'client/gui/softtexture.h')
-rw-r--r--client/gui/softtexture.h6
1 files changed, 3 insertions, 3 deletions
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);