Revert automatic renames that were wrong

Seems my rename script didn't handle C++ namespaces that well.

7 files changed, 29 insertions, 29 deletions

diff --git a/client/gui/gui.cpp b/client/gui/gui.cpp
index 885f7422..e4d69ee0 100644
--- a/client/gui/gui.cpp
+++ b/client/gui/gui.cpp
@@ -81,7 +81,7 @@ public:
 
     class MyListItem : public CEGUI::ListboxTextItem {
     public:
-        MyListItem (const CEGUI::SpiceString& text)
+        MyListItem (const CEGUI::String& text)
             : CEGUI::ListboxTextItem(text)
         {
             setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush");
@@ -257,7 +257,7 @@ private:
 
     class UndimInfo {
     public:
-        UndimInfo(const CEGUI::SpiceString& name, float alpha, bool inherits)
+        UndimInfo(const CEGUI::String& name, float alpha, bool inherits)
             : _name (name)
             , _alpha (alpha)
             , _inherits (inherits)
@@ -275,7 +275,7 @@ private:
         }
 
     private:
-        CEGUI::SpiceString _name;
+        CEGUI::String _name;
         float _alpha;
         bool _inherits;
 
@@ -736,7 +736,7 @@ ConnectingDialog::ConnectingDialog(GUI& gui)
         int y_pos = (MAIN_GUI_HEIGHT - CONNECTING_DIALOG_HEIGHT) / 2;
         set_win_pos(wnd, x_pos, y_pos);
         set_win_size(wnd, CONNECTING_DIALOG_WIDTH, CONNECTING_DIALOG_HEIGHT);
-        CEGUI::SpiceString text(res_get_string(STR_MESG_CONNECTING));
+        CEGUI::String text(res_get_string(STR_MESG_CONNECTING));
         wnd->setText(text + " " + application().get_host());
         wnd->setProperty("HorzFormatting", "LeftAligned");
         wnd->setProperty("VertFormatting", "TopAligned");
@@ -924,7 +924,7 @@ void GUI::init_cegui()
     _gui_system->setDefaultMouseCursor("TaharezLook", "MouseArrow");
     _gui_system->setDefaultTooltip("TaharezLook/Tooltip");
 
-    CEGUI::SpiceString font_name("DejaVuSans-10");
+    CEGUI::String font_name("DejaVuSans-10");
     CEGUI::Font* font;
 
     if (!CEGUI::FontManager::getSingleton().isFontPresent(font_name)) {
@@ -1010,7 +1010,7 @@ void GUI::update_layer_area()
             continue;
         }
 
-        CEGUI::SpiceRect area = child->getPixelRect();
+        CEGUI::Rect area = child->getPixelRect();
         SpiceRect r;
         r.left = (int)area.d_left + dx;
         r.right = (int)area.d_right + dx;
diff --git a/client/gui/resource_provider.cpp b/client/gui/resource_provider.cpp
index b194ea9e..47f86a43 100644
--- a/client/gui/resource_provider.cpp
+++ b/client/gui/resource_provider.cpp
@@ -19,9 +19,9 @@
 //{"; od -txC -v <in file name> | sed -e "s/^[0-9]*//" -e s"/ \([0-9a-f][0-9a-f]\)/0x\1,/g" -e"\$d"
 //| sed -e"\$s/,$/};/") > <out file name>.c
 
-void CEGUIResourceProvider::loadRawDataContainer(const CEGUI::SpiceString &filename,
+void CEGUIResourceProvider::loadRawDataContainer(const CEGUI::String &filename,
                                               CEGUI::RawDataContainer &output,
-                                              const CEGUI::SpiceString &resourceGroup)
+                                              const CEGUI::String &resourceGroup)
 {
     DBG(0, "%s", filename.c_str());
     if (strcmp(filename.c_str(), "TaharezLook.scheme") == 0) {
diff --git a/client/gui/resource_provider.h b/client/gui/resource_provider.h
index b418c4dd..1443abe4 100644
--- a/client/gui/resource_provider.h
+++ b/client/gui/resource_provider.h
@@ -5,9 +5,9 @@
 
 class CEGUIResourceProvider: public CEGUI::ResourceProvider {
 public:
-    virtual void loadRawDataContainer(const CEGUI::SpiceString &filename,
+    virtual void loadRawDataContainer(const CEGUI::String &filename,
                                       CEGUI::RawDataContainer &output,
-                                      const CEGUI::SpiceString &resourceGroup);
+                                      const CEGUI::String &resourceGroup);
 
     virtual void unloadRawDataContainer(CEGUI::RawDataContainer& data);
 };
diff --git a/client/gui/softrenderer.cpp b/client/gui/softrenderer.cpp
index ca69cce4..87fffb8b 100644
--- a/client/gui/softrenderer.cpp
+++ b/client/gui/softrenderer.cpp
@@ -62,11 +62,11 @@ void SoftRenderer::setupImageCodec()
     _destroy_image_codec = destroyImageCodec;
     _image_codec = createImageCodec();
 #else
-    SpiceString _default_codec_name(STRINGIZE(TGAImageCodec/*CEGUI_DEFAULT_IMAGE_CODEC*/));
+    String _default_codec_name(STRINGIZE(TGAImageCodec/*CEGUI_DEFAULT_IMAGE_CODEC*/));
     DynamicModule* module = NULL;
 
     try {
-        DynamicModule* module = new DynamicModule(SpiceString("CEGUI") + _default_codec_name);
+        DynamicModule* module = new DynamicModule(String("CEGUI") + _default_codec_name);
 
         _destroy_image_codec = (void(*)(ImageCodec*))module->getSymbolAddress("destroyImageCodec");
 
@@ -228,8 +228,8 @@ inline void SoftRenderer::setRGB(ColourI& dest, const colour& src)
     dest.a = uint8_t(src.getAlpha() * 255);
 }
 
-void SoftRenderer::addQuad(const SpiceRect& dest_rect, float z, const Texture* texture,
-                   const SpiceRect& texture_rect, const ColourRect& colours,
+void SoftRenderer::addQuad(const Rect& dest_rect, float z, const Texture* texture,
+                   const Rect& texture_rect, const ColourRect& colours,
                    QuadSplitMode quad_split_mode)
 {
     if (dest_rect.d_right <= dest_rect.d_left || dest_rect.d_bottom <= dest_rect.d_top) {
@@ -300,8 +300,8 @@ Texture* SoftRenderer::createTexture()
     return texture;
 }
 
-Texture* SoftRenderer::createTexture(const SpiceString& filename,
-                                     const SpiceString& resourceGroup)
+Texture* SoftRenderer::createTexture(const String& filename,
+                                     const String& resourceGroup)
 {
     SoftTexture* texture = new SoftTexture(this, filename, resourceGroup);
     _textures.push_back(texture);
@@ -354,9 +354,9 @@ Size SoftRenderer::getSize() const
     return Size((float)_width, (float)_height);
 }
 
-SpiceRect SoftRenderer::getRect() const
+Rect SoftRenderer::getRect() const
 {
-    return SpiceRect(0, 0, (float)_width, (float)_height);
+    return Rect(0, 0, (float)_width, (float)_height);
 }
 
 uint SoftRenderer::getHorzScreenDPI() const
diff --git a/client/gui/softrenderer.h b/client/gui/softrenderer.h
index 1cab0a24..9fc1a29e 100644
--- a/client/gui/softrenderer.h
+++ b/client/gui/softrenderer.h
@@ -24,8 +24,8 @@ namespace CEGUI
 
         void reset_surface(uint8_t* surface, uint width, uint height, uint stride);
 
-        virtual void addQuad(const SpiceRect& dest_rect, float z, const Texture* tex,
-                            const SpiceRect& texture_rect, const ColourRect& colours,
+        virtual void addQuad(const Rect& dest_rect, float z, const Texture* tex,
+                            const Rect& texture_rect, const ColourRect& colours,
                             QuadSplitMode quad_split_mode);
         virtual void doRender();
         virtual void clearRenderList();
@@ -33,8 +33,8 @@ namespace CEGUI
         virtual bool isQueueingEnabled() const;
 
         virtual Texture* createTexture();
-        virtual Texture* createTexture(const SpiceString& filename,
-                                       const SpiceString& resourceGroup);
+        virtual Texture* createTexture(const String& filename,
+                                       const String& resourceGroup);
         virtual Texture* createTexture(float size);
         virtual void destroyTexture(Texture* texture);
         virtual void destroyAllTextures();
@@ -43,7 +43,7 @@ namespace CEGUI
         virtual float getWidth() const;
         virtual float getHeight() const;
         virtual Size getSize() const;
-        virtual SpiceRect getRect() const;
+        virtual Rect getRect() const;
 
         virtual uint getHorzScreenDPI() const;
         virtual uint getVertScreenDPI() const;
diff --git a/client/gui/softtexture.cpp b/client/gui/softtexture.cpp
index 983374ae..562edeab 100644
--- a/client/gui/softtexture.cpp
+++ b/client/gui/softtexture.cpp
@@ -34,8 +34,8 @@ SoftTexture::SoftTexture(Renderer* owner, uint size)
 
 }
 
-SoftTexture::SoftTexture(Renderer* owner, const SpiceString& filename,
-                         const SpiceString& resourceGroup)
+SoftTexture::SoftTexture(Renderer* owner, const String& filename,
+                         const String& resourceGroup)
     : Texture (owner)
     , _surf (NULL)
     , _width (0)
@@ -57,7 +57,7 @@ void SoftTexture::freeSurf()
     _surf = NULL;
 }
 
-void SoftTexture::loadFromFile(const SpiceString& filename, const SpiceString& resourceGroup)
+void SoftTexture::loadFromFile(const String& filename, const String& resourceGroup)
 {
     freeSurf();
     SoftRenderer* renderer = static_cast<SoftRenderer*>(getRenderer());
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);