Rename symbols that were changed in spice-protocol

This is an automatic change using:
$ find -name "*.[ch]" | xargs ../spice-protocol/rename-identifiers.sh ../spice-protocol/renames
$ find -name "*.cpp" | xargs ../spice-protocol/rename-identifiers.sh ../spice-protocol/renames

7 files changed, 45 insertions, 45 deletions

diff --git a/client/gui/gui.cpp b/client/gui/gui.cpp
index 4a63d5a9..885f7422 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::String& text)
+        MyListItem (const CEGUI::SpiceString& text)
             : CEGUI::ListboxTextItem(text)
         {
             setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush");
@@ -257,7 +257,7 @@ private:
 
     class UndimInfo {
     public:
-        UndimInfo(const CEGUI::String& name, float alpha, bool inherits)
+        UndimInfo(const CEGUI::SpiceString& name, float alpha, bool inherits)
             : _name (name)
             , _alpha (alpha)
             , _inherits (inherits)
@@ -275,7 +275,7 @@ private:
         }
 
     private:
-        CEGUI::String _name;
+        CEGUI::SpiceString _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::String text(res_get_string(STR_MESG_CONNECTING));
+        CEGUI::SpiceString 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::String font_name("DejaVuSans-10");
+    CEGUI::SpiceString font_name("DejaVuSans-10");
     CEGUI::Font* font;
 
     if (!CEGUI::FontManager::getSingleton().isFontPresent(font_name)) {
@@ -991,7 +991,7 @@ void GUI::update_layer_area()
         clear_area();
         return;
     }
-    Point screen_size = screen()->get_size();
+    SpicePoint screen_size = screen()->get_size();
 
     int dx = (screen_size.x - MAIN_GUI_WIDTH) / 2;
     int dy = (screen_size.y - MAIN_GUI_HEIGHT) / 2;
@@ -1010,8 +1010,8 @@ void GUI::update_layer_area()
             continue;
         }
 
-        CEGUI::Rect area = child->getPixelRect();
-        Rect r;
+        CEGUI::SpiceRect area = child->getPixelRect();
+        SpiceRect r;
         r.left = (int)area.d_left + dx;
         r.right = (int)area.d_right + dx;
         r.top = (int)area.d_top + dy;
@@ -1030,13 +1030,13 @@ void GUI::copy_pixels(const QRegion& dest_region, RedDrawable& dest)
     }
 
     for (int i = 0; i < (int)dest_region.num_rects; i++) {
-        Rect* r = &dest_region.rects[i];
+        SpiceRect* r = &dest_region.rects[i];
         _pixmap->copy_pixels(dest, r->left, r->top, *r);
     }
 
     _gui_system->renderGUI();
     for (int i = 0; i < (int)dest_region.num_rects; i++) {
-        Rect* r = &dest_region.rects[i];
+        SpiceRect* r = &dest_region.rects[i];
         dest.copy_pixels(*_pixmap, r->left, r->top, *r);
     }
 }
@@ -1145,23 +1145,23 @@ void GUI::on_mouse_button_press(int button, int buttons_state)
 {
     _app.set_key_handler(*this);
     switch (button) {
-    case REDC_MOUSE_LBUTTON:
+    case SPICE_MOUSE_BUTTON_LEFT:
         _gui_system->injectMouseButtonDown(CEGUI::LeftButton);
         break;
-    case REDC_MOUSE_MBUTTON:
+    case SPICE_MOUSE_BUTTON_MIDDLE:
         _gui_system->injectMouseButtonDown(CEGUI::MiddleButton);
         break;
-    case REDC_MOUSE_RBUTTON:
+    case SPICE_MOUSE_BUTTON_RIGHT:
         _gui_system->injectMouseButtonDown(CEGUI::RightButton);
         break;
-    case REDC_MOUSE_UBUTTON:
+    case SPICE_MOUSE_BUTTON_UP:
         _gui_system->injectMouseWheelChange(-1);
         break;
-    case REDC_MOUSE_DBUTTON:
+    case SPICE_MOUSE_BUTTON_DOWN:
         _gui_system->injectMouseWheelChange(1);
         break;
     default:
-        THROW("invalid RedButton %d", button);
+        THROW("invalid SpiceMouseButton %d", button);
     }
     conditional_update();
 }
@@ -1169,20 +1169,20 @@ void GUI::on_mouse_button_press(int button, int buttons_state)
 void GUI::on_mouse_button_release(int button, int buttons_state)
 {
     switch (button) {
-    case REDC_MOUSE_LBUTTON:
+    case SPICE_MOUSE_BUTTON_LEFT:
         _gui_system->injectMouseButtonUp(CEGUI::LeftButton);
         break;
-    case REDC_MOUSE_MBUTTON:
+    case SPICE_MOUSE_BUTTON_MIDDLE:
         _gui_system->injectMouseButtonUp(CEGUI::MiddleButton);
         break;
-    case REDC_MOUSE_RBUTTON:
+    case SPICE_MOUSE_BUTTON_RIGHT:
         _gui_system->injectMouseButtonUp(CEGUI::RightButton);
         break;
-    case REDC_MOUSE_UBUTTON:
-    case REDC_MOUSE_DBUTTON:
+    case SPICE_MOUSE_BUTTON_UP:
+    case SPICE_MOUSE_BUTTON_DOWN:
         break;
     default:
-        THROW("invalid RedButton %d", button);
+        THROW("invalid SpiceMouseButton %d", button);
     }
     conditional_update();
 }
diff --git a/client/gui/resource_provider.cpp b/client/gui/resource_provider.cpp
index 47f86a43..b194ea9e 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::String &filename,
+void CEGUIResourceProvider::loadRawDataContainer(const CEGUI::SpiceString &filename,
                                               CEGUI::RawDataContainer &output,
-                                              const CEGUI::String &resourceGroup)
+                                              const CEGUI::SpiceString &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 1443abe4..b418c4dd 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::String &filename,
+    virtual void loadRawDataContainer(const CEGUI::SpiceString &filename,
                                       CEGUI::RawDataContainer &output,
-                                      const CEGUI::String &resourceGroup);
+                                      const CEGUI::SpiceString &resourceGroup);
 
     virtual void unloadRawDataContainer(CEGUI::RawDataContainer& data);
 };
diff --git a/client/gui/softrenderer.cpp b/client/gui/softrenderer.cpp
index 87fffb8b..ca69cce4 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
-    String _default_codec_name(STRINGIZE(TGAImageCodec/*CEGUI_DEFAULT_IMAGE_CODEC*/));
+    SpiceString _default_codec_name(STRINGIZE(TGAImageCodec/*CEGUI_DEFAULT_IMAGE_CODEC*/));
     DynamicModule* module = NULL;
 
     try {
-        DynamicModule* module = new DynamicModule(String("CEGUI") + _default_codec_name);
+        DynamicModule* module = new DynamicModule(SpiceString("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 Rect& dest_rect, float z, const Texture* texture,
-                   const Rect& texture_rect, const ColourRect& colours,
+void SoftRenderer::addQuad(const SpiceRect& dest_rect, float z, const Texture* texture,
+                   const SpiceRect& 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 String& filename,
-                                     const String& resourceGroup)
+Texture* SoftRenderer::createTexture(const SpiceString& filename,
+                                     const SpiceString& 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);
 }
 
-Rect SoftRenderer::getRect() const
+SpiceRect SoftRenderer::getRect() const
 {
-    return Rect(0, 0, (float)_width, (float)_height);
+    return SpiceRect(0, 0, (float)_width, (float)_height);
 }
 
 uint SoftRenderer::getHorzScreenDPI() const
diff --git a/client/gui/softrenderer.h b/client/gui/softrenderer.h
index 9fc1a29e..1cab0a24 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 Rect& dest_rect, float z, const Texture* tex,
-                            const Rect& texture_rect, const ColourRect& colours,
+        virtual void addQuad(const SpiceRect& dest_rect, float z, const Texture* tex,
+                            const SpiceRect& 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 String& filename,
-                                       const String& resourceGroup);
+        virtual Texture* createTexture(const SpiceString& filename,
+                                       const SpiceString& 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 Rect getRect() const;
+        virtual SpiceRect getRect() const;
 
         virtual uint getHorzScreenDPI() const;
         virtual uint getVertScreenDPI() const;
diff --git a/client/gui/softtexture.cpp b/client/gui/softtexture.cpp
index 562edeab..983374ae 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 String& filename,
-                         const String& resourceGroup)
+SoftTexture::SoftTexture(Renderer* owner, const SpiceString& filename,
+                         const SpiceString& resourceGroup)
     : Texture (owner)
     , _surf (NULL)
     , _width (0)
@@ -57,7 +57,7 @@ void SoftTexture::freeSurf()
     _surf = NULL;
 }
 
-void SoftTexture::loadFromFile(const String& filename, const String& resourceGroup)
+void SoftTexture::loadFromFile(const SpiceString& filename, const SpiceString& resourceGroup)
 {
     freeSurf();
     SoftRenderer* renderer = static_cast<SoftRenderer*>(getRenderer());
diff --git a/client/gui/softtexture.h b/client/gui/softtexture.h
index 37617f29..f3797d9a 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 String& filename,
-                    const String& resourceGroup);
+        SoftTexture(Renderer* owner, const SpiceString& filename,
+                    const SpiceString& resourceGroup);
         virtual ~SoftTexture();
 
         virtual ushort getWidth(void) const { return _width;}
         virtual ushort getHeight(void) const { return _height;}
 
-        virtual void loadFromFile(const String& filename, const String& resourceGroup);
+        virtual void loadFromFile(const SpiceString& filename, const SpiceString& resourceGroup);
         virtual void loadFromMemory(const void* buffPtr, uint buffWidth, uint buffHeight,
                                     PixelFormat pixelFormat);