Index: src/guiengine/widgets/CGUIEditBox.h
===================================================================
--- src/guiengine/widgets/CGUIEditBox.h	(revisjon 10895)
+++ src/guiengine/widgets/CGUIEditBox.h	(arbeidskopi)
@@ -36,7 +36,7 @@
 		virtual void setOverrideColor(video::SColor color);
 
 		//! Gets the override color
-		virtual video::SColor const & getOverrideColor() const;
+		virtual video::SColor getOverrideColor() const;
 
 		//! Sets if the text should use the overide color or the
 		//! color in the gui skin.
Index: src/guiengine/widgets/CGUIEditBox.cpp
===================================================================
--- src/guiengine/widgets/CGUIEditBox.cpp	(revisjon 10895)
+++ src/guiengine/widgets/CGUIEditBox.cpp	(arbeidskopi)
@@ -115,7 +115,7 @@
 }
 
 
-video::SColor const& CGUIEditBox::getOverrideColor() const
+video::SColor CGUIEditBox::getOverrideColor() const
 {
 	return OverrideColor;
 }
Index: src/graphics/material.cpp
===================================================================
--- src/graphics/material.cpp	(revisjon 10895)
+++ src/graphics/material.cpp	(arbeidskopi)
@@ -512,7 +512,7 @@
         // customizable EMT_ONETEXTURE_BLEND instead
         m->MaterialType = video::EMT_ONETEXTURE_BLEND ;
         m->MaterialTypeParam = 
-            pack_texureBlendFunc(video::EBF_SRC_ALPHA, 
+            pack_textureBlendFunc(video::EBF_SRC_ALPHA, 
                                  video::EBF_ONE_MINUS_SRC_ALPHA,
                                  video::EMFN_MODULATE_1X, 
                                  video::EAS_TEXTURE | video::EAS_VERTEX_COLOR);
@@ -539,7 +539,7 @@
         // account, which messes up fading in/out effects. So we use the 
         // more customizable EMT_ONETEXTURE_BLEND instead
         m->MaterialType = video::EMT_ONETEXTURE_BLEND ;
-        m->MaterialTypeParam = pack_texureBlendFunc(video::EBF_SRC_ALPHA, 
+        m->MaterialTypeParam = pack_textureBlendFunc(video::EBF_SRC_ALPHA, 
                                                     video::EBF_ONE,
                                                     video::EMFN_MODULATE_1X,
                                                     video::EAS_TEXTURE | 
Index: src/io/xml_writer.cpp
===================================================================
--- src/io/xml_writer.cpp	(revisjon 10895)
+++ src/io/xml_writer.cpp	(arbeidskopi)
@@ -23,7 +23,6 @@
 #include <stdexcept>
 using namespace irr;
 
-#if IRRLICHT_VERSION_MAJOR > 1 || (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8)
 
 // ----------------------------------------------------------------------------
 
@@ -63,44 +62,3 @@
     m_base.close();
 }
 
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-#else // Non-unicode version for irrlicht 1.7 and before
-
-XMLWriter::XMLWriter(const char* dest) : m_base(dest, std::ios::out | std::ios::binary)
-{
-    if (!m_base.is_open())
-    {
-        throw std::runtime_error("Failed to open file for writing : " + std::string(dest));
-    }
-}
-
-// ----------------------------------------------------------------------------
-
-XMLWriter& XMLWriter::operator<< (const irr::core::stringw& txt)
-{
-    core::stringc s( txt.c_str() );
-    m_base.write((char *) s.c_str(), s.size());
-    return *this;
-}
-
-// ----------------------------------------------------------------------------
-
-XMLWriter& XMLWriter::operator<< (const wchar_t*txt)
-{
-    core::stringc s( txt );
-    m_base.write((char *) s.c_str(), s.size());
-    return *this;
-}
-
-// ----------------------------------------------------------------------------
-
-void XMLWriter::close()
-{
-    m_base.close();
-}
-
-// ----------------------------------------------------------------------------
-
-#endif