Merge lp:~unity-team/nux/nstring into lp:nux

[Jay Taoko]

* Removal of nux::NString in favor of std::string.
* The branch has a lot of changes due to the enablement of -Werror. All the warnings have been fixed.
* -Werror is disabled when building with --enable-debug.

[Test] The changes are covered by existing tests.

[lp:~unity-team/nux/nstring]

689. By Jay Taoko on 2012-10-11

* Removing commented code.* Update to configure.ac.

[Jay Taoko (jaytaoko)]

This branch has been replaced with
https://code.launchpad.net/~unity-team/unity/unity.nstring-removal/+merge/129234

review: Abstain

Unmerged revisions

=== modified file 'Nux/AbstractComboBox.cpp'
--- Nux/AbstractComboBox.cpp	2012-10-02 07:32:55 +0000
+++ Nux/AbstractComboBox.cpp	2012-10-11 16:27:25 +0000
@@ -73,7 +73,7 @@
     GetPainter().PaintShape(graphics_engine, base, m_sCOMBO_COLOR,  eSHAPE_CORNER_ROUND4);
 
     {
-      //GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), _combo_box_area->GetGeometry(), _combo_box_area->GetBaseString().GetTCharPtr(), GetTextColor(), eAlignTextLeft);
+      //GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), _combo_box_area->GetGeometry(), _combo_box_area->GetBaseString().c_str(), GetTextColor(), eAlignTextLeft);
       _pango_static_text->SetGeometry(_combo_box_area->GetGeometry());
       _pango_static_text->ProcessDraw(graphics_engine, true);
     }

=== modified file 'Nux/ActionItem.cpp'
--- Nux/ActionItem.cpp	2012-09-26 06:44:12 +0000
+++ Nux/ActionItem.cpp	2012-10-11 16:27:25 +0000
@@ -133,7 +133,7 @@
 
   const char *ActionItem::GetLabel() const
   {
-    return m_Label.GetTCharPtr();
+    return m_Label.c_str();
   }
 
   void ActionItem::SetIcon(const BaseTexture* icon)

=== modified file 'Nux/ActionItem.h'
--- Nux/ActionItem.h	2011-04-06 21:54:09 +0000
+++ Nux/ActionItem.h	2012-10-11 16:27:25 +0000
@@ -67,7 +67,7 @@
     //! A value defined by the user at construction time.
     int m_UserValue;
     BaseTexture* m_Icon;
-    NString m_Label;
+    std::string m_Label;
     bool m_IsActivated;
     MenuPage *m_Menu;
     bool m_Enable;

=== modified file 'Nux/BaseWindow.h'
--- Nux/BaseWindow.h	2012-10-02 07:32:55 +0000
+++ Nux/BaseWindow.h	2012-10-11 16:27:25 +0000
@@ -185,7 +185,7 @@
     //! Emit a signal when the BaseWindow becomes hidden.
     sigc::signal<void, BaseWindow*> sigHidden;
 
-    NString GetWindowName()
+    std::string GetWindowName()
     {
       return _name;
     }
@@ -251,7 +251,7 @@
     //! Contains the background of the texture. Can be used to blur. It is set by the window compositor.
     ObjectPtr<BaseTexture> _background_texture;
 
-    NString _name;
+    std::string _name;
     bool _size_match_layout;
     bool _is_visible;
     bool _is_modal;

=== modified file 'Nux/ColorPreview.cpp'
--- Nux/ColorPreview.cpp	2012-10-02 07:32:55 +0000
+++ Nux/ColorPreview.cpp	2012-10-11 16:27:25 +0000
@@ -27,6 +27,9 @@
 #include "TimerProc.h"
 #include "StaticTextBox.h"
 
+#include <sstream>
+#include <iomanip>
+
 namespace nux
 {
 
@@ -50,8 +53,12 @@
     m_ColorValue->SetFont(GetSysBoldFont());
     m_ColorValue->SetMinimumWidth(128);
 
-    NString text = NString::Printf("[ R:%d, G:%d, B:%d ]", (int) (m_Color.red * 255), (int) (m_Color.green * 255), (int) (m_Color.blue * 255));
-    m_ColorValue->SetText(text);
+    std::stringstream s;
+    s << "[ R:" << (int)(m_Color.red * 255)
+      << ", G:" << (int)(m_Color.green * 255)
+      << ", B:" << (int)(m_Color.blue * 255)
+      << " ]";
+    m_ColorValue->SetText(s.str());
 
     m_ColorArea->mouse_click.connect(sigc::mem_fun(this, &ColorPreview::RecvClick));
 

=== modified file 'Nux/Coverflow.cpp'
--- Nux/Coverflow.cpp	2012-09-26 06:44:12 +0000
+++ Nux/Coverflow.cpp	2012-10-11 16:27:25 +0000
@@ -286,8 +286,8 @@
 
     text_loader_.font_size = 10;
 
-    NString resource_path = NUX_FIND_RESOURCE_LOCATION_NOFAIL("UITextures/coverflow.oval-shadow.png");
-    BaseTexture* texture = LoadTextureFromFile(resource_path.GetTCharPtr());
+    std::string resource_path = NUX_FIND_RESOURCE_LOCATION_NOFAIL("UITextures/coverflow.oval-shadow.png");
+    BaseTexture* texture = LoadTextureFromFile(resource_path.c_str());
     drop_shadow_texture_ = texture->GetDeviceTexture();
     texture->UnReference();
 

=== modified file 'Nux/DoubleValidator.cpp'
--- Nux/DoubleValidator.cpp	2012-09-19 04:53:45 +0000
+++ Nux/DoubleValidator.cpp	2012-10-11 16:27:25 +0000
@@ -23,6 +23,9 @@
 #include "Nux.h"
 #include "DoubleValidator.h"
 
+#include <sstream>
+#include <iomanip>
+
 namespace nux
 {
 
@@ -127,10 +130,11 @@
     m_Decimals = Clamp<int> (dec, 0, 13);
   }
 
-  NString DoubleValidator::ToString(double d)
+  std::string DoubleValidator::ToString(double d)
   {
-    NString Prec = NString("%.") + NString::Printf("%d", m_Decimals) + NString("f");
-    return NString::Printf(Prec.GetTCharPtr(), d);
+    std::stringstream s;
+    s << std::setprecision(m_Decimals) << d;
+    return s.str();
   }
 
   double DoubleValidator::ToDouble(const char *str)

=== modified file 'Nux/DoubleValidator.h'
--- Nux/DoubleValidator.h	2011-10-17 21:23:50 +0000
+++ Nux/DoubleValidator.h	2012-10-11 16:27:25 +0000
@@ -52,7 +52,7 @@
     void SetMaximum(double value);
     double GetMaximum() const;
 
-    NString ToString(double d);
+    std::string ToString(double d);
     double ToDouble(const char *str);
 
   private:

=== modified file 'Nux/EditTextBox.cpp'
--- Nux/EditTextBox.cpp	2012-10-02 07:32:55 +0000
+++ Nux/EditTextBox.cpp	2012-10-11 16:27:25 +0000
@@ -160,7 +160,7 @@
       {
 
         GetPainter().PaintColorTextLineEdit(graphics_engine, GetGeometry(),
-                                         m_KeyboardHandler.GetTextLine().m_string,
+                                         m_KeyboardHandler.GetTextLine(),
                                          GetTextColor(),
                                          m_WriteAlpha,
                                          m_SelectedTextColor,
@@ -177,7 +177,7 @@
       else
       {
         GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(),
-                                      m_KeyboardHandler.GetTextLine().m_string,
+                                      m_KeyboardHandler.GetTextLine(),
                                       GetTextColor());
       }
     }
@@ -189,34 +189,30 @@
 
   }
 
-  void EditTextBox::SetText(const char &Caption)
-  {
-    NString s(Caption);
-    SetText(s);
-  }
-
   void EditTextBox::SetText(const char *Caption)
   {
-    NString s(Caption);
-    SetText(s);
-  }
-
-  void EditTextBox::SetText(const tstring &Caption)
-  {
-    NString s(Caption);
-    SetText(s);
-  }
-
-  void EditTextBox::SetText(const NString &Caption)
-  {
-    NString s(Caption);
-    s.RemovePrefix(m_Prefix);
-    s.RemoveSuffix(m_Suffix);
-
-    if (ValidateKeyboardEntry(s.GetTCharPtr()))
+    std::string s(Caption);
+    SetText(s);
+  }
+
+  void EditTextBox::SetText(const std::string &Caption)
+  {
+    std::string s(Caption);
+    size_t pos = s.find(m_Prefix, 0);
+    if (pos == 0)
+    {
+      s.erase(0, m_Prefix.size());
+    }
+    pos = s.rfind(m_Suffix);
+    if (pos != std::string::npos && pos == s.size() - m_Suffix.size())
+    {
+      s.erase(pos);
+    }
+
+    if (ValidateKeyboardEntry(s.c_str()))
     {
       m_Text = (m_Prefix + s) + m_Suffix;
-      m_KeyboardHandler.SetText(m_Text.GetTStringRef());
+      m_KeyboardHandler.SetText(m_Text);
       m_temporary_caption = m_Text;
       sigSetText.emit(this);
     }
@@ -227,16 +223,24 @@
 
   const char *EditTextBox::GetText() const
   {
-    return m_Text.GetTCharPtr();
+    return m_Text.c_str();
   }
 
 //! Return a caption string striping out the prefix and the suffix
-  NString EditTextBox::GetCleanText() const
+  std::string EditTextBox::GetCleanText() const
   {
-    NString CleanText(m_Text);
-    CleanText.RemovePrefix(m_Prefix);
-    CleanText.RemoveSuffix(m_Suffix);
-    return CleanText.m_string;
+    std::string CleanText(m_Text);
+    size_t pos = CleanText.find(m_Prefix, 0);
+    if (pos == 0)
+    {
+      CleanText.erase(0, m_Prefix.size());
+    }
+    pos = CleanText.rfind(m_Suffix);
+    if (pos != std::string::npos && pos == CleanText.size() - m_Suffix.size())
+    {
+      CleanText.erase(pos);
+    }
+    return CleanText;
   }
 
   void EditTextBox::RecvMouseDoubleClick(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
@@ -337,10 +341,14 @@
 
     if (keysym == NUX_VK_ENTER || keysym == NUX_KP_ENTER)
     {
-      NString str(m_KeyboardHandler.GetTextLine());
-      str.RemoveSuffix(m_Suffix);
+      std::string str(m_KeyboardHandler.GetTextLine());
+      size_t pos = str.rfind(m_Suffix);
+      if (pos != std::string::npos && pos == str.size() - m_Suffix.size())
+      {
+        str.erase(pos);
+      }
 
-      if (ValidateKeyboardEntry(str.m_string.c_str()))
+      if (ValidateKeyboardEntry(str.c_str()))
       {
         m_Text = m_KeyboardHandler.GetTextLine();
         m_temporary_caption = m_Text;
@@ -392,7 +400,7 @@
 
   void EditTextBox::EnteringKeyboardFocus()
   {
-    m_KeyboardHandler.SetText(m_Text.GetTStringRef());
+    m_KeyboardHandler.SetText(m_Text);
     m_KeyboardHandler.SelectAllText();
     // Preserve the current caption text. If ESC is pressed while we have keyboard focus then
     // the previous caption text is restored
@@ -403,25 +411,33 @@
 
   void EditTextBox::QuitingKeyboardFocus()
   {
-    NString CleanText(m_KeyboardHandler.GetTextLine());
-    CleanText.RemovePrefix(m_Prefix);
-    CleanText.RemoveSuffix(m_Suffix);
+    std::string CleanText(m_KeyboardHandler.GetTextLine());
+    size_t pos = CleanText.find(m_Prefix, 0);
+    if (pos == 0)
+    {
+      CleanText.erase(0, m_Prefix.size());
+    }
+    pos = CleanText.rfind(m_Suffix);
+    if (pos != std::string::npos && pos == CleanText.size() - m_Suffix.size())
+    {
+      CleanText.erase(pos);
+    }
 
-    if (ValidateKeyboardEntry(CleanText.GetTCharPtr()))
+    if (ValidateKeyboardEntry(CleanText.c_str()))
     {
       CleanText = m_Prefix + CleanText;
       CleanText = CleanText + m_Suffix;
 
-      m_Text = CleanText.m_string; //m_KeyboardHandler.GetTextLine();
-      m_KeyboardHandler.SetText(CleanText.m_string);
+      m_Text = CleanText; //m_KeyboardHandler.GetTextLine();
+      m_KeyboardHandler.SetText(CleanText);
       m_temporary_caption = m_Text;
-      sigValidateKeyboardEntry.emit(this, m_Text.GetTStringRef());
+      sigValidateKeyboardEntry.emit(this, m_Text);
       sigValidateEntry.emit(this);
     }
     else
     {
       m_Text = m_temporary_caption;
-      m_KeyboardHandler.SetText(m_Text.GetTStringRef());
+      m_KeyboardHandler.SetText(m_Text);
       m_KeyboardHandler.SelectAllText();
     }
 
@@ -450,12 +466,12 @@
 
   void EditTextBox::SetDoubleValue(double d)
   {
-    SetText(NString::Printf("%f", d));
+    SetText(std::to_string((long double)d));
   }
 
   void EditTextBox::SetIntegerValue(int i)
   {
-    SetText(NString::Printf("%d", i));
+    SetText(std::to_string((long long)i));
   }
 
   void EditTextBox::SetTextBackgroundColor(const Color &color)

=== modified file 'Nux/EditTextBox.h'
--- Nux/EditTextBox.h	2012-10-02 07:32:55 +0000
+++ Nux/EditTextBox.h	2012-10-11 16:27:25 +0000
@@ -49,21 +49,19 @@
       unsigned int keysym,
       const char* character);
 
-    void SetText(const char &Caption);
     void SetText(const char *Caption);
-    void SetText(const tstring &Caption);
-    void SetText(const NString &Caption);
+    void SetText(const std::string &Caption);
     const char *GetText() const;
     unsigned int GetTextSize() const
     {
-      return (unsigned int) m_Text.Length();
+      return (unsigned int) m_Text.length();
     }
 
     void SetDoubleValue(double d);
     void SetIntegerValue(int i);
 
     //! Return a caption string striping out the prefix and the suffix
-    virtual NString GetCleanText() const;
+    virtual std::string GetCleanText() const;
 
     void SetTextBackgroundColor(const Color &color);
     Color GetTextBackgroundColor() const;
@@ -127,10 +125,6 @@
     void RecvEndKeyFocus();
 
 
-    void SetPrefix(const tstring &p)
-    {
-      m_Prefix = p;
-    };
     void SetPrefix(const char *p)
     {
       m_Prefix = p;
@@ -139,19 +133,15 @@
     {
       m_Prefix = p;
     };
-    void SetPrefix(const NString &p)
+    void SetPrefix(const std::string &p)
     {
       m_Prefix = p;
     };
-    NString GetPrefix() const
+    std::string GetPrefix() const
     {
       return m_Prefix;
     };
 
-    void SetSuffix(const tstring &s)
-    {
-      m_Suffix = s;
-    };
     void SetSuffix(const char *s)
     {
       m_Suffix = s;
@@ -160,11 +150,11 @@
     {
       m_Suffix = s;
     };
-    void SetSuffix(const NString &s)
+    void SetSuffix(const std::string &s)
     {
       m_Suffix = s;
     };
-    NString Getsuffix() const
+    std::string Getsuffix() const
     {
       return m_Suffix;
     };
@@ -174,7 +164,7 @@
     sigc::signal< void, EditTextBox *, unsigned int > sigCharacter; // Emitted every time a character typed
     sigc::signal< void, EditTextBox * > sigEditChange; // Emitted every time a character typed
 
-    sigc::signal< void, EditTextBox *, const NString &> sigValidateKeyboardEntry;
+    sigc::signal< void, EditTextBox *, const std::string &> sigValidateKeyboardEntry;
     sigc::signal< void, EditTextBox * > sigValidateEntry;   // Emitted when the text is validated
     sigc::signal< void, EditTextBox * > sigSetText;     // Emitted when text is set with setCaption
     sigc::signal< void, EditTextBox * > sigEscapeKeyboardFocus;
@@ -195,7 +185,7 @@
 
     virtual long PostLayoutManagement(long LayoutResult);
 
-    NString m_Text;
+    std::string m_Text;
     HLayout *hlayout;
 
     Color m_BackgroundColor;
@@ -205,12 +195,12 @@
     Color m_CursorColor;
 
     BaseKeyboardHandler m_KeyboardHandler;
-    NString m_temporary_caption;
+    std::string m_temporary_caption;
     BaseKeyboardHandler::eKeyEntryType m_keytype;
 
     Validator *m_Validator;
-    NString m_Suffix;
-    NString m_Prefix;
+    std::string m_Suffix;
+    std::string m_Prefix;
 
     bool BlinkCursor;
     void BlinkCursorTimerInterrupt(void *v);

=== modified file 'Nux/FileSelector.cpp'
--- Nux/FileSelector.cpp	2012-10-02 07:32:55 +0000
+++ Nux/FileSelector.cpp	2012-10-11 16:27:25 +0000
@@ -53,9 +53,9 @@
     SetMinimumSize(DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
     SetLayout(m_hlayout);
 
-    NString Path = NUX_FINDRESOURCELOCATION("Icons/Folder-16x16.png");
+    std::string Path = NUX_FINDRESOURCELOCATION("Icons/Folder-16x16.png");
     m_Texture = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
-    m_Texture->Update(Path.GetTCharPtr());
+    m_Texture->Update(Path.c_str());
   }
 
   FileSelector::~FileSelector()

=== modified file 'Nux/FloatingWindow.cpp'
--- Nux/FloatingWindow.cpp	2012-10-02 07:32:55 +0000
+++ Nux/FloatingWindow.cpp	2012-10-11 16:27:25 +0000
@@ -98,12 +98,12 @@
     SetMinimumSize(32, 32);
     SetGeometry(Geometry(100, 100, 320, 200));
 
-    NString Path = NUX_FINDRESOURCELOCATION("UITextures/AddButton.png");
+    std::string Path = NUX_FINDRESOURCELOCATION("UITextures/AddButton.png");
     MinimizeIcon = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
-    MinimizeIcon->Update(Path.GetTCharPtr());
+    MinimizeIcon->Update(Path.c_str());
     Path = NUX_FINDRESOURCELOCATION("UITextures/CancelButton.png");
     CloseIcon = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
-    CloseIcon->Update(Path.GetTCharPtr());
+    CloseIcon->Update(Path.c_str());
 
     SetWindowTitle(WindowName);
   }
@@ -178,7 +178,7 @@
                                  _title_bar->GetBaseWidth(), _title_bar->GetBaseHeight()), Color(0xFF2f2f2f),
                                  eSHAPE_CORNER_ROUND10, eCornerTopLeft | eCornerTopRight);
 
-      GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), _window_title_bar->GetGeometry(), _window_title.m_string, Color(0xFFFFFFFF), true, eAlignTextCenter);
+      GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), _window_title_bar->GetGeometry(), _window_title, Color(0xFFFFFFFF), true, eAlignTextCenter);
       GetPainter().Draw2DTextureAligned(graphics_engine, CloseIcon, _close_button->GetGeometry(), TextureAlignmentStyle(eTACenter, eTACenter));
     }
 
@@ -457,7 +457,7 @@
     _window_title = title;
   }
 
-  NString FloatingWindow::GetWindowTitle()
+  std::string FloatingWindow::GetWindowTitle()
   {
     return _window_title;
   }

=== modified file 'Nux/FloatingWindow.h'
--- Nux/FloatingWindow.h	2012-10-02 07:32:55 +0000
+++ Nux/FloatingWindow.h	2012-10-11 16:27:25 +0000
@@ -71,7 +71,7 @@
     void RecvTitleBarMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
 
     void SetWindowTitle(const char *title);
-    NString GetWindowTitle();
+    std::string GetWindowTitle();
 
     //! Return true if this object can break the layout.
     /*
@@ -133,7 +133,7 @@
     std::list<View *> m_InterfaceObject;
     HLayout *_title_bar_layout;
 
-    NString _window_title;
+    std::string _window_title;
 
     friend class PopUpWindow;
     friend class ComboBox_Logic_WindowView;

=== modified file 'Nux/HLayout.cpp'
--- Nux/HLayout.cpp	2012-09-26 06:44:12 +0000
+++ Nux/HLayout.cpp	2012-10-11 16:27:25 +0000
@@ -48,7 +48,7 @@
     m_ContentStacking = eStackLeft;
   }
 
-  HLayout::HLayout(NString name, NUX_FILE_LINE_DECL)
+  HLayout::HLayout(std::string name, NUX_FILE_LINE_DECL)
     : LinearLayout(NUX_FILE_LINE_PARAM)
   {
     m_name = name;

=== modified file 'Nux/HLayout.h'
--- Nux/HLayout.h	2011-10-21 22:06:35 +0000
+++ Nux/HLayout.h	2012-10-11 16:27:25 +0000
@@ -33,7 +33,7 @@
     NUX_DECLARE_OBJECT_TYPE(HLayout, LinearLayout);
   public:
     HLayout(NUX_FILE_LINE_PROTO);
-    HLayout(NString name, NUX_FILE_LINE_PROTO);
+    HLayout(std::string name, NUX_FILE_LINE_PROTO);
     ~HLayout();
 
     virtual long ComputeContentSize();

=== modified file 'Nux/HexRegExpValidator.cpp'
--- Nux/HexRegExpValidator.cpp	2012-09-19 04:53:45 +0000
+++ Nux/HexRegExpValidator.cpp	2012-10-11 16:27:25 +0000
@@ -121,10 +121,9 @@
   {
   }
 
-  NString HexRegExpValidator::ToString(int i)
+  std::string HexRegExpValidator::ToString(int i)
   {
-    NString Prec("%d");
-    return NString::Printf(Prec.GetTCharPtr(), i);
+    return std::to_string((long long)i);
   }
 
   int HexRegExpValidator::ToInteger(const char *str)

=== modified file 'Nux/HexRegExpValidator.h'
--- Nux/HexRegExpValidator.h	2011-10-17 21:23:50 +0000
+++ Nux/HexRegExpValidator.h	2012-10-11 16:27:25 +0000
@@ -50,7 +50,7 @@
     void SetMaximum(int value);
     int GetMaximum() const;
 
-    NString ToString(int i);
+    std::string ToString(int i);
     int ToInteger(const char *str);
 
   private:

=== modified file 'Nux/IntegerValidator.cpp'
--- Nux/IntegerValidator.cpp	2012-09-19 04:53:45 +0000
+++ Nux/IntegerValidator.cpp	2012-10-11 16:27:25 +0000
@@ -122,10 +122,9 @@
   {
   }
 
-  NString IntegerValidator::ToString(int i)
+  std::string IntegerValidator::ToString(int i)
   {
-    NString Prec("%d");
-    return NString::Printf(Prec.GetTCharPtr(), i);
+    return std::to_string((long long)i);
   }
 
   int IntegerValidator::ToInteger(const char *str)

=== modified file 'Nux/IntegerValidator.h'
--- Nux/IntegerValidator.h	2011-10-17 21:23:50 +0000
+++ Nux/IntegerValidator.h	2012-10-11 16:27:25 +0000
@@ -49,7 +49,7 @@
     void SetMaximum(int value);
     int GetMaximum() const;
 
-    NString ToString(int i);
+    std::string ToString(int i);
     int ToInteger(const char *str);
 
   private:

=== modified file 'Nux/KeyboardHandler.cpp'
--- Nux/KeyboardHandler.cpp	2012-09-26 06:44:12 +0000
+++ Nux/KeyboardHandler.cpp	2012-10-11 16:27:25 +0000
@@ -63,7 +63,7 @@
 
     // Remove the characters
     for (int i = nFirst; i < nLast; ++i)
-      m_textline.Erase(nFirst, 1);
+      m_textline.erase(nFirst, 1);
   }
 
   void BaseKeyboardHandler::InsertChar(unsigned int /* character */)
@@ -78,19 +78,19 @@
     m_caret = 0;
 
     m_previous_cursor_position = 0;
-    m_textline.Clear();
+    m_textline.clear();
   }
 
   void BaseKeyboardHandler::PlaceCaret(unsigned int nCP)
   {
-    nuxAssert(nCP <= (unsigned int) m_textline.Length());
+    nuxAssert(((int)nCP >= 0) && (nCP <= (unsigned int) m_textline.length()));
     m_previous_cursor_position = m_caret;
     m_caret = nCP;
   }
 
   unsigned int BaseKeyboardHandler::NextWordPosition(unsigned int cp)
   {
-    unsigned int num_char = (unsigned int) m_textline.Length();
+    unsigned int num_char = (unsigned int) m_textline.length();
 
     if (cp == num_char)
       return cp;
@@ -159,10 +159,10 @@
     if (m_entering_focus)
       return;
 
-    if (m_textline.Length() == 0)
+    if (m_textline.length() == 0)
       return;
 
-    unsigned int StrLength = (unsigned int) m_textline.Length();
+    unsigned int StrLength = (unsigned int) m_textline.length();
     int total = m_text_positionx;
     unsigned int nCP = StrLength;
 
@@ -210,17 +210,17 @@
     if (m_entering_focus)
       return;
 
-    if (m_textline.Length() == 0)
+    if (m_textline.length() == 0)
       return;
 
-    int StrLength = (int) m_textline.Length();
+    int StrLength = (int) m_textline.length();
 
     //nuxDebugMsg("[BaseKeyboardHandler::ResolveCaretPosition]");
     if (x < geo.x)
     {
       if (m_mouse_inside_text_area)
       {
-        while (m_caret && (GetFont()->GetCharStringWidth(m_textline.GetTCharPtr(), m_caret) + m_text_positionx > 0))
+        while (m_caret && (GetFont()->GetCharStringWidth(m_textline.c_str(), m_caret) + m_text_positionx > 0))
         {
           --m_caret;
           //nuxDebugMsg("Group Add: %c", m_textline[m_caret]);
@@ -242,7 +242,7 @@
     {
       if (m_mouse_inside_text_area)
       {
-        while ((m_caret != StrLength) && (GetFont()->GetCharStringWidth(m_textline.GetTCharPtr(), m_caret) + m_text_positionx < geo.GetWidth()))
+        while ((m_caret != StrLength) && (GetFont()->GetCharStringWidth(m_textline.c_str(), m_caret) + m_text_positionx < geo.GetWidth()))
         {
           ++m_caret;
           //nuxDebugMsg("Group Add: %c", m_textline[m_caret-1]);
@@ -311,7 +311,7 @@
                 // If we are in overwrite mode and there is already
                 // a char at the caret's position, simply replace it.
                 // Otherwise, we insert the char as normal.
-                if ( !m_insert_mode && m_caret < (int) m_textline.Length())
+                if ( !m_insert_mode && m_caret < (int) m_textline.length())
                 {
                   m_textline[m_caret] = key;
                   PlaceCaret(m_caret + 1 );
@@ -320,9 +320,9 @@
                 else
                 {
                   // Insert the char
-                  if ( m_caret <= (int) m_textline.Length())
+                  if ( m_caret <= (int) m_textline.length())
                   {
-                    m_textline.Insert(m_caret, 1, key);
+                    m_textline.insert(m_caret, 1, key);
                     PlaceCaret(m_caret + 1 );
                     m_selection_start = m_caret;
                   }
@@ -334,7 +334,7 @@
               // If we are in overwrite mode and there is already
               // a char at the caret's position, simply replace it.
               // Otherwise, we insert the char as normal.
-              if ( !m_insert_mode && m_caret < (int) m_textline.Length())
+              if ( !m_insert_mode && m_caret < (int) m_textline.length())
               {
                 m_textline[m_caret] = key;
                 PlaceCaret(m_caret + 1 );
@@ -343,9 +343,9 @@
               else
               {
                 // Insert the char
-                if ( m_caret <= (int) m_textline.Length())
+                if ( m_caret <= (int) m_textline.length())
                 {
-                  m_textline.Insert(m_caret, 1, key);
+                  m_textline.insert(m_caret, 1, key);
                   PlaceCaret(m_caret + 1 );
                   m_selection_start = m_caret;
                 }
@@ -371,7 +371,7 @@
               // If we are in overwrite mode and there is already
               // a char at the caret's position, simply replace it.
               // Otherwise, we insert the char as normal.
-              if (!m_insert_mode && (m_caret < (int) m_textline.Length()))
+              if (!m_insert_mode && (m_caret < (int) m_textline.length()))
               {
                 m_textline[m_caret] = key;
                 PlaceCaret(m_caret + 1 );
@@ -380,9 +380,9 @@
               else
               {
                 // Insert the char
-                if ( m_caret <= (int) m_textline.Length())
+                if ( m_caret <= (int) m_textline.length())
                 {
-                  m_textline.Insert(m_caret, 1, key);
+                  m_textline.insert(m_caret, 1, key);
                   PlaceCaret(m_caret + 1 );
                   m_selection_start = m_caret;
                 }
@@ -393,7 +393,7 @@
               // If we are in overwrite mode and there is already
               // a char at the caret's position, simply replace it.
               // Otherwise, we insert the char as normal.
-              if (!m_insert_mode && (m_caret < (int) m_textline.Length()))
+              if (!m_insert_mode && (m_caret < (int) m_textline.length()))
               {
                 m_textline[m_caret] = key;
                 PlaceCaret(m_caret + 1 );
@@ -402,9 +402,9 @@
               else
               {
                 // Insert the char
-                if (m_caret <= (int) m_textline.Length())
+                if (m_caret <= (int) m_textline.length())
                 {
-                  m_textline.Insert(m_caret, 1, key);
+                  m_textline.insert(m_caret, 1, key);
                   PlaceCaret(m_caret + 1 );
                   m_selection_start = m_caret;
                 }
@@ -428,7 +428,7 @@
             // If we are in overwrite mode and there is already
             // a char at the caret's position, simply replace it.
             // Otherwise, we insert the char as normal.
-            if (!m_insert_mode && (m_caret < (int) m_textline.Length()))
+            if (!m_insert_mode && (m_caret < (int) m_textline.length()))
             {
               m_textline[m_caret] = key;
               PlaceCaret(m_caret + 1 );
@@ -437,9 +437,9 @@
             else
             {
               // Insert the char
-              if (m_caret <= (int) m_textline.Length())
+              if (m_caret <= (int) m_textline.length())
               {
-                m_textline.Insert(m_caret, 1, key);
+                m_textline.insert(m_caret, 1, key);
                 PlaceCaret(m_caret + 1 );
                 m_selection_start = m_caret;
               }
@@ -463,7 +463,7 @@
             // If we are in overwrite mode and there is already
             // a char at the caret's position, simply replace it.
             // Otherwise, we insert the char as normal.
-            if (!m_insert_mode && (m_caret < (int) m_textline.Length()))
+            if (!m_insert_mode && (m_caret < (int) m_textline.length()))
             {
               m_textline[m_caret] = key;
               PlaceCaret(m_caret + 1 );
@@ -472,9 +472,9 @@
             else
             {
               // Insert the char
-              if (m_caret <= (int) m_textline.Length())
+              if (m_caret <= (int) m_textline.length())
               {
-                m_textline.Insert(m_caret, 1, key);
+                m_textline.insert(m_caret, 1, key);
                 PlaceCaret(m_caret + 1 );
                 m_selection_start = m_caret;
               }
@@ -497,7 +497,7 @@
             // If we are in overwrite mode and there is already
             // a char at the caret's position, simply replace it.
             // Otherwise, we insert the char as normal.
-            if (!m_insert_mode && (m_caret < (int) m_textline.Length()))
+            if (!m_insert_mode && (m_caret < (int) m_textline.length()))
             {
               m_textline[m_caret] = key;
               PlaceCaret(m_caret + 1 );
@@ -506,9 +506,9 @@
             else
             {
               // Insert the char
-              if (m_caret <= (int) m_textline.Length())
+              if (m_caret <= (int) m_textline.length())
               {
-                m_textline.Insert(m_caret, 1, key);
+                m_textline.insert(m_caret, 1, key);
                 PlaceCaret(m_caret + 1 );
                 m_selection_start = m_caret;
               }
@@ -524,9 +524,9 @@
     // CTRL+C
     if ((virtual_code == NUX_VK_C) && (state & NUX_STATE_CTRL))
     {
-      NString s = GetSelectedText();
+      std::string s = GetSelectedText();
 #if defined(NUX_OS_WINDOWS)
-      inlCopyTextToClipboard(s.GetTCharPtr());
+      inlCopyTextToClipboard(s.c_str());
 #endif
     }
 
@@ -534,15 +534,15 @@
     if ((virtual_code == NUX_VK_V) && (state & NUX_STATE_CTRL))
     {
 #if defined(NUX_OS_WINDOWS)
-      NString s = inlReadTextToClipboard();
+      std::string s = inlReadTextToClipboard();
 #elif defined(NUX_OS_LINUX)
-      NString s = "Paste not implemented yet";
+      std::string s = "Paste not implemented yet";
 #endif
       unsigned int start = GetTextSelectionStart();
       unsigned int end = GetTextSelectionEnd();
-      m_textline.Replace(start, end - start, s.m_string);
+      m_textline.replace(start, end - start, s);
 
-      m_caret = start + (unsigned int) s.Length();
+      m_caret = start + (unsigned int) s.length();
       UnselectAllText();
     }
 
@@ -568,7 +568,7 @@
         // Deleting one character
         if ( m_caret > 0 )
         {
-          m_textline.Erase(m_caret - 1, 1);
+          m_textline.erase(m_caret - 1, 1);
           PlaceCaret(m_caret - 1 );
 
           m_selection_start = m_caret;
@@ -585,9 +585,9 @@
       else
       {
         // Deleting one character
-        if (m_caret < (int) m_textline.Length())
+        if (m_caret < (int) m_textline.length())
         {
-          m_textline.Erase(m_caret, 1);
+          m_textline.erase(m_caret, 1);
         }
       }
     }
@@ -637,7 +637,7 @@
           m_caret = NextWordPosition( m_caret);
           PlaceCaret(m_caret );
         }
-        else if (m_caret < (int) m_textline.Length())
+        else if (m_caret < (int) m_textline.length())
           PlaceCaret(m_caret + 1 );
 
         if ((state & NUX_STATE_SHIFT) == 0)
@@ -666,14 +666,14 @@
     {
       if ((state & NUX_STATE_SHIFT) == 0)
       {
-        PlaceCaret((unsigned int) m_textline.Length());
+        PlaceCaret((unsigned int) m_textline.length());
         // Shift is not down. Update selection
         // start along with the caret.
         m_selection_start = m_caret;
       }
       else
       {
-        PlaceCaret((unsigned int) m_textline.Length());
+        PlaceCaret((unsigned int) m_textline.length());
       }
     }
     else if (virtual_code == NUX_VK_ESCAPE)
@@ -695,19 +695,19 @@
     }
     else if (virtual_code == NUX_VK_END)
     {
-      unsigned int str_width = GetFont()->GetStringWidth(m_textline.GetTCharPtr());
+      unsigned int str_width = GetFont()->GetStringWidth(m_textline.c_str());
 
       if (str_width + s_cursor_width > (unsigned int) m_clip_region.GetWidth())
         m_text_positionx = m_clip_region.GetWidth() - (str_width + s_cursor_width);
       else
         m_text_positionx = 0;
     }
-    else if (m_textline.Length() != 0)
+    else if (m_textline.length() != 0)
     {
       AdjustCursorAndTextPosition();
       m_need_redraw = true;
     }
-    else if (m_textline.Length() == 0)
+    else if (m_textline.length() == 0)
     {
       ClearText();
       m_need_redraw = true;
@@ -719,11 +719,11 @@
 
   void BaseKeyboardHandler::AdjustCursorAndTextPosition()
   {
-    int str_width = GetFont()->GetStringWidth(m_textline.GetTCharPtr());
-    NString temp0;
+    int str_width = GetFont()->GetStringWidth(m_textline.c_str());
+    std::string temp0;
 
     if (m_caret > 0)
-      temp0 = m_textline.GetSubString(0, m_caret - 1).GetTStringRef();
+      temp0 = m_textline.substr(0, m_caret - 1);
     else
       temp0 = "";
 
@@ -736,8 +736,8 @@
     //      temp1 = "abcdefgh"
     //      temp2 = "abcdefghi"
 
-    NString temp1 = m_textline.GetSubString(0, m_caret).GetTStringRef();
-    NString temp2 = m_textline.GetSubString(0, m_caret + 1).GetTStringRef();
+    std::string temp1 = m_textline.substr(0, m_caret);
+    std::string temp2 = m_textline.substr(0, m_caret + 1);
     int str_width0 = GetFont()->GetStringWidth(temp0);
     int str_width1 = GetFont()->GetStringWidth(temp1);
     int str_width2 = GetFont()->GetStringWidth(temp2);
@@ -746,7 +746,7 @@
     if ((m_text_positionx + str_width1 + s_cursor_width) > m_clip_region.GetWidth())
     {
       // Hitting the end of the text box
-      if (m_caret == (int) m_textline.Length())
+      if (m_caret == (int) m_textline.length())
       {
         m_text_positionx = - (str_width + (int) s_cursor_width - m_clip_region.GetWidth());
       }
@@ -814,7 +814,7 @@
   }
   void BaseKeyboardHandler::MoveCursorAtEnd()
   {
-    unsigned int StrLength = ( unsigned int) m_textline.Length();
+    unsigned int StrLength = ( unsigned int) m_textline.length();
     m_previous_cursor_position = m_caret;
     m_caret = StrLength;
   }
@@ -846,16 +846,11 @@
     m_text_positionx = 0;
   }
 
-  void BaseKeyboardHandler::SetText(const tstring &s)
+  void BaseKeyboardHandler::SetText(const std::string &s)
   {
     SetText(s.c_str());
   }
 
-  void BaseKeyboardHandler::SetText(const NString &s)
-  {
-    SetText(s.GetTCharPtr());
-  }
-
   void BaseKeyboardHandler::SetClipRegion(const Geometry &g)
   {
     m_clip_region = g;
@@ -880,7 +875,7 @@
   void BaseKeyboardHandler::SelectAllText()
   {
     m_selection_start = 0;
-    m_caret = (unsigned int) m_textline.Length();
+    m_caret = (unsigned int) m_textline.length();
     AdjustCursorAndTextPosition();
   }
 
@@ -889,15 +884,15 @@
     m_selection_start = m_caret;
   }
 
-  NString BaseKeyboardHandler::GetSelectedText() const
+  std::string BaseKeyboardHandler::GetSelectedText() const
   {
     if (m_selection_start == m_caret)
     {
-      return NString("");
+      return std::string("");
     }
     else
     {
-      NString s = m_textline.GetSubString(GetTextSelectionStart(), GetTextSelectionEnd() - GetTextSelectionStart()).GetTStringRef();
+      std::string s = m_textline.substr(GetTextSelectionStart(), GetTextSelectionEnd() - GetTextSelectionStart());
       return s;
     }
   }

=== modified file 'Nux/KeyboardHandler.h'
--- Nux/KeyboardHandler.h	2011-10-21 22:06:35 +0000
+++ Nux/KeyboardHandler.h	2012-10-11 16:27:25 +0000
@@ -61,13 +61,13 @@
       char      character    /*character*/,
       const Geometry &g);
 
-    NString GetTextLine() const
+    std::string GetTextLine() const
     {
       return m_textline;
     }
     unsigned int GetLength() const
     {
-      return (unsigned int) m_textline.Length();
+      return (unsigned int) m_textline.length();
     }
 
     unsigned int GetCursorPosition() const
@@ -88,8 +88,7 @@
     }
 
     void SetText(const char *str);
-    void SetText(const tstring &s);
-    void SetText(const NString &s);
+    void SetText(const std::string &s);
 
     void ClearText();
     void PlaceCaret(unsigned int cp);
@@ -104,13 +103,13 @@
     void GetTextSelection(int *start, int *end) const;
     int GetTextSelectionStart() const;
     int GetTextSelectionEnd() const;
-    NString GetSelectedText() const;
+    std::string GetSelectedText() const;
     void SelectAllText();
     void UnselectAllText();
     bool IsTextSelected();
 
-    void SetPrefix(NString); // 0x865, 25 rad, 25 degree...
-    void SetPostfix(NString);
+    void SetPrefix(std::string); // 0x865, 25 rad, 25 degree...
+    void SetPostfix(std::string);
 
     void EnterFocus();
 
@@ -128,7 +127,7 @@
 
   protected:
     ObjectPtr<FontTexture> m_Font;
-    NString m_textline;
+    std::string m_textline;
     int m_previous_cursor_position;
     bool m_need_redraw;
     int m_text_positionx;

=== modified file 'Nux/KineticScrolling/KineticAxisScroller.h'
--- Nux/KineticScrolling/KineticAxisScroller.h	2012-10-02 14:57:05 +0000
+++ Nux/KineticScrolling/KineticAxisScroller.h	2012-10-11 16:27:25 +0000
@@ -56,7 +56,7 @@
   /*!
     Enumeration that describes the possible states of the kinetic scroller
    */
-  enum class State
+  enum States
   {
    Idle, /*!< It's not pressed and not moving. This is the initial state */
    Pressed, /*!< It's pressed but not yet moving. */

=== modified file 'Nux/KineticScrolling/KineticScrollingTickSource.h'
--- Nux/KineticScrolling/KineticScrollingTickSource.h	2012-10-02 14:57:05 +0000
+++ Nux/KineticScrolling/KineticScrollingTickSource.h	2012-10-11 16:27:25 +0000
@@ -21,6 +21,7 @@
 #ifndef NUX_KS_TICK_SOURCE_H
 #define NUX_KS_TICK_SOURCE_H
 
+#include <stdint.h>
 #include <Nux/TimerProc.h>
 
 /*****

=== modified file 'Nux/Layout.h'
--- Nux/Layout.h	2012-09-26 06:44:12 +0000
+++ Nux/Layout.h	2012-10-11 16:27:25 +0000
@@ -294,7 +294,7 @@
 
     std::list<Area *> _layout_element_list;
 
-    NString m_name;
+    std::string m_name;
 
     LayoutContentDistribution m_ContentStacking;
   };

=== modified file 'Nux/MainLoopGLib.cpp'
--- Nux/MainLoopGLib.cpp	2012-10-02 00:31:15 +0000
+++ Nux/MainLoopGLib.cpp	2012-10-11 16:27:25 +0000
@@ -332,7 +332,11 @@
     }
   }
 
+#if defined(NUX_OS_WINDOWS)
+  bool WindowThread::AddChildWindowGlibLoop(WindowThread* wnd_thread)
+#else
   bool WindowThread::AddChildWindowGlibLoop(WindowThread* /* wnd_thread */)
+#endif
   {
 #if defined(NUX_OS_WINDOWS)
     if (wnd_thread == NULL)

=== modified file 'Nux/MenuPage.cpp'
--- Nux/MenuPage.cpp	2012-10-02 07:32:55 +0000
+++ Nux/MenuPage.cpp	2012-10-11 16:27:25 +0000
@@ -277,7 +277,7 @@
 //
   const char *MenuPage::GetName() const
   {
-    return m_Name.GetTCharPtr();
+    return m_Name.c_str();
   }
 
   bool MenuPage::CanClose() const

=== modified file 'Nux/MenuPage.h'
--- Nux/MenuPage.h	2012-10-02 07:32:55 +0000
+++ Nux/MenuPage.h	2012-10-11 16:27:25 +0000
@@ -272,7 +272,7 @@
     VLayout* _vlayout;
     bool m_NextMouseUpMeanStop;
     MenuItem *m_SubMenuAction;
-    NString m_Name;
+    std::string m_Name;
 
     bool m_Action_Triggered;
     MenuPage *m_Parent;

=== modified file 'Nux/NumericValuator.cpp'
--- Nux/NumericValuator.cpp	2012-10-02 07:32:55 +0000
+++ Nux/NumericValuator.cpp	2012-10-11 16:27:25 +0000
@@ -26,6 +26,8 @@
 #include "DoubleValidator.h"
 #include "NumericValuator.h"
 
+#include <string>
+
 namespace nux
 {
 
@@ -47,7 +49,7 @@
   void NumericValuator::InitializeWidgets()
   {
     m_EditLine->SetValidator(&m_DoubleValidator);
-    m_EditLine->SetText(NString::Printf("%d", m_DoubleValidator.GetMinimum()));
+    m_EditLine->SetText(std::to_string((long double)m_DoubleValidator.GetMinimum()));
 
     m_EditLine->SetMinimumSize(2 * DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
     m_EditLine->SetGeometry(Geometry(0, 0, 2 * DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT));
@@ -99,7 +101,7 @@
     if (m_fValue > m_DoubleValidator.GetMaximum())
       m_fValue = m_DoubleValidator.GetMaximum();
 
-    m_EditLine->SetText(NString::Printf("%f", m_fValue));
+    m_EditLine->SetText(std::to_string((long double)m_fValue));
   }
 
   float NumericValuator::GetValue() const
@@ -147,25 +149,25 @@
   void NumericValuator::ImplementValidateEntry()
   {
     double ret = 0;
-    ret = CharToDouble(m_EditLine->GetCleanText().GetTCharPtr());
+    ret = CharToDouble(m_EditLine->GetCleanText().c_str());
     {
       m_fValue = ret;
 
       if (m_fValue < m_DoubleValidator.GetMinimum())
       {
         m_fValue = m_DoubleValidator.GetMinimum();
-        m_EditLine->SetText(NString::Printf("%f", m_fValue));
+        m_EditLine->SetText(std::to_string((long double)m_fValue));
       }
 
       if (m_fValue > m_DoubleValidator.GetMaximum())
       {
         m_fValue = m_DoubleValidator.GetMaximum();
-        m_EditLine->SetText(NString::Printf("%f", m_fValue));
+        m_EditLine->SetText(std::to_string((long double)m_fValue));
       }
     }
 //     else
 //     {
-//         m_EditLine->SetText(NString::Printf("%f", m_fValue));
+//         m_EditLine->SetText(std::string::Printf("%f", m_fValue));
 //     }
   }
 

=== modified file 'Nux/PangoText.cpp'
--- Nux/PangoText.cpp	2012-10-02 07:32:55 +0000
+++ Nux/PangoText.cpp	2012-10-11 16:27:25 +0000
@@ -126,7 +126,7 @@
 
   }
 
-  void PangoText::SetText(NString text)
+  void PangoText::SetText(std::string text)
   {
     if (_text != text)
     {
@@ -183,7 +183,7 @@
     pango_layout_set_font_description(layout, desc);
     pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
     pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
-    pango_layout_set_text(layout, _text.GetTCharPtr(), -1);
+    pango_layout_set_text(layout, _text.c_str(), -1);
 
     pangoCtx = pango_layout_get_context(layout); // is not ref'ed
     pango_cairo_context_set_font_options(pangoCtx, font_options);
@@ -232,7 +232,7 @@
 
     pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
     pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
-    pango_layout_set_text(layout, _text.GetTCharPtr(), -1);
+    pango_layout_set_text(layout, _text.c_str(), -1);
 
     pangoCtx = pango_layout_get_context(layout);
     pango_cairo_context_set_font_options(pangoCtx, font_options);
@@ -256,7 +256,7 @@
 
   void PangoText::UpdateTextLayout()
   {
-    pango_layout_set_text(_pango_layout, _text.GetTCharPtr(), -1);
+    pango_layout_set_text(_pango_layout, _text.c_str(), -1);
 
     // reset the glyph string
     if (_glyph_text)

=== modified file 'Nux/PangoText.h'
--- Nux/PangoText.h	2012-10-02 07:32:55 +0000
+++ Nux/PangoText.h	2012-10-11 16:27:25 +0000
@@ -39,7 +39,7 @@
     //! Return true if the widget with changes to match the text width.
     bool GetSizeMatchText() const;
 
-    void SetText(NString text);
+    void SetText(std::string text);
     void SetTextColor(Color textColor);
 
     sigc::signal<void, PangoText*> sigTextChanged;
@@ -67,7 +67,7 @@
       PangoFont*        font;  // font this glyph uses(for bidi text, you need several fonts)
     } pango_glyph;
 
-    NString _text;
+    std::string _text;
     Color _textColor;
 
     CairoGraphics *_cairoGraphics;

=== modified file 'Nux/RGBValuator.cpp'
--- Nux/RGBValuator.cpp	2012-09-26 06:44:12 +0000
+++ Nux/RGBValuator.cpp	2012-10-11 16:27:25 +0000
@@ -31,6 +31,9 @@
 #include "DoubleValidator.h"
 #include "RGBValuator.h"
 
+#include <sstream>
+#include <iomanip>
+
 namespace nux
 {
   NUX_IMPLEMENT_OBJECT_TYPE(RGBValuator);
@@ -648,6 +651,27 @@
     SetRGB(color.red, color.green, color.blue);
   }
 
+  std::string as_hex(float f)
+  {
+    std::ostringstream s;
+    s << std::hex << (int)f;
+    return s.str();
+  }
+
+  std::string as_dec(float f)
+  {
+    std::ostringstream s;
+    s << (int)f;
+    return s.str();
+  }
+
+  std::string as_float(float f)
+  {
+    std::ostringstream s;
+    s << std::setprecision(3) << f;
+    return s.str();
+  }
+
   void RGBValuator::SetRGB(float r, float g, float b)
   {
     rgb_.red   = Clamp(r, 0.0f, 1.0f);
@@ -660,21 +684,21 @@
 
     if (m_color_format == color::HEX)
     {
-      red_caption_->SetText(NString::Printf("%x", (int) (rgb_.red * 255)));
-      green_caption_->SetText(NString::Printf("%x", (int) (rgb_.green * 255)));
-      blue_caption_->SetText(NString::Printf("%x", (int) (rgb_.blue * 255)));
+      red_caption_->SetText(as_hex(rgb_.red * 255));
+      green_caption_->SetText(as_hex(rgb_.green * 255));
+      blue_caption_->SetText(as_hex(rgb_.blue * 255));
     }
     else if (m_color_format == color::INT)
     {
-      red_caption_->SetText(NString::Printf("%d", (int) (rgb_.red * 255)));
-      green_caption_->SetText(NString::Printf("%d", (int) (rgb_.green * 255)));
-      blue_caption_->SetText(NString::Printf("%d", (int) (rgb_.blue * 255)));
+      red_caption_->SetText(as_dec(rgb_.red * 255));
+      green_caption_->SetText(as_dec(rgb_.green * 255));
+      blue_caption_->SetText(as_dec(rgb_.blue * 255));
     }
     else
     {
-      red_caption_->SetText(NString::Printf("%.3f", rgb_.red));
-      green_caption_->SetText(NString::Printf("%.3f", rgb_.green));
-      blue_caption_->SetText(NString::Printf("%.3f", rgb_.blue));
+      red_caption_->SetText(as_float(rgb_.red));
+      green_caption_->SetText(as_float(rgb_.green));
+      blue_caption_->SetText(as_float(rgb_.blue));
     }
 
     // Restore text selection if necessary.
@@ -701,21 +725,21 @@
 
     if (m_color_format == color::HEX)
     {
-      red_caption_->SetText(NString::Printf("%x", (int) (hsv_.hue * 255)));
-      green_caption_->SetText(NString::Printf("%x", (int) (hsv_.saturation * 255)));
-      blue_caption_->SetText(NString::Printf("%x", (int) (hsv_.value * 255)));
+      red_caption_->SetText(as_hex(hsv_.hue * 255));
+      green_caption_->SetText(as_hex(hsv_.saturation * 255));
+      blue_caption_->SetText(as_hex(hsv_.value * 255));
     }
     else if (m_color_format == color::INT)
     {
-      red_caption_->SetText(NString::Printf("%d", (int) (hsv_.hue * 255)));
-      green_caption_->SetText(NString::Printf("%d", (int) (hsv_.saturation * 255)));
-      blue_caption_->SetText(NString::Printf("%d", (int) (hsv_.value * 255)));
+      red_caption_->SetText(as_dec(hsv_.hue * 255));
+      green_caption_->SetText(as_dec(hsv_.saturation * 255));
+      blue_caption_->SetText(as_dec(hsv_.value * 255));
     }
     else
     {
-      red_caption_->SetText(NString::Printf("%.3f", hsv_.hue));
-      green_caption_->SetText(NString::Printf("%.3f", hsv_.saturation));
-      blue_caption_->SetText(NString::Printf("%.3f", hsv_.value));
+      red_caption_->SetText(as_float(hsv_.hue));
+      green_caption_->SetText(as_float(hsv_.saturation));
+      blue_caption_->SetText(as_float(hsv_.value));
     }
 
     if (hsv_.hue >= 1.0f)
@@ -746,21 +770,21 @@
 
     if (m_color_format == color::HEX)
     {
-      red_caption_->SetText(NString::Printf("%x", (int) (hls_.hue * 255)));
-      green_caption_->SetText(NString::Printf("%x", (int) (hls_.lightness * 255)));
-      blue_caption_->SetText(NString::Printf("%x", (int) (hls_.saturation * 255)));
+      red_caption_->SetText(as_hex(hls_.hue * 255));
+      green_caption_->SetText(as_hex(hls_.lightness * 255));
+      blue_caption_->SetText(as_hex(hls_.saturation * 255));
     }
     else if (m_color_format == color::INT)
     {
-      red_caption_->SetText(NString::Printf("%d", (int) (hls_.hue * 255)));
-      green_caption_->SetText(NString::Printf("%d", (int) (hls_.lightness * 255)));
-      blue_caption_->SetText(NString::Printf("%d", (int) (hls_.saturation * 255)));
+      red_caption_->SetText(as_dec(hls_.hue * 255));
+      green_caption_->SetText(as_dec(hls_.lightness * 255));
+      blue_caption_->SetText(as_dec(hls_.saturation * 255));
     }
     else
     {
-      red_caption_->SetText(NString::Printf("%.3f", hls_.hue));
-      green_caption_->SetText(NString::Printf("%.3f", hls_.lightness));
-      blue_caption_->SetText(NString::Printf("%.3f", hls_.saturation));
+      red_caption_->SetText(as_float(hls_.hue));
+      green_caption_->SetText(as_float(hls_.lightness));
+      blue_caption_->SetText(as_float(hls_.saturation));
     }
 
     if (hls_.hue >= 1.0f)
@@ -785,15 +809,15 @@
 
     if (m_color_format == color::HEX)
     {
-      alpha_caption_->SetText(NString::Printf("%x", (int) (alpha_ * 255)));
+      alpha_caption_->SetText(as_hex(alpha_ * 255));
     }
     else if (m_color_format == color::INT)
     {
-      alpha_caption_->SetText(NString::Printf("%d", (int) (alpha_ * 255)));
+      alpha_caption_->SetText(as_dec(alpha_ * 255));
     }
     else
     {
-      alpha_caption_->SetText(NString::Printf("%.3f", alpha_));
+      alpha_caption_->SetText(as_float(alpha_));
     }
 
     sigColorChanged.emit(rgb_.red, rgb_.green, rgb_.blue, alpha_);
@@ -1211,21 +1235,21 @@
 
   }
 
-  void RGBValuator::OnComponentInput(EditTextBox * /* textbox */, const NString &s, int componentIndex)
+  void RGBValuator::OnComponentInput(EditTextBox* /* textbox */, const std::string &s, int componentIndex)
   {
     float f = 0;
 
-    if ((m_color_format == color::HEX) && (m_HexRegExp.Validate(s.GetTCharPtr()) == Validator::Acceptable))
+    if ((m_color_format == color::HEX) && (m_HexRegExp.Validate(s.c_str()) == Validator::Acceptable))
     {
-      f = (float) m_HexRegExp.ToInteger(s.GetTCharPtr()) / 255.0f;
+      f = (float) m_HexRegExp.ToInteger(s.c_str()) / 255.0f;
     }
-    else if ((m_color_format == color::INT) && (m_IntRegExp.Validate(s.GetTCharPtr()) == Validator::Acceptable))
+    else if ((m_color_format == color::INT) && (m_IntRegExp.Validate(s.c_str()) == Validator::Acceptable))
     {
-      f = (float) m_IntRegExp.ToInteger(s.GetTCharPtr()) / 255.0f;
+      f = (float) m_IntRegExp.ToInteger(s.c_str()) / 255.0f;
     }
     else
     {
-      f = (float) m_DoubleRegExp.ToDouble(s.GetTCharPtr());
+      f = (float) m_DoubleRegExp.ToDouble(s.c_str());
     }
 
     f = Clamp(f, 0.0f, 1.0f);
@@ -1302,7 +1326,7 @@
     if (componentIndex == 3)
     {
       float f = 0;
-      f = CharToDouble(s.GetTCharPtr());
+      f = CharToDouble(s.c_str());
       f = Clamp(f, 0.0f, 1.0f);
       //if(m_color_model == color::RGB)
       {

=== modified file 'Nux/RGBValuator.h'
--- Nux/RGBValuator.h	2012-08-17 12:41:21 +0000
+++ Nux/RGBValuator.h	2012-10-11 16:27:25 +0000
@@ -87,7 +87,7 @@
     void OnReceiveMouseUp_Green     (int x, int y, unsigned long button_flags, unsigned long key_flags);
     void OnReceiveMouseUp_Blue      (int x, int y, unsigned long button_flags, unsigned long key_flags);
 
-    void OnComponentInput           (EditTextBox *textbox, const NString &s, int componentIndex);
+    void OnComponentInput           (EditTextBox *textbox, const std::string &s, int componentIndex);
     void OnChannelKeyboardFocus();
     void OnChannelLostKeyboardFocus();
     void OnChannelValidateKeyboardEntry();

=== modified file 'Nux/RangeValue.cpp'
--- Nux/RangeValue.cpp	2012-10-02 07:32:55 +0000
+++ Nux/RangeValue.cpp	2012-10-11 16:27:25 +0000
@@ -25,6 +25,9 @@
 #include "HLayout.h"
 #include "RangeValue.h"
 
+#include <sstream>
+#include <iomanip>
+
 namespace nux
 {
   NUX_IMPLEMENT_OBJECT_TYPE(RangeValue);
@@ -167,7 +170,7 @@
     else
       m_Value = value;
 
-    m_ValueString->SetText(NString::Printf("%.3f", m_Value));
+    m_ValueString->SetText(std::to_string((long double)m_Value));
     QueueDraw();
   }
 
@@ -188,7 +191,7 @@
     else
       m_Value = m_min + (m_max - m_min) * (float) x / (float) m_Percentage->GetBaseWidth();
 
-    m_ValueString->SetText(NString::Printf("%.3f", m_Value));
+    m_ValueString->SetText(std::to_string((long double)m_Value));
     sigValueChanged.emit(this);
     sigFloatChanged.emit(m_Value);
     sigMouseDown.emit(m_Value);
@@ -206,7 +209,9 @@
     else
       m_Value = m_min + (m_max - m_min) * (float) x / (float) m_Percentage->GetBaseWidth();
 
-    m_ValueString->SetText(NString::Printf("%.3f", m_Value));
+    std::stringstream s;
+    s << std::setprecision(3) << m_Value;
+    m_ValueString->SetText(s.str());
     sigValueChanged.emit(this);
     sigFloatChanged.emit(m_Value);
     sigMouseUp.emit(m_Value);
@@ -223,7 +228,9 @@
     else
       m_Value = m_min + (m_max - m_min) * (float) x / (float) m_Percentage->GetBaseWidth();
 
-    m_ValueString->SetText(NString::Printf("%.3f", m_Value));
+    std::stringstream s;
+    s << std::setprecision(3) << m_Value;
+    m_ValueString->SetText(s.str());
     sigValueChanged.emit(this);
     sigFloatChanged.emit(m_Value);
     sigMouseDrag.emit(m_Value);
@@ -241,10 +248,10 @@
 
   }
 
-  void RangeValue::OnValidateKeyboardEntry(EditTextBox * /* textbox */, const NString &text)
+  void RangeValue::OnValidateKeyboardEntry(EditTextBox* /* textbox */, const std::string &text)
   {
     float f;
-    f = CharToDouble(text.GetTCharPtr());
+    f = CharToDouble(text.c_str());
     SetValue(f);
     sigValueChanged.emit(this);
     sigFloatChanged.emit(m_Value);

=== modified file 'Nux/RangeValue.h'
--- Nux/RangeValue.h	2012-10-02 07:32:55 +0000
+++ Nux/RangeValue.h	2012-10-11 16:27:25 +0000
@@ -88,7 +88,7 @@
     void OnReceiveMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
     void OnKeyboardFocus();
     void OnLostKeyboardFocus();
-    void OnValidateKeyboardEntry(EditTextBox *textbox, const NString &text);
+    void OnValidateKeyboardEntry(EditTextBox *textbox, const std::string &text);
 
     bool IsCtrlKeyPressed() const
     {

=== modified file 'Nux/RangeValueInteger.cpp'
--- Nux/RangeValueInteger.cpp	2012-10-02 07:32:55 +0000
+++ Nux/RangeValueInteger.cpp	2012-10-11 16:27:25 +0000
@@ -164,7 +164,7 @@
       m_Value = value;
 
     m_MarkerPosition = m_Value;
-    m_ValueString->SetText(NString::Printf("%d", m_Value));
+    m_ValueString->SetText(std::to_string((long long)m_Value));
     QueueDraw();
   }
 
@@ -197,7 +197,7 @@
         m_Value++;
     }
 
-    m_ValueString->SetText(NString::Printf("%d", m_Value));
+    m_ValueString->SetText(std::to_string((long long)m_Value));
     sigValueChanged.emit(this);
     sigMouseDown.emit(m_Value);
     sigValueChanged2.emit(m_Value);
@@ -220,7 +220,7 @@
     }
 
     m_MarkerPosition = m_Value;
-    m_ValueString->SetText(NString::Printf("%d", m_Value));
+    m_ValueString->SetText(std::to_string((long long)m_Value));
     sigValueChanged.emit(this);
     sigMouseUp.emit(m_Value);
     sigValueChanged2.emit(m_Value);
@@ -249,7 +249,7 @@
         m_Value++;
     }
 
-    m_ValueString->SetText(NString::Printf("%d", m_Value));
+    m_ValueString->SetText(std::to_string((long long)m_Value));
     sigValueChanged.emit(this);
     sigMouseDrag.emit(m_Value);
     sigValueChanged2.emit(m_Value);
@@ -267,10 +267,10 @@
 
   }
 
-  void RangeValueInteger::OnValidateKeyboardEntry(EditTextBox * /* textbox */, const NString &text)
+  void RangeValueInteger::OnValidateKeyboardEntry(EditTextBox* /* textbox */, const std::string &text)
   {
     int i;
-    i = CharToInteger(text.GetTCharPtr());
+    i = CharToInteger(text.c_str());
     SetValue(i);
     sigValueChanged.emit(this);
     sigSetTypedValue.emit(i);

=== modified file 'Nux/RangeValueInteger.h'
--- Nux/RangeValueInteger.h	2012-10-02 07:32:55 +0000
+++ Nux/RangeValueInteger.h	2012-10-11 16:27:25 +0000
@@ -93,7 +93,7 @@
     void OnReceiveMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
     void OnKeyboardFocus();
     void OnLostKeyboardFocus();
-    void OnValidateKeyboardEntry(EditTextBox *textbox, const NString &text);
+    void OnValidateKeyboardEntry(EditTextBox *textbox, const std::string &text);
 
     bool IsCtrlKeyPressed() const
     {

=== modified file 'Nux/SpinBox.cpp'
--- Nux/SpinBox.cpp	2012-10-02 07:32:55 +0000
+++ Nux/SpinBox.cpp	2012-10-11 16:27:25 +0000
@@ -43,7 +43,7 @@
     m_EditLine->SetValidator(&m_IntValidator);
     m_EditLine->SetSuffix("");
     m_EditLine->SetPrefix("");
-    m_EditLine->SetText(NString::Printf("%d", m_IntValidator.GetMinimum()));
+    m_EditLine->SetText(std::to_string((long long)m_IntValidator.GetMinimum()));
 
     m_EditLine->SetMinimumSize(1.5 * DEFAULT_WIDGET_WIDTH, DEFAULT_WIDGET_HEIGHT);
     m_EditLine->SetGeometry(Geometry(0, 0, DEFAULT_WIDGET_WIDTH, DEFAULT_WIDGET_HEIGHT));
@@ -129,7 +129,7 @@
   void SpinBox::SetValue(int value)
   {
     m_iValue = m_IntValidator.GetClampedValue(value);
-    m_EditLine->SetText(NString::Printf("%d", m_iValue));
+    m_EditLine->SetText(std::to_string((long long)m_iValue));
     sigValueChanged.emit(this);
     sigValue.emit(m_iValue);
     QueueDraw();
@@ -216,27 +216,27 @@
   void SpinBox::ImplementValidateEntry()
   {
     double ret = 0;
-    ret = CharToDouble(m_EditLine->GetCleanText().GetTCharPtr());
+    ret = CharToDouble(m_EditLine->GetCleanText().c_str());
     {
       m_iValue = m_IntValidator.GetClampedValue(ret);
-      m_EditLine->SetText(NString::Printf("%d", m_iValue));
+      m_EditLine->SetText(std::to_string((long long)m_iValue));
       sigValueChanged.emit(this);
       sigValue.emit(m_iValue);
 //
 //        if (m_iValue < m_IntValidator.GetMinimum())
 //        {
 //            m_iValue = m_IntValidator.GetMinimum();
-//            m_EditLine->SetText(NString::Printf("%d", m_iValue));
+//            m_EditLine->SetText(std::string::Printf("%d", m_iValue));
 //        }
 //        if (m_iValue > m_IntValidator.GetMaximum())
 //        {
 //            m_iValue = m_IntValidator.GetMaximum();
-//            m_EditLine->SetText(NString::Printf("%d", m_iValue));
+//            m_EditLine->SetText(std::string::Printf("%d", m_iValue));
 //        }
     }
 //     else
 //     {
-//         m_EditLine->SetText(NString::Printf("%d", m_iValue));
+//         m_EditLine->SetText(std::string::Printf("%d", m_iValue));
 //         sigValueChanged.emit(this);
 //         sigValue.emit(m_iValue);
 //     }

=== modified file 'Nux/SpinBoxDouble.cpp'
--- Nux/SpinBoxDouble.cpp	2012-10-02 07:32:55 +0000
+++ Nux/SpinBoxDouble.cpp	2012-10-11 16:27:25 +0000
@@ -53,7 +53,7 @@
     m_EditLine->SetValidator(&m_DoubleValidator);
     m_EditLine->SetSuffix("");
     m_EditLine->SetPrefix("");
-    m_EditLine->SetText(NString::Printf("%.3f", m_DoubleValidator.GetMinimum()));
+    m_EditLine->SetText(std::to_string((long double)m_DoubleValidator.GetMinimum()));
 
     m_EditLine->SetMinimumSize(1.5 * DEFAULT_WIDGET_WIDTH, DEFAULT_WIDGET_HEIGHT);
     m_EditLine->SetGeometry(Geometry(0, 0, DEFAULT_WIDGET_WIDTH, DEFAULT_WIDGET_HEIGHT));
@@ -136,7 +136,7 @@
 //        m_Value = m_DoubleValidator.GetMinimum();
 //    if (m_Value > m_DoubleValidator.GetMaximum())
 //        m_Value = m_DoubleValidator.GetMaximum();
-    m_EditLine->SetText(NString::Printf("%.3f", m_Value));
+    m_EditLine->SetText(std::to_string((long double)m_Value));
     sigValueChanged.emit(this);
     sigValue.emit(m_Value);
     QueueDraw();
@@ -223,27 +223,27 @@
   void SpinBoxDouble::ImplementValidateEntry()
   {
     double ret = 0;
-    ret = CharToDouble(m_EditLine->GetCleanText().GetTCharPtr());
+    ret = CharToDouble(m_EditLine->GetCleanText().c_str());
     {
       m_Value = m_DoubleValidator.GetClampedValue(ret);
-      m_EditLine->SetText(NString::Printf("%.3f", m_Value));
+      m_EditLine->SetText(std::to_string((long double)m_Value));
       sigValueChanged.emit(this);
       sigValue.emit(m_Value);
 //
 //        if (m_Value < m_DoubleValidator.GetMinimum())
 //        {
 //            m_Value = m_DoubleValidator.GetMinimum();
-//            m_EditLine->SetText(NString::Printf("%.3f", m_Value));
+//            m_EditLine->SetText(std::string::Printf("%.3f", m_Value));
 //        }
 //        if (m_Value > m_DoubleValidator.GetMaximum())
 //        {
 //            m_Value = m_DoubleValidator.GetMaximum();
-//            m_EditLine->SetText(NString::Printf("%.3f", m_Value));
+//            m_EditLine->SetText(std::string::Printf("%.3f", m_Value));
 //        }
     }
 //     else
 //     {
-//         m_EditLine->SetText(NString::Printf("%.3f", m_Value));
+//         m_EditLine->SetText(std::string::Printf("%.3f", m_Value));
 //         sigValueChanged.emit(this);
 //         sigValue.emit(m_Value);
 //     }

=== modified file 'Nux/SpinBox_Logic.cpp'
--- Nux/SpinBox_Logic.cpp	2012-09-26 06:44:12 +0000
+++ Nux/SpinBox_Logic.cpp	2012-10-11 16:27:25 +0000
@@ -166,17 +166,17 @@
 //        if (m_iValue < m_IntValidator.GetMinimum())
 //        {
 //            m_iValue = m_IntValidator.GetMinimum();
-//            m_EditLine->setCaption(NString::Printf("%d", m_iValue));
+//            m_EditLine->setCaption(std::string::Printf("%d", m_iValue));
 //        }
 //        if (m_iValue > m_IntValidator.GetMaximum())
 //        {
 //            m_iValue = m_IntValidator.GetMaximum();
-//            m_EditLine->setCaption(NString::Printf("%d", m_iValue));
+//            m_EditLine->setCaption(std::string::Printf("%d", m_iValue));
 //        }
 //    }
 //    else
 //    {
-//        m_EditLine->setCaption(NString::Printf("%d", m_iValue));
+//        m_EditLine->setCaption(std::string::Printf("%d", m_iValue));
 //    }
   }
 

=== modified file 'Nux/StaticTextBox.cpp'
--- Nux/StaticTextBox.cpp	2012-10-02 07:32:55 +0000
+++ Nux/StaticTextBox.cpp	2012-10-11 16:27:25 +0000
@@ -67,13 +67,13 @@
       if (m_bDrawBackground)
       {
         GetPainter().PushDrawLayer(graphics_engine, base, m_Background);
-        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(), m_Text.m_string, m_TextColor, m_WriteAlpha, m_TextAlignment);
+        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(), m_Text, m_TextColor, m_WriteAlpha, m_TextAlignment);
         GetPainter().PopBackground();
       }
       else
       {
         //GetPainter().PaintBackground(graphics_engine, base);
-        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(), m_Text.m_string, m_TextColor, m_WriteAlpha, m_TextAlignment);
+        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(), m_Text, m_TextColor, m_WriteAlpha, m_TextAlignment);
       }
 
       graphics_engine.PopClippingRectangle();
@@ -85,25 +85,13 @@
 
   }
 
-  void StaticTextBox::SetText(const char &Caption)
-  {
-    NString s(Caption);
-    SetText(s);
-  }
-
   void StaticTextBox::SetText(const char *Caption)
   {
-    NString s(Caption);
-    SetText(s);
-  }
-
-  void StaticTextBox::SetText(const tstring &Caption)
-  {
-    NString s(Caption);
-    SetText(s);
-  }
-
-  void StaticTextBox::SetText(const NString &Caption)
+    std::string s(Caption);
+    SetText(s);
+  }
+
+  void StaticTextBox::SetText(const std::string &Caption)
   {
     m_Text = Caption;
 
@@ -128,10 +116,10 @@
 
   void StaticTextBox::AdjustMinWidthToMatchText()
   {
-    if (m_Text.Size() == 0)
+    if (m_Text.size() == 0)
       return;
 
-    SetMinimumWidth(/*4 + */GetFont()->GetStringWidth(m_Text.GetTStringRef()));
+    SetMinimumWidth(/*4 + */GetFont()->GetStringWidth(m_Text));
   }
 
   void StaticTextBox::SetFont(ObjectPtr<FontTexture> Font)

=== modified file 'Nux/StaticTextBox.h'
--- Nux/StaticTextBox.h	2012-10-02 07:32:55 +0000
+++ Nux/StaticTextBox.h	2012-10-11 16:27:25 +0000
@@ -38,14 +38,12 @@
     virtual void DrawContent(GraphicsEngine &graphics_engine, bool force_draw);
 
     // API
-    void SetText(const char &Caption);
     void SetText(const char *Caption);
-    void SetText(const tstring &Caption);
-    void SetText(const NString &Caption);
+    void SetText(const std::string &Caption);
     const char *GetText() const;
     unsigned int GetTextSize() const
     {
-      return (unsigned int) m_Text.Length();
+      return (unsigned int) m_Text.length();
     }
 
     //! Change the widget minimum width whenever the text is set.
@@ -99,7 +97,7 @@
     virtual bool AcceptKeyNavFocus();
     void AdjustMinWidthToMatchText();
 
-    NString m_Text;
+    std::string m_Text;
     Color m_TextColor;
     Color m_BackgroundColor;
     tstring m_temporary_caption;

=== modified file 'Nux/SystemThread.h'
--- Nux/SystemThread.h	2011-12-29 18:06:53 +0000
+++ Nux/SystemThread.h	2012-10-11 16:27:25 +0000
@@ -82,7 +82,7 @@
     // Declare operator adress-of as private
     SystemThread *operator &();
 
-    NString m_ThreadName;
+    std::string m_ThreadName;
 
     friend SystemThread *CreateSystemThread(AbstractThread *Parent, ThreadUserInitFunc UserInitFunc, void *InitData);
     

=== modified file 'Nux/TabView.cpp'
--- Nux/TabView.cpp	2012-10-02 07:32:55 +0000
+++ Nux/TabView.cpp	2012-10-11 16:27:25 +0000
@@ -40,7 +40,7 @@
   Color TabView::TAB_HEADER_COLOR               = Color(0xFF333333);
   Color TabView::TAB_HEADER_FOCUS_COLOR         = Color(0xFF5D5D5D);
 
-  TabView::TabElement::TabElement(NString TabName, Layout *TabLayout)
+  TabView::TabElement::TabElement(std::string TabName, Layout *TabLayout)
   {
     _index = 0;
     _tab_name = TabName;
@@ -78,7 +78,7 @@
     return _tab_area->GetGeometry();
   }
 
-  const NString &TabView::TabElement::GetName() const
+  const std::string &TabView::TabElement::GetName() const
   {
     return _tab_name;
   }
@@ -206,7 +206,7 @@
     for (unsigned int i = 0; i < vector_size; i++)
     {
       Geometry tab_geo = _tab_array[i]->_tab_area->GetGeometry();
-      const char *tab_text = _tab_array[i]->GetName().GetTCharPtr();
+      const char *tab_text = _tab_array[i]->GetName().c_str();
 
       if (_tab_array[i]->_index == m_FocusTabIndex)
       {

=== modified file 'Nux/TabView.h'
--- Nux/TabView.h	2012-10-02 07:32:55 +0000
+++ Nux/TabView.h	2012-10-11 16:27:25 +0000
@@ -62,16 +62,16 @@
     class TabElement
     {
     public:
-      TabElement(NString TabName, Layout *TabLayout);
+      TabElement(std::string TabName, Layout *TabLayout);
       ~TabElement();
 
       void SetIndex(int index);
       int GetIndex() const;
       void SetGeometry(const Geometry &geo);
       Geometry const& GetGeometry() const;
-      const NString &GetName() const;
+      const std::string &GetName() const;
 
-      NString     _tab_name;
+      std::string     _tab_name;
       Layout     *_tab_content_layout;
       BasicView  *_tab_area;
       int         _index;

=== modified file 'Nux/VLayout.cpp'
--- Nux/VLayout.cpp	2012-09-26 06:44:12 +0000
+++ Nux/VLayout.cpp	2012-10-11 16:27:25 +0000
@@ -49,7 +49,7 @@
 
   }
 
-  VLayout::VLayout(NString name, NUX_FILE_LINE_DECL)
+  VLayout::VLayout(std::string name, NUX_FILE_LINE_DECL)
     : LinearLayout(NUX_FILE_LINE_PARAM)
   {
     m_name = name;

=== modified file 'Nux/VLayout.h'
--- Nux/VLayout.h	2011-10-21 22:06:35 +0000
+++ Nux/VLayout.h	2012-10-11 16:27:25 +0000
@@ -33,7 +33,7 @@
     NUX_DECLARE_OBJECT_TYPE(VLayout, LinearLayout);
   public:
     VLayout(NUX_FILE_LINE_PROTO);
-    VLayout(NString name, NUX_FILE_LINE_PROTO);
+    VLayout(std::string name, NUX_FILE_LINE_PROTO);
     ~VLayout();
 
     virtual long ComputeContentSize();

=== modified file 'Nux/Validator.cpp'
--- Nux/Validator.cpp	2011-10-10 01:52:00 +0000
+++ Nux/Validator.cpp	2012-10-11 16:27:25 +0000
@@ -38,13 +38,13 @@
   bool Validator::InitRegExp()
   {
 #if defined(NUX_OS_WINDOWS)
-    regex_ = _regexp_str.GetTCharPtr();
+    regex_ = _regexp_str.c_str();
     return true;
 #else
     const char *error;
     int   erroffset;
     _regexp = pcre_compile(
-      _regexp_str.GetTCharPtr(),    /* the pattern */
+      _regexp_str.c_str(),    /* the pattern */
       PCRE_MULTILINE,
       &error,         /* for error message */
       &erroffset,     /* for error offset */
@@ -52,7 +52,7 @@
 
     if (!_regexp)
     {
-      nuxDebugMsg("[IntegerValidator::IntegerValidator] Invalid regular expression: %s", _regexp_str.GetTCharPtr());
+      nuxDebugMsg("[IntegerValidator::IntegerValidator] Invalid regular expression: %s", _regexp_str.c_str());
       return false;
     }    
     return true;

=== modified file 'Nux/Validator.h'
--- Nux/Validator.h	2012-09-26 06:44:12 +0000
+++ Nux/Validator.h	2012-10-11 16:27:25 +0000
@@ -52,7 +52,7 @@
 
   protected:
     bool InitRegExp();
-    NString _regexp_str;
+    std::string _regexp_str;
 
 #if defined(NUX_OS_WINDOWS)
     std::regex regex_;

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-09-26 16:09:07 +0000
+++ Nux/WindowCompositor.cpp	2012-10-11 16:27:25 +0000
@@ -1418,11 +1418,11 @@
     else
       window_thread_->GetGraphicsEngine().SetOpenGLClippingRectangle(0, 0, buffer_width, buffer_height);
 
-    if (m_TooltipText.Size())
+    if (m_TooltipText.size())
     {
         //SetProcessingTopView(_tooltip_window);
         GetPainter().PaintShape(window_thread_->GetGraphicsEngine(), _tooltip_geometry, Color(0xA0000000), eSHAPE_CORNER_ROUND10, true);
-        GetPainter().PaintTextLineStatic(window_thread_->GetGraphicsEngine(), GetSysBoldFont(), _tooltip_text_geometry, m_TooltipText.m_string, Color(0xFFFFFFFF));
+        GetPainter().PaintTextLineStatic(window_thread_->GetGraphicsEngine(), GetSysBoldFont(), _tooltip_text_geometry, m_TooltipText, Color(0xFFFFFFFF));
         //SetProcessingTopView(NULL);
     }
 
@@ -1807,9 +1807,9 @@
     m_TooltipX = x;
     m_TooltipY = y;
 
-    if (m_TooltipText.Size())
+    if (m_TooltipText.size())
     {
-      int w = GetSysBoldFont()->GetCharStringWidth(m_TooltipText.GetTCharPtr());
+      int w = GetSysBoldFont()->GetCharStringWidth(m_TooltipText.c_str());
       int h = GetSysBoldFont()->GetFontHeight();
 
       _tooltip_text_geometry = Geometry(
@@ -1910,7 +1910,7 @@
         key_focus_area_->key_nav_focus_change.emit(key_focus_area_.GetPointer(), false, direction);
         // nuxDebugMsg("[WindowCompositor::SetKeyFocusArea] Area type '%s' named '%s': Lost key nav focus.",
         //   key_focus_area_->Type().name,
-        //   key_focus_area_->GetBaseString().GetTCharPtr());
+        //   key_focus_area_->GetBaseString().c_str());
       }
 
       if (key_focus_area_->Type().IsDerivedFromType(View::StaticObjectType))
@@ -1938,7 +1938,7 @@
         key_focus_area_->key_nav_focus_change.emit(key_focus_area_.GetPointer(), true, direction);
         // nuxDebugMsg("[WindowCompositor::SetKeyFocusArea] Area type '%s' named '%s': Has key nav focus.",
         //   key_focus_area_->Type().name,
-        //   key_focus_area_->GetBaseString().GetTCharPtr());
+        //   key_focus_area_->GetBaseString().c_str());
       }
 
       if (key_focus_area_->Type().IsDerivedFromType(View::StaticObjectType))
@@ -2228,7 +2228,7 @@
           key_focus_area_->key_nav_focus_change.emit(key_focus_area_.GetPointer(), false, KEY_NAV_NONE);
           // nuxDebugMsg("[WindowCompositor::GrabKeyboardAdd] Area type '%s' named '%s': Lost key nav focus.",
           //   key_focus_area_->Type().name,
-          //   key_focus_area_->GetBaseString().GetTCharPtr());
+          //   key_focus_area_->GetBaseString().c_str());
 
         }
 
@@ -2303,7 +2303,7 @@
           key_focus_area_->key_nav_focus_change.emit(key_focus_area_.GetPointer(), false, KEY_NAV_NONE);
           // nuxDebugMsg("[WindowCompositor::GrabKeyboardRemove] Area type '%s' named '%s': Lost key nav focus.",
           //   key_focus_area_->Type().name,
-          //   key_focus_area_->GetBaseString().GetTCharPtr());          
+          //   key_focus_area_->GetBaseString().c_str());          
         }
 
         if (key_focus_area_->Type().IsDerivedFromType(View::StaticObjectType))

=== modified file 'Nux/WindowCompositor.h'
--- Nux/WindowCompositor.h	2012-09-26 16:09:07 +0000
+++ Nux/WindowCompositor.h	2012-10-11 16:27:25 +0000
@@ -514,7 +514,7 @@
     int m_Width;
     int m_Height;
 
-    NString m_TooltipText;
+    std::string m_TooltipText;
     InputArea* m_TooltipArea;
     int m_TooltipX;
     int m_TooltipY;

=== modified file 'NuxCore/FileIO.cpp'
--- NuxCore/FileIO.cpp	2012-09-30 16:35:58 +0000
+++ NuxCore/FileIO.cpp	2012-10-11 16:27:25 +0000
@@ -331,7 +331,7 @@
     bool SaveAsUnicode = false, Success = true;
 #if UNICODE
 
-    for ( int i = 0; i < String.Length(); i++ )
+    for ( int i = 0; i < String.length(); i++ )
     {
       // Test if the UNICODE 0xABCD is the same as the ASCII 0x00CB.
       if ( (*String) [i] != (TCHAR) (ANSIUCHAR) ConvertTCHARToAnsiChar ( (*String) [i]) )

=== modified file 'NuxCore/FileIO.h'
--- NuxCore/FileIO.h	2012-09-30 16:35:58 +0000
+++ NuxCore/FileIO.h	2012-10-11 16:27:25 +0000
@@ -23,6 +23,9 @@
 #ifndef NFILE_H
 #define NFILE_H
 
+#include <vector>
+#include <string>
+
 namespace nux
 {
 
@@ -32,7 +35,6 @@
   bool LoadFileToString(std::string &Result, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
   bool SaveArrayToFile(const std::vector<BYTE>& Array, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
   bool SaveStringToFile(const std::string &String, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
-
 }
 
 

=== modified file 'NuxCore/FileManager/NFileManagerGNU.h'
--- NuxCore/FileManager/NFileManagerGNU.h	2012-09-26 06:44:12 +0000
+++ NuxCore/FileManager/NFileManagerGNU.h	2012-10-11 16:27:25 +0000
@@ -127,9 +127,9 @@
     bool DeleteDirectory (const TCHAR *Path, bool DeleteContentFirst = false);
 
 
-    void FindFiles (std::vector<NString>& /* Result */, const TCHAR * /* Filename */, bool /* Files */, bool /* Directories */) {};
-    void ListFilesInDirectory (std::vector<NString>& /* Result */, const TCHAR * /* DirName */) {};
-    double GetFileAgeSeconds (const TCHAR * /* Filename */)
+    void FindFiles(std::vector<std::string>& /* Result */, const TCHAR* /* Filename */, bool /* Files */, bool /* Directories */) {};
+    void ListFilesInDirectory (std::vector<std::string>& /* Result */, const TCHAR* /* DirName */) {};
+    double GetFileAgeSeconds (const TCHAR* /* Filename */)
     {
       return 0;
     };
@@ -141,9 +141,9 @@
     {
       return false;
     };
-    NString GetCurrentDirectory()
+    std::string GetCurrentDirectory()
     {
-      return NString();
+      return std::string();
     };
     bool GetTimeStamp (const TCHAR * /* Filename */, FileTimeStamp & /* Timestamp */)
     {

=== modified file 'NuxCore/FileManager/NFileManagerGeneric.cpp'
--- NuxCore/FileManager/NFileManagerGeneric.cpp	2012-10-01 23:37:25 +0000
+++ NuxCore/FileManager/NFileManagerGeneric.cpp	2012-10-11 16:27:25 +0000
@@ -38,10 +38,10 @@
     }
 
     int	    Result		= COPY_OK;
-    NString SrcFile		= InSrcFile;
-    NString DestFile	= InDestFile;
+    std::string SrcFile		= InSrcFile;
+    std::string DestFile	= InDestFile;
 
-    NSerializer *Src = CreateFileReader (SrcFile.GetTCharPtr() );
+    NSerializer *Src = CreateFileReader (SrcFile.c_str() );
 
     if (!Src)
     {
@@ -50,7 +50,7 @@
     else
     {
       unsigned int Size = Src->GetFileSize();
-      NSerializer *Dest = CreateFileWriter (DestFile.GetTCharPtr(), (OverWriteExisting ? 0 : FILEWRITE_NOREPLACEEXISTING) | (OverWriteReadOnly ? FILEWRITE_EVENIFREADONLY : 0) );
+      NSerializer *Dest = CreateFileWriter (DestFile.c_str(), (OverWriteExisting ? 0 : FILEWRITE_NOREPLACEEXISTING) | (OverWriteReadOnly ? FILEWRITE_EVENIFREADONLY : 0) );
 
       if (!Dest)
       {
@@ -103,7 +103,7 @@
 
         if (Result != COPY_OK)
         {
-          Delete (DestFile.GetTCharPtr() );
+          Delete (DestFile.c_str() );
         }
       }
 
@@ -188,28 +188,28 @@
     if (PathLength == 0)
       return false;
 
-    NString WildcardPath = NString (Path);
+    std::string WildcardPath = std::string (Path);
 
     if ( (WildcardPath[PathLength - 1] != NUX_BACKSLASH_CHAR) && (WildcardPath[PathLength - 1] != NUX_SLASH_CHAR) )
       WildcardPath += NUX_BACKSLASH_CHAR;
 
     WildcardPath += TEXT ("*");
 
-    std::vector<NString> List;
-    FindFiles (List, *WildcardPath, 1, 0);
+    std::vector<std::string> List;
+    FindFiles (List, WildcardPath.c_str(), 1, 0);
 
     for (unsigned int i = 0; i < List.size(); i++)
     {
-      if (!Delete (* (NString (Path) + NUX_BACKSLASH_CHAR + List[i]), 1) )
+      if (!Delete ((std::string (Path) + NUX_BACKSLASH_CHAR + List[i]).c_str(), 1) )
         return 0;
     }
 
     List.clear();
-    FindFiles (List, *WildcardPath, 0, 1);
+    FindFiles (List, WildcardPath.c_str(), 0, 1);
 
     for (unsigned int i = 0; i < List.size(); i++)
     {
-      if (!DeleteDirectory (* (NString (Path) + NUX_BACKSLASH_CHAR + List[i]), true) )
+      if (!DeleteDirectory ((std::string (Path) + NUX_BACKSLASH_CHAR + List[i]).c_str(), true) )
         return 0;
     }
 
@@ -228,13 +228,13 @@
   }
 
 
-  int NFileManagerGeneric::CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, NString &OutputFilename, unsigned int BaseIndex)
+  int NFileManagerGeneric::CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, std::string &OutputFilename, unsigned int BaseIndex)
   {
     nuxAssert (Filename);
     nuxAssert (Extension);
 
-    NString FullPath (Filename);
-    const size_t IndexMarker = FullPath.Length();			// Marks location of the four-digit index.
+    std::string FullPath (Filename);
+    const size_t IndexMarker = FullPath.length();			// Marks location of the four-digit index.
     FullPath += TEXT ("0000.");
     FullPath += Extension;
 
@@ -246,7 +246,7 @@
       FullPath[IndexMarker+2] = (i / 10)  % 10 + TEXT ('0');
       FullPath[IndexMarker+3] =   i     % 10 + TEXT ('0');
 
-      if (GFileManager.FileSize (FullPath.GetTCharPtr() ) == -1)
+      if (GFileManager.FileSize (FullPath.c_str() ) == -1)
       {
         // The file doesn't exist; output success.
         OutputFilename = FullPath;

=== modified file 'NuxCore/FileManager/NFileManagerGeneric.h'
--- NuxCore/FileManager/NFileManagerGeneric.h	2012-09-26 06:44:12 +0000
+++ NuxCore/FileManager/NFileManagerGeneric.h	2012-10-11 16:27:25 +0000
@@ -26,7 +26,6 @@
 namespace nux
 {
 
-  class NString;
   class NFileManagerWindows;
 
   class NFileTransferMonitor
@@ -149,15 +148,15 @@
         @param	BaseIndex		Base for index search.
         @return					Index of the new file. -1 if the file couldn't be created The index has to be in the range [0, 9999].
     */
-    virtual int CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, NString &OutputFilename, unsigned int BaseIndex = 0xffffffff) = 0;
-
-
-    virtual void FindFiles ( std::vector<NString>& FileNames, const TCHAR *Filename, bool Files, bool Directories ) = 0;
-    virtual void ListFilesInDirectory ( std::vector<NString>& Result, const TCHAR *DirName) = 0;
+    virtual int CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, std::string &OutputFilename, unsigned int BaseIndex = 0xffffffff) = 0;
+
+
+    virtual void FindFiles ( std::vector<std::string>& FileNames, const TCHAR *Filename, bool Files, bool Directories ) = 0;
+    virtual void ListFilesInDirectory ( std::vector<std::string>& Result, const TCHAR *DirName) = 0;
     virtual time_t GetFileLastModified (const TCHAR *Filename) = 0;
     virtual double GetFileAgeSeconds (const TCHAR *Filename) = 0;
     virtual bool SetDefaultDirectory() = 0;
-    virtual NString GetCurrentDirectory() = 0;
+    virtual std::string GetCurrentDirectory() = 0;
     virtual bool GetTimeStamp ( const TCHAR *Path, FileTimeStamp &Timestamp ) = 0;
 
 
@@ -172,7 +171,7 @@
     bool MakeDirectory (const TCHAR *Path, bool CreateCompletePath = false);
     bool DeleteDirectory (const TCHAR *Path, bool DeleteContentFirst = false);
     bool Move (const TCHAR *Dest, const TCHAR *Src, bool OverWriteExisting = true, bool OverWriteReadOnly = false, NFileTransferMonitor *Monitor = NULL);
-    int CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, NString &OutputFilename, unsigned int BaseIndex = 0xffffffff);
+    int CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, std::string &OutputFilename, unsigned int BaseIndex = 0xffffffff);
 
     bool IsDrive (const TCHAR *Path);
   };

=== modified file 'NuxCore/FileManager/NFileManagerWindows.cpp'
--- NuxCore/FileManager/NFileManagerWindows.cpp	2012-07-30 21:21:03 +0000
+++ NuxCore/FileManager/NFileManagerWindows.cpp	2012-10-11 16:27:25 +0000
@@ -690,7 +690,7 @@
     return true;
   }
 
-  void NFileManagerWindows::FindFiles (std::vector<NString>& Result, const TCHAR *Filename, bool Files, bool Directories)
+  void NFileManagerWindows::FindFiles (std::vector<std::string>& Result, const TCHAR *Filename, bool Files, bool Directories)
   {
     HANDLE Handle = INVALID_HANDLE_VALUE;
     WIN32_FIND_DATA SearchData;
@@ -707,7 +707,7 @@
 
         {
           if ( (SearchData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? Directories : Files)
-            Result.push_back (NString (SearchData.cFileName) );
+            Result.push_back (std::string(SearchData.cFileName) );
         }
       }
       while (::FindNextFile (Handle, &SearchData) );
@@ -717,13 +717,13 @@
       ::FindClose (Handle);
   }
 
-  void NFileManagerWindows::ListFilesInDirectory (std::vector<NString>& Result, const TCHAR *DirName)
+  void NFileManagerWindows::ListFilesInDirectory (std::vector<std::string>& Result, const TCHAR *DirName)
   {
     WIN32_FIND_DATA SearchData;
     HANDLE Handle = INVALID_HANDLE_VALUE;
-    NString DirectoryName = DirName;
+    std::string DirectoryName = DirName;
     DirectoryName += TEXT ("\\*");
-    Handle = ::FindFirstFile (DirectoryName.GetTCharPtr(), &SearchData);
+    Handle = ::FindFirstFile (DirectoryName.c_str(), &SearchData);
 
     if (Handle != INVALID_HANDLE_VALUE)
     {
@@ -735,7 +735,7 @@
             ! (SearchData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) &&
             ! (SearchData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) )
         {
-          Result.push_back (NString (SearchData.cFileName) );
+          Result.push_back(std::string(SearchData.cFileName));
         }
       }
       while (::FindNextFile (Handle, &SearchData) );
@@ -806,19 +806,19 @@
 
   bool NFileManagerWindows::SetDefaultDirectory()
   {
-    return CALL_OS_TCHAR_FUNCTION (SetCurrentDirectoryW (GetProgramDirectory() ), SetCurrentDirectoryA (TCHAR_TO_ANSI (GetProgramDirectory().GetTCharPtr() ) ) ) != 0;
+    return CALL_OS_TCHAR_FUNCTION(SetCurrentDirectoryW(GetProgramDirectory()), SetCurrentDirectoryA(TCHAR_TO_ANSI(GetProgramDirectory().c_str()))) != 0;
   }
 
-  NString NFileManagerWindows::GetCurrentDirectory()
+  std::string NFileManagerWindows::GetCurrentDirectory()
   {
 #if UNICODE
     TCHAR Buffer[1024] = TEXT ("");
     ::GetCurrentDirectoryW (NUX_ARRAY_COUNT (Buffer), Buffer);
-    return NString (Buffer);
+    return std::string(Buffer);
 #else
     ANSICHAR Buffer[1024] = "";
     ::GetCurrentDirectoryA (NUX_ARRAY_COUNT (Buffer), Buffer);
-    return NString (Buffer);
+    return std::string(Buffer);
 #endif
   }
 

=== modified file 'NuxCore/FileManager/NFileManagerWindows.h'
--- NuxCore/FileManager/NFileManagerWindows.h	2011-10-21 22:06:35 +0000
+++ NuxCore/FileManager/NFileManagerWindows.h	2012-10-11 16:27:25 +0000
@@ -130,13 +130,13 @@
     bool DeleteDirectory (const TCHAR *Path, bool DeleteContentFirst = false);
 
 
-    void FindFiles (std::vector<NString>& Result, const TCHAR *Filename, bool Files, bool Directories);
-    void ListFilesInDirectory (std::vector<NString>& Result, const TCHAR *DirName);
+    void FindFiles (std::vector<std::string>& Result, const TCHAR *Filename, bool Files, bool Directories);
+    void ListFilesInDirectory (std::vector<std::string>& Result, const TCHAR *DirName);
     double GetFileAgeSeconds (const TCHAR *Filename);
     time_t GetFileLastModified (const TCHAR *Filename);
     bool GetFileLastModified (const TCHAR *Filename, SYSTEMTIME &sysTime, bool bLocalTime);
     bool SetDefaultDirectory();
-    NString GetCurrentDirectory();
+    std::string GetCurrentDirectory();
     bool GetTimeStamp (const TCHAR *Filename, FileTimeStamp &Timestamp);
   };
 

=== modified file 'NuxCore/FileManager/NSerializer.cpp'
--- NuxCore/FileManager/NSerializer.cpp	2012-02-18 21:32:06 +0000
+++ NuxCore/FileManager/NSerializer.cpp	2012-10-11 16:27:25 +0000
@@ -35,7 +35,7 @@
 //     }
 // }
 
-// NSerializer& operator << (NSerializer& Sr, NString& s)
+// NSerializer& operator << (NSerializer& Sr, std::string& s)
 // {
 //     Sr.SerializeBuffer<TCHAR>(NUX_CONST_CAST(TCHAR*, s.GetTCharPtr()), s.Size()+1, sizeof(TCHAR));
 //     return Sr;

=== modified file 'NuxCore/FileName.cpp'
--- NuxCore/FileName.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/FileName.cpp	2012-10-11 16:27:25 +0000
@@ -27,72 +27,59 @@
 namespace nux
 {
 
-  NString NFileName::GetDrive() const
+  std::string NFileName::GetDrive() const
   {
-    size_t Pos = FindFirstOccurence (NUX_BACKSLASH_CHAR);
-
-    if (Pos == tstring::npos)
-    {
-      Pos = FindFirstOccurence ("\\");
-
-      if (Pos != tstring::npos)
-      {
-        return GetSubString (Pos);
-      }
-    }
-
-    return TEXT ("");
+    size_t Pos = find('\\', 0);
+    return Pos != std::string::npos ? substr(0, Pos) : "";
   }
 
-  NString NFileName::GetExtension() const
+  std::string NFileName::GetExtension() const
   {
-    size_t Pos = FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
-    {
-      return GetSubString (Pos + 1, Length() - Pos - 1);
-    }
-
-    return TEXT ("");
+    size_t Pos = rfind('.');
+    return Pos != std::string::npos ? substr(Pos + 1) : "";
   }
 
 // Returns the base filename without the path
-  NString NFileName::GetCleanFilename() const
+  std::string NFileName::GetCleanFilename() const
   {
-    size_t Pos = FindLastOccurence (NUX_BACKSLASH_CHAR);
-    Pos = Max<size_t> (Pos, FindLastOccurence (TEXT ("/") ) ); // in case we are using slash and the NUX_BACKSLASH_CHAR is different.
-    Pos = Max<size_t> (Pos, FindLastOccurence (TEXT ("\\") ) ); // in case we are using backslash and the NUX_BACKSLASH_CHAR is different.
-
-    if (Pos != tstring::npos)
-    {
-      return GetSubString (Pos + 1, Length() - Pos - 1);
-    }
-
-    return *this;
+    size_t bsPos = rfind('\\');
+    size_t sPos = rfind('/');
+    size_t Pos = std::string::npos;
+    if (bsPos != std::string::npos && sPos != std::string::npos)
+    {
+      Pos = Max<size_t>(bsPos, sPos);
+    }
+    else if (bsPos != std::string::npos)
+    {
+      Pos = bsPos;
+    }
+    else if (sPos != std::string::npos)
+    {
+      Pos = sPos;
+    }
+    return  Pos != std::string::npos ? (const std::string)substr(Pos + 1) : *this;
   }
 
-  NString NFileName::GetFilenameNoExtension() const
+  std::string NFileName::GetFilenameNoExtension() const
   {
-    size_t Pos = FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
+    size_t Pos = rfind('.');
+    if (Pos != std::string::npos && Pos != 0)
     {
-      return GetSubString (Pos);
+      return substr(0, Pos);
     }
-
     return *this;
   }
 
 // Returns the base filename without the path and without the extension
-  NString NFileName::GetBaseFilename() const
+  std::string NFileName::GetBaseFilename() const
   {
-    NString Wk = GetCleanFilename();
-
-    size_t Pos = Wk.FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
+    std::string Wk = GetCleanFilename();
+
+    size_t Pos = Wk.rfind('.');
+
+    if (Pos != std::string::npos)
     {
-      return Wk.GetSubString (Pos);
+      return Wk.substr(Pos);
     }
 
     return Wk;
@@ -100,113 +87,124 @@
 
 // Returns the path in front of the filename
 
-  NString NFileName::GetDirectoryPath() const
+  std::string NFileName::GetDirectoryPath() const
   {
-    size_t Pos = FindLastOccurence (NUX_BACKSLASH_CHAR);
-    Pos = Max<size_t> (Pos, FindLastOccurence (TEXT ("/") ) ); // in case we are using slash and the NUX_BACKSLASH_CHAR is different.
-    Pos = Max<size_t> (Pos, FindLastOccurence (TEXT ("\\") ) ); // in case we are using backslash and the NUX_BACKSLASH_CHAR is different.
-
-    if (Pos != tstring::npos)
-    {
-      return GetSubString (Pos);
-    }
-
-    return *this;
+    size_t bsPos = rfind('\\');
+    size_t sPos = rfind('/');
+    size_t Pos = std::string::npos;
+    if (bsPos != std::string::npos && sPos != std::string::npos)
+    {
+      Pos = Max<size_t>(bsPos, sPos);
+    }
+    else if (bsPos != std::string::npos)
+    {
+      Pos = bsPos;
+    }
+    else if (sPos != std::string::npos)
+    {
+      Pos = sPos;
+    }
+    return Pos != std::string::npos ? substr(Pos) : ".";
   }
 
   void NFileName::ChangeFileExtension (const TCHAR *ext)
   {
-    size_t Pos = FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
-    {
-      (*this) = GetSubString (Pos) + NString (TEXT (".") ) + NString (ext);
-    }
-    else
-    {
-      (*this) = (*this) + NString (TEXT (".") ) + NString (ext);
-    }
+    size_t Pos = rfind('.');
+    if (Pos != std::string::npos)
+    {
+      replace(begin() + Pos, end(), ext);
+    }
+    *this = *this + "." + ext;
   }
 
   void NFileName::ConvertSlashToBackslash()
   {
-    size_t Pos = tstring::npos;
-    Pos = FindFirstOccurence (TEXT ('/') );
+    size_t Pos = find('/');
 
-    while (Pos != tstring::npos)
+    while (Pos != std::string::npos)
     {
-      Replace (Pos, 1, 1, TEXT ('\\') );
+      replace(Pos, 1, 1, '\\');
     }
   }
 
-
   void NFileName::ConvertBackslashToSlash()
   {
-    size_t Pos = tstring::npos;
-    Pos = FindFirstOccurence (TEXT ('\\') );
+    size_t Pos = find('\\');
 
-    while (Pos != tstring::npos)
+    while (Pos != std::string::npos)
     {
-      Replace (Pos, 1, 1, TEXT ('/') );
+      replace(Pos, 1, 1, '/');
     }
   }
 
   void NFileName::AddSlashAtEnd()
   {
-    if (GetLastChar() != TEXT ('/') )
-      *this += TEXT ('/');
+    if (!empty() && operator[](size() - 1) != '/')
+      append("/");
   }
 
   void NFileName::AddBackSlashAtEnd()
   {
-    if (GetLastChar() != TEXT ('\\') )
-      *this += TEXT ('\\');
+    if (!empty() && operator[](size() - 1) != '\\')
+      *this += '\\';
   }
 
   void NFileName::AddSlashAtStart()
   {
-    if (GetFirstChar() != TEXT ('/') )
-      Insert (0, 1, TEXT ('/') );
+    if (!empty() && operator[](0) != '/')
+      insert(0, 1, '/');
   }
 
   void NFileName::AddBackSlashAtStart()
   {
-    if (GetFirstChar() != TEXT ('\\') )
-      Insert (0, 1, TEXT ('\\') );
+    if (!empty() && operator[](0) != '\\')
+      insert(0, 1, '\\');
   }
 
   void NFileName::RemoveSlashAtEnd()
   {
-    RemoveSuffix (TEXT ('/') );
+    if (!empty() && operator[](size() - 1) == '/')
+    {
+      erase(end() - 1);
+    }
   }
 
   void NFileName::RemoveBackSlashAtEnd()
   {
-    RemoveSuffix (TEXT ('\\') );
+    if (!empty() && operator[](size() - 1) == '\\')
+    {
+      erase(end() - 1);
+    }
   }
 
   void NFileName::RemoveSlashAtStart()
   {
-    RemovePrefix (TEXT ('/') );
+    if (!empty() && operator[](0) == '/')
+    {
+      erase(0, 1);
+    }
   }
 
   void NFileName::RemoveBackSlashAtStart()
   {
-    RemovePrefix (TEXT ('\\') );
+    if (!empty() && operator[](0) == '\\')
+    {
+      erase(0, 1);
+    }
   }
 
   void NFileName::ConvertToCleanSlash()
   {
     ConvertBackslashToSlash();
 
-    size_t size = Size();
+    size_t count = size();
 
-    for (size_t i = 0; i < size; )
+    for (size_t i = 0; i < count; )
     {
-      if ( (i < size - 1) && (operator[] (i) == TEXT ('/') ) && (operator[] (i + 1) == TEXT ('/') ) )
+      if ( (i < count - 1) && (operator[] (i) == '/' ) && (operator[] (i + 1) == ('/') ) )
       {
-        Erase (i + 1, 1);
-        --size;
+        erase (i + 1, 1);
+        --count;
       }
       else
       {
@@ -219,13 +217,13 @@
   {
     ConvertSlashToBackslash();
 
-    size_t size = Size();
+    size_t count = size();
 
-    for (size_t i = 0; i < size; )
+    for (size_t i = 0; i < count; )
     {
-      if ( (i < size - 1) && (operator[] (i) == TEXT ('\\') ) && (operator[] (i + 1) == TEXT ('\\') ) )
+      if ( (i < count - 1) && (operator[] (i) == '\\' ) && (operator[] (i + 1) == '\\' ) )
       {
-        Erase (i + 1, 1);
+        erase (i + 1, 1);
       }
       else
       {

=== modified file 'NuxCore/FileName.h'
--- NuxCore/FileName.h	2011-04-06 21:54:09 +0000
+++ NuxCore/FileName.h	2012-10-11 16:27:25 +0000
@@ -28,25 +28,22 @@
 namespace nux
 {
 
-  class NFileName : public NString
+  class NFileName : public std::string
   {
   public:
     NFileName()
-      : NString()
+      : std::string()
     {}
     NFileName ( const NFileName &Filename )
-      : NString ( Filename.GetTCharPtr() )
+      : std::string ( Filename )
     {}
 
-    NFileName ( const NString &str )
-      : NString ( str )
+    NFileName ( const std::string &str )
+      : std::string ( str )
     {}
 
     NFileName ( const ANSICHAR *str )
-      : NString ( str )
-    {}
-    NFileName ( const UNICHAR *str )
-      : NString ( str )
+      : std::string ( str )
     {}
 
     //! Replace all slash with backslash.
@@ -75,18 +72,18 @@
     //! Replace all slash with backslash. Replace multiple consecutive backslash with one backslash.
     void ConvertToCleanBackslash();
 
-    NString GetDrive() const;
+    std::string GetDrive() const;
     //! Returns the text following the last period.
-    NString GetExtension() const;
+    std::string GetExtension() const;
     //! Returns the base filename, minus any path information.
-    NString GetCleanFilename() const;
+    std::string GetCleanFilename() const;
     //! Returns the base filename, without the extension (keep the path)
-    NString GetFilenameNoExtension() const;
+    std::string GetFilenameNoExtension() const;
 
     //! Returns the same thing as GetCleanFilename, but without the extension
-    NString GetBaseFilename() const;
+    std::string GetBaseFilename() const;
     //! Returns the path in front of the filename
-    NString GetDirectoryPath() const;
+    std::string GetDirectoryPath() const;
     //! Change the file extension. Do not start ext with a dot character '.'.
     //! ie ext = "com"
     void ChangeFileExtension (const TCHAR *ext);

=== modified file 'NuxCore/FilePath.cpp'
--- NuxCore/FilePath.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/FilePath.cpp	2012-10-11 16:27:25 +0000
@@ -40,7 +40,7 @@
 
   }
 
-  void FilePath::AddSearchPath (const NString &searchpath)
+  void FilePath::AddSearchPath (const std::string &searchpath)
   {
     if (std::find (m_SearchPath.begin(), m_SearchPath.end(), searchpath) != m_SearchPath.end() )
       return;
@@ -48,7 +48,7 @@
     m_SearchPath.push_back (searchpath);
   }
 
-  void FilePath::AddSearchPath (const std::vector<NString>& searchpath)
+  void FilePath::AddSearchPath (const std::vector<std::string>& searchpath)
   {
     for (unsigned int i = 0; i < searchpath.size(); i++)
     {
@@ -57,51 +57,52 @@
     }
   }
 
-  NString FilePath::GetPathToFile (const TCHAR *filename) const
+  std::string FilePath::GetPathToFile (const TCHAR *filename) const
   {
-    NString FileName = GetFile (filename);
-
-    int loc = (int) FileName.FindLastOccurence (TEXT ('\\') );
-
-    if (loc == -1)
+    std::string FileName = GetFile (filename);
+
+    size_t loc = FileName.rfind(TEXT('\\'), 0);
+
+    if (loc == std::string::npos)
     {
-      loc = (int) FileName.FindLastOccurence (TEXT ('/') );
+      loc = FileName.rfind(TEXT('/'), 0);
     }
 
-    if (loc != -1)
-      FileName = FileName.GetSubString (0, loc);
+    if (loc != std::string::npos)
+      FileName = FileName.substr(0, loc);
     else
-      FileName = NString (TEXT (".") );
+      FileName = std::string(TEXT ("."));
 
     return FileName;
   }
 
-  NString FilePath::GetFile (const TCHAR *filename) const
+  std::string FilePath::GetFile (const TCHAR *filename) const
   {
-    NUX_RETURN_VALUE_IF_NULL (filename, NString (TEXT ("") ) );
-
-    if (NString (filename) == NString (TEXT ("") ) )
-      return NString (TEXT ("") );
-
-    NString FileName = filename;
-
-    if (GFileManager.FileExist (FileName.GetTCharPtr() ) )
+    NUX_RETURN_VALUE_IF_NULL (filename, std::string (TEXT ("") ) );
+
+    if (std::string (filename) == std::string (TEXT ("") ) )
+      return std::string (TEXT ("") );
+
+    std::string FileName = filename;
+
+    if (GFileManager.FileExist(FileName.c_str() ) )
       return FileName;
 
     for (unsigned int i = 0; i < m_SearchPath.size(); i++)
     {
-      if (m_SearchPath[i].Size() == 0)
+      if (m_SearchPath[i].size() == 0)
         continue;
 
-      NString FilePath;
+      std::string FilePath;
    
-      if ((m_SearchPath[i].GetLastChar () == TEXT('/')) || (m_SearchPath[i].GetLastChar () == TEXT('\\')))
+      char last = m_SearchPath[i][m_SearchPath[i].size() - 1];
+      if (last == TEXT('/') || last == TEXT('\\'))
         FilePath = m_SearchPath[i] + filename;
       else
         FilePath = m_SearchPath[i] + NUX_PATH_SEPARATOR_STRING + filename;
 
 
-      if (GFileManager.FileExist (FilePath.GetTCharPtr() ) )
+      if (GFileManager.FileExist (FilePath.c_str() ) )
         return FilePath;
     }
 
@@ -123,27 +124,28 @@
     for (size_t i = 0; i < m_SearchPath.size(); i++)
     {
       size_t pos;
-      NString PathName;
+      std::string PathName;
 
-      while (FileName.FindFirstOccurenceOf (TEXT ("\\/") ) != std::string::npos)
+      while (FileName.find_first_of(TEXT ("\\/")) != std::string::npos)
       {
-        pos = FileName.FindFirstOccurenceOf (TEXT ("\\/") ) + 1;
-
-        FileName = FileName.GetSubString (pos, FileName.Length() - pos);
-
-        if ((m_SearchPath[i].GetLastChar () == TEXT('/')) || (m_SearchPath[i].GetLastChar () == TEXT('\\')))
+        pos = FileName.find_first_of(TEXT ("\\/")) + 1;
+
+        FileName = FileName.substr(pos, FileName.length() - pos);
+
+        char last = m_SearchPath[i][m_SearchPath[i].size() - 1];
+        if (last == TEXT('/') || last == TEXT('\\'))
           PathName = m_SearchPath[i] + FileName;
         else
           PathName = m_SearchPath[i] + NUX_PATH_SEPARATOR_STRING + FileName;
 
 
-        if (GFileManager.FileExist (PathName.GetTCharPtr() ) )
+        if (GFileManager.FileExist (PathName.c_str() ) )
           return PathName;
       }
     }
 
     nuxDebugMsg (TEXT ("[FilePath::GetFile] Cannot find file: %s"), filename);
-    return NString (TEXT ("") );
+    return std::string (TEXT ("") );
   }
 
 }

=== modified file 'NuxCore/FilePath.h'
--- NuxCore/FilePath.h	2011-04-06 21:54:09 +0000
+++ NuxCore/FilePath.h	2012-10-11 16:27:25 +0000
@@ -47,14 +47,14 @@
     FilePath();
     ~FilePath();
 
-    void AddSearchPath (const NString &searchpath);
-    void AddSearchPath (const std::vector<NString>& searchpath);
+    void AddSearchPath (const std::string &searchpath);
+    void AddSearchPath (const std::vector<std::string>& searchpath);
 
-    NString GetPathToFile (const TCHAR *filename) const;
-    NString GetFile (const TCHAR *filename) const;
+    std::string GetPathToFile (const TCHAR *filename) const;
+    std::string GetFile (const TCHAR *filename) const;
 
   private:
-    std::vector<NString>          m_SearchPath;
+    std::vector<std::string>          m_SearchPath;
   };
 
 }

=== modified file 'NuxCore/NumberConversion.cpp'
--- NuxCore/NumberConversion.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/NumberConversion.cpp	2012-10-11 16:27:25 +0000
@@ -31,7 +31,7 @@
    * Written by Lukás Chmela
    * Released under GPLv3.
    */
-  NString IntegerToChar (int value, int base)
+  std::string IntegerToChar (int value, int base)
   {
     char result[65];
 
@@ -39,7 +39,7 @@
     if (base < 2 || base > 36)
     {
       //*result = '\0';
-      NString str = TEXT ('\0');
+      std::string str = TEXT ('\0');
       return str;
     }
 
@@ -67,16 +67,16 @@
       *ptr1++ = tmp_char;
     }
 
-    NString str = result;
+    std::string str = result;
     return str;
   }
 
   double CharToDouble (const TCHAR *digit)
   {
     char *endptr = NULL;
-    NString str = TCHAR_TO_ANSICHAR (digit);
+    std::string str = TCHAR_TO_ANSICHAR (digit);
     errno = 0;
-    double ret = std::strtod (str.GetTCharPtr(), &endptr);
+    double ret = std::strtod (str.c_str(), &endptr);
     unsigned int error = errno;
 
     if (error == ERANGE)
@@ -87,13 +87,16 @@
     return ret;
   }
 
-  NString DoubleToChar (double d)
+  std::string DoubleToChar (double d)
   {
     TCHAR *buffer = new TCHAR[64];
     Memset (buffer, 0, 64);
     SPRINTF_S (buffer, 64, "%.39f", d);
-    NString str = buffer;
-    str = str.TrimRight (TEXT ("0") );
+    std::string str = buffer;
+    while (!str.empty() && str[str.size() - 1] == '0')
+    {
+      str.erase(str.end() - 1);
+    }
 
     delete[] buffer;
     return str;
@@ -101,8 +104,8 @@
 
   int CharToInteger (const TCHAR *digit)
   {
-    NString str = TCHAR_TO_ANSICHAR (digit);
-    long long ret = std::atoi (str.GetTCharPtr() );
+    std::string str = TCHAR_TO_ANSICHAR (digit);
+    long long ret = std::atoi (str.c_str() );
     return ret;
   }
 

=== modified file 'NuxCore/NumberConversion.h'
--- NuxCore/NumberConversion.h	2011-10-21 22:06:35 +0000
+++ NuxCore/NumberConversion.h	2012-10-11 16:27:25 +0000
@@ -26,8 +26,6 @@
 namespace nux
 {
 
-  class NString;
-
 //! Convert a TCHAR string to a double value.
   /*!
       @param  digit A TCHAR string.
@@ -35,12 +33,12 @@
   */
   double CharToDouble (const TCHAR *digit);
 
-//! Convert a double to an NString.
+//! Convert a double to an std::string.
   /*!
       @param  d A double value.
-      @return An NString.
+      @return An std::string.
   */
-  NString DoubleToChar (double d);
+  std::string DoubleToChar (double d);
 
 //! Convert a TCHAR string to a 32 bits long value.
   /*!
@@ -55,7 +53,7 @@
       @param  base  Base of the integer representation.
       @return A string.
   */
-  NString IntegerToChar (int value, int base = 10);
+  std::string IntegerToChar (int value, int base = 10);
 
 //! Convert an string to an integer.
   /*!

=== modified file 'NuxCore/NuxCore.cpp'
--- NuxCore/NuxCore.cpp	2012-09-26 06:44:12 +0000
+++ NuxCore/NuxCore.cpp	2012-10-11 16:27:25 +0000
@@ -43,13 +43,22 @@
   Formatted printing and messages.
   -----------------------------------------------------------------------------*/
 
-  unsigned int GetVariableArgs ( TCHAR *Dest, unsigned int /* Size */, unsigned int Count, const TCHAR*& Fmt, va_list ArgPtr )
+#if defined(NUX_OS_WINDOWS)
+  unsigned int GetVariableArgs ( TCHAR *Dest, unsigned int Size, unsigned int Count, const TCHAR*& Fmt, va_list ArgPtr)
+#else
+  unsigned int GetVariableArgs ( TCHAR *Dest, unsigned int /* Size */, unsigned int Count, const TCHAR*& Fmt, va_list ArgPtr)
+#endif
   {
     unsigned int Result = VSNTPRINTF_S (Dest, Size, Count, Fmt, ArgPtr);
     va_end (ArgPtr);
     return Result;
   }
+
+#if defined(NUX_OS_WINDOWS)
+  unsigned int GetVariableArgsAnsi(ANSICHAR *Dest, unsigned int Size, unsigned int Count, const ANSICHAR*& Fmt, va_list ArgPtr)
+#else
   unsigned int GetVariableArgsAnsi ( ANSICHAR *Dest, unsigned int /* Size */, unsigned int Count, const ANSICHAR*& Fmt, va_list ArgPtr)
+#endif
   {
     unsigned int Result = VSNPRINTF_S (Dest, Size, Count, Fmt, ArgPtr);
     va_end (ArgPtr);

=== modified file 'NuxCore/OutputDevice.cpp'
--- NuxCore/OutputDevice.cpp	2012-09-26 06:44:12 +0000
+++ NuxCore/OutputDevice.cpp	2012-10-11 16:27:25 +0000
@@ -23,6 +23,9 @@
 #include "NuxCore.h"
 #include "Parsing.h"
 
+#include <sstream>
+#include <iomanip>
+
 namespace nux
 {
 
@@ -38,20 +41,35 @@
       // Create string with system time to create a unique filename.
       unsigned int Year, Month, Day, Hour, Min, Sec, MSec;
       GetLocalTime (Year, Month, Day, Hour, Min, Sec, MSec);
-      NString Name, Extension;
-      NString (Filename).SplitAtLastOccurenceOf (TEXT ("."), Name, Extension);
-      NString BackupFilename;
-
-      if (Extension.Size() )
+      std::string Name, Extension;
+      std::string file = Filename;
+      size_t pos = file.rfind('.');
+      if (pos != std::string::npos)
       {
-        BackupFilename = NString::Printf (TEXT ("%s-backup-%i.%02i.%02i-%02i.%02i.%02i.%s"), Name.GetTCharPtr(), Year, Month, Day, Hour, Min, Sec, Extension.GetTCharPtr() );
+        Name = file.substr(0, pos);
+        Extension = file.substr(pos + 1);
       }
       else
       {
-        BackupFilename = NString::Printf (TEXT ("%s-backup-%i.%02i.%02i-%02i.%02i.%02i"), Name.GetTCharPtr(), Year, Month, Day, Hour, Min, Sec);
-      }
-
-      GFileManager.Copy (BackupFilename.GetTCharPtr(), Filename, true, true, NULL);
+        Name = file;
+      }
+
+      std::ostringstream s;
+      s << std::setfill('0')
+        << Name << "-backup-" << Year << "."
+        << std::setw(2) << Month << "."
+        << std::setw(2) << Day << "."
+        << std::setw(2) << Hour << "."
+        << std::setw(2) << Min << "."
+        << std::setw(2) << Sec;
+      if (Extension.size() )
+      {
+        s << "." << Extension;
+      }
+
+      std::string BackupFilename = s.str();
+
+      GFileManager.Copy (BackupFilename.c_str(), Filename, true, true, NULL);
     }
   }
 #endif
@@ -142,13 +160,13 @@
     // The Editor requires a fully qualified directory to not end up putting the log in various directories.
     m_Filename = GetProgramDirectory();
 
-    if ( (m_Filename[m_Filename.Size()-1] != NUX_SLASH_CHAR) || (m_Filename[m_Filename.Size()-1] != NUX_BACKSLASH_CHAR) )
+    if ( (m_Filename[m_Filename.size()-1] != NUX_SLASH_CHAR) || (m_Filename[m_Filename.size()-1] != NUX_BACKSLASH_CHAR) )
       m_Filename += (const TCHAR *) NUX_PATH_SEPARATOR_STRING;
 
     m_Filename += GetLogDirectory();
 
     // Create the directory tree where the Logs file will be stored.
-    GFileManager.MakeDirectory (m_Filename.GetTCharPtr(), 1);
+    GFileManager.MakeDirectory (m_Filename.c_str(), 1);
 
     m_Filename += (const TCHAR *) NUX_PATH_SEPARATOR_STRING;
     m_Filename += TEXT ("nux");
@@ -157,11 +175,11 @@
     // if the file already exists, create a backup as we are going to overwrite it
     if (!m_Opened)
     {
-      CreateBackupCopy (m_Filename.GetTCharPtr() );
+      CreateBackupCopy (m_Filename.c_str() );
     }
 
     // Open log file.
-    m_LogSerializer = GFileManager.CreateFileWriter (m_Filename.GetTCharPtr(), NSerializer::Read | NSerializer::Write | NSerializer::OverWriteReadOnly | (m_Opened ? NSerializer::Append : 0) );
+    m_LogSerializer = GFileManager.CreateFileWriter (m_Filename.c_str(), NSerializer::Read | NSerializer::Write | NSerializer::OverWriteReadOnly | (m_Opened ? NSerializer::Append : 0) );
 
     if (m_LogSerializer)
     {
@@ -169,7 +187,7 @@
 #if UNICODE && !NUX_LOG_FILE_ANSI
       m_LogSerializer->Serialize ( (void *) &NUX_UTF16_BE[1], NUX_UTF16_BE[0] /*size*/ );
 #endif
-      LogFunction (NUX_MSG_SEVERITY_NONE, TEXT ("Log file open, %s"), GetFormattedLocalTime().GetTCharPtr());
+      LogFunction (NUX_MSG_SEVERITY_NONE, TEXT ("Log file open, %s"), GetFormattedLocalTime().c_str());
     }
     else
     {
@@ -193,7 +211,7 @@
   {
     if (m_LogSerializer)
     {
-      LogFunction (NUX_MSG_SEVERITY_NONE, TEXT ("Log file closed, %s"), GetFormattedLocalTime().GetTCharPtr());
+      LogFunction (NUX_MSG_SEVERITY_NONE, TEXT ("Log file closed, %s"), GetFormattedLocalTime().c_str());
       Flush();
       delete m_LogSerializer;
       m_LogSerializer = NULL;
@@ -249,8 +267,8 @@
 
       m_LogSerializer->Serialize (ACh, i);
 #else
-      NString Raw = NString (log_prefix) + NString (TEXT (": ") ) + NString (log_data) + NString (NUX_LINE_TERMINATOR);
-      SerializeRaw (Raw.GetTCharPtr() );
+      std::string Raw = std::string (log_prefix) + std::string (TEXT (": ") ) + std::string (log_data) + std::string (NUX_LINE_TERMINATOR);
+      SerializeRaw (Raw.c_str() );
 #endif
     }
   }
@@ -336,18 +354,22 @@
       @param  log_data        Text to log.
       @param  log_prefix	Prefix for the text
   */
-  void VisualOutputConsole::Serialize (const TCHAR * /* text */, const TCHAR * /* log_prefix */, int /* severity */)
+#if defined(NUX_OS_WINDOWS)
+  void VisualOutputConsole::Serialize(const TCHAR* text, const TCHAR* log_prefix, int severity)
   {
     if (!_enabled)
       return;
 
-#if defined (NUX_OS_WINDOWS)
     TCHAR Temp[4096];
 
     Snprintf (Temp, 4096, 4096 - 1, TEXT ("%s: %s%s"), log_prefix, text, NUX_LINE_TERMINATOR);
     OutputDebugString (Temp);
+  }
+#else
+  void VisualOutputConsole::Serialize(const TCHAR * /* text */, const TCHAR * /* log_prefix */, int /* severity */)
+  {
+  }
 #endif
-  }
 
   void PrintfOutputConsole::Constructor() {}
 

=== modified file 'NuxCore/OutputDevice.h'
--- NuxCore/OutputDevice.h	2012-09-26 06:44:12 +0000
+++ NuxCore/OutputDevice.h	2012-10-11 16:27:25 +0000
@@ -84,7 +84,7 @@
 
   private:
     NSerializer    *m_LogSerializer;
-    NString         m_Filename;
+    std::string         m_Filename;
     bool            m_Opened;
     bool            m_Closed;
 

=== modified file 'NuxCore/Parsing.cpp'
--- NuxCore/Parsing.cpp	2012-09-26 06:44:12 +0000
+++ NuxCore/Parsing.cpp	2012-10-11 16:27:25 +0000
@@ -133,7 +133,7 @@
     return false;
   }
 
-  bool Parse_string (const TCHAR *Stream, const TCHAR *Match, NString &Value)
+  bool Parse_string (const TCHAR *Stream, const TCHAR *Match, std::string &Value)
   {
     TCHAR Temp[4096] = TEXT ("");
 
@@ -336,9 +336,9 @@
     return sz != 0;
   }
 
-  bool ParseToken (const TCHAR *Str, NString &TokenString)
+  bool ParseToken (const TCHAR *Str, std::string &TokenString)
   {
-    TokenString.Clear();
+    TokenString.clear();
 
     // Skip spaces and tabs.
     while (IsWhitespaceChar (*Str) )
@@ -367,10 +367,10 @@
       }
     }
 
-    return TokenString.Length() > 0;
+    return TokenString.length() > 0;
   }
 
-  NString ParseToken (const TCHAR *Str, bool /* UseEscape */)
+  std::string ParseToken (const TCHAR *Str, bool /* UseEscape */)
   {
     TCHAR Buffer[1024];
 
@@ -398,16 +398,16 @@
     return LineBuffer[0] != 0;
   }
 
-  bool ParseLine (const TCHAR **Stream, NString &LineString)
+  bool ParseLine (const TCHAR **Stream, std::string &LineString)
   {
-    LineString.Clear();
+    LineString.clear();
 
     while ( (**Stream != 0) && (**Stream != CHAR_NEW_LINE) && (**Stream != CHAR_CR) && (**Stream != CHAR_FF) )
     {
       LineString += **Stream++;
     }
 
-    return LineString.Size() > 0;
+    return LineString.size() > 0;
   }
 
 }

=== modified file 'NuxCore/Parsing.h'
--- NuxCore/Parsing.h	2011-10-21 22:06:35 +0000
+++ NuxCore/Parsing.h	2012-10-11 16:27:25 +0000
@@ -112,15 +112,15 @@
       @return TRUE if the token is found inside the stream.
   */
   bool Parse_int (const TCHAR *Stream, const TCHAR *Match, int &Value);
-//! Parse a NString after the named token.
+//! Parse a std::string after the named token.
   /*!
-      Parse a NString after the named token.
+      Parse a std::string after the named token.
       @param  Stream      Character stream to search.
       @param  Match       Token to match.
-      @param Value parsed NString
+      @param Value parsed std::string
       @return TRUE if the token is found inside the stream.
   */
-  bool Parse_string (const TCHAR *Stream, const TCHAR *Match, NString &Value);
+  bool Parse_string (const TCHAR *Stream, const TCHAR *Match, std::string &Value);
 //! Parse a QUADWORD after the named token.
   /*!
       Parse a QUADWORD after the named token.
@@ -168,7 +168,7 @@
                           If FALSE advanced the pointer past all the CR/LF character at the end of the string.
       @return True i a line was copied to LineString;
   */
-  bool ParseLine (const TCHAR **Stream, NString &LineString);
+  bool ParseLine (const TCHAR **Stream, std::string &LineString);
 
 //! Parse the next space-delimited string from the input stream. If the next token starts with a quote, gets entire quoted string.
   /*!
@@ -185,14 +185,14 @@
       @param TokenBuffer The parsed token string.
       @return True if a token was found.
   */
-  bool ParseToken (const TCHAR *Str, NString &TokenString);
+  bool ParseToken (const TCHAR *Str, std::string &TokenString);
 
 //! Parse the next space-delimited string from the input stream. If the next token starts with a quote, gets entire quoted string.
   /*!
       @param Str stream of characters to parse.
-      @return The next token in a NString.
+      @return The next token in a std::string.
   */
-  NString ParseToken (const TCHAR *Str);
+  std::string ParseToken (const TCHAR *Str);
 
 //! Go to the next token in the stream.
   /*!

=== modified file 'NuxCore/Platform.cpp'
--- NuxCore/Platform.cpp	2012-09-26 06:44:12 +0000
+++ NuxCore/Platform.cpp	2012-10-11 16:27:25 +0000
@@ -60,7 +60,7 @@
 
   }
 
-  static NString _GetProgramDirectory()
+  static std::string _GetProgramDirectory()
   {
 #if defined(NUX_OS_WINDOWS)
     TCHAR RootDirectory[NUX_MAX_FILEPATH_SIZE] = TEXT ("");
@@ -71,7 +71,7 @@
       nuxAssertMsg (Result, TEXT ("[GetProgramDirectory] Can't get program's directory path.") );
 
       if (Result == 0)
-        NString (TEXT ("Unknown Program Directory") );
+        std::string (TEXT ("Unknown Program Directory") );
 
       unsigned int i;
 
@@ -85,7 +85,7 @@
       RootDirectory[i] = 0;
     }
 
-    return NString (RootDirectory);
+    return std::string (RootDirectory);
 
 #elif defined(NUX_OS_LINUX)
 
@@ -97,19 +97,19 @@
       nuxAssertMsg (Result, TEXT ("[GetProgramDirectory] Can't get program's directory path.") );
 
       if (Result == 0)
-        NString (TEXT ("Unknown Program Directory") );
+        std::string (TEXT ("Unknown Program Directory") );
 
     }
 
     nuxDebugMsg (TEXT ("[GetProgramDirectory] Program directory path: %s"), RootDirectory);
-    return NString (RootDirectory);
+    return std::string (RootDirectory);
 
 #else
-    return NString (TEXT ("Unknown Program Directory") );
+    return std::string (TEXT ("Unknown Program Directory") );
 #endif
   }
 
-  static NString _GetComputerName()
+  static std::string _GetComputerName()
   {
 #if defined(NUX_OS_WINDOWS)
     TCHAR ComputerName[NUX_MAX_FILEPATH_SIZE] = TEXT ("");
@@ -130,7 +130,7 @@
       *d++ = 0;
     }
 
-    return NString (ComputerName);
+    return std::string (ComputerName);
 
 #elif defined(NUX_OS_LINUX)
     char Buffer[NUX_MAX_FILEPATH_SIZE];
@@ -138,18 +138,18 @@
 
     if (gethostname (Buffer, BufferSize) != -1)
     {
-      return NString (Buffer);
+      return std::string (Buffer);
     }
 
-    return NString (TEXT ("Unknown Computer Name") );
+    return std::string (TEXT ("Unknown Computer Name") );
 
 #else
-    return NString (TEXT ("Unknown Computer Name") );
+    return std::string (TEXT ("Unknown Computer Name") );
 #endif
   }
 
 // Get user name.  NOTE: Only one return value is valid at a time!
-  static NString _GetUserName()
+  static std::string _GetUserName()
   {
 #if defined(NUX_OS_WINDOWS)
     TCHAR UserName[256] = TEXT ("");
@@ -167,19 +167,19 @@
       *d++ = 0;
     }
 
-    return NString (UserName);
+    return std::string (UserName);
 
 #elif defined(NUX_OS_LINUX)
     struct passwd *userinfo;
     userinfo = getpwuid (getuid() );
 
     if (userinfo == 0)
-      return NString (TEXT ("Unknown User") );
+      return std::string (TEXT ("Unknown User") );
 
-    return NString (userinfo->pw_name);
+    return std::string (userinfo->pw_name);
 
 #else
-    return return NString (TEXT ("Unknown User") );
+    return return std::string (TEXT ("Unknown User") );
 #endif
   }
 
@@ -203,27 +203,27 @@
 
   }
 
-  NString GetComputerName()
+  std::string GetComputerName()
   {
     return NUX_GLOBAL_OBJECT_INSTANCE (NGlobalData).m_ComputerName;
   }
 
-  NString GetProgramDirectory()
+  std::string GetProgramDirectory()
   {
     return NUX_GLOBAL_OBJECT_INSTANCE (NGlobalData).m_ProgramDirectory;
   }
 
-  NString GetUserName()
+  std::string GetUserName()
   {
     return NUX_GLOBAL_OBJECT_INSTANCE (NGlobalData).m_UserName;
   }
 
-  NString GetCmdLine()
+  std::string GetCmdLine()
   {
     return NUX_GLOBAL_OBJECT_INSTANCE (NGlobalData).m_CommandLine;
   }
 
-  NString GetLogDirectory()
+  std::string GetLogDirectory()
   {
     return TEXT ("Logs");
   }

=== modified file 'NuxCore/Platform.h'
--- NuxCore/Platform.h	2011-10-21 22:06:35 +0000
+++ NuxCore/Platform.h	2012-10-11 16:27:25 +0000
@@ -43,28 +43,28 @@
       Get the program command line.
       @return The program command line.
   */
-  NString GetCmdLine();
+  std::string GetCmdLine();
 
 //! Get startup directory.
   /*!
       Get startup directory.
       @return The computer name.
   */
-  NString GetProgramDirectory();
+  std::string GetProgramDirectory();
 
 //! Get computer name.
   /*!
       Get computer name.
       @return The computer name.
   */
-  NString GetComputerName();
+  std::string GetComputerName();
 
 //! Get user name.
   /*!
       Get the user name.
       @return The user name.
   */
-  NString GetUserName();
+  std::string GetUserName();
 
 
 //! Return the logs directory
@@ -74,7 +74,7 @@
 
       @return The logs directory
   */
-  NString GetLogDirectory();
+  std::string GetLogDirectory();
 
   class NGlobalData
   {
@@ -84,11 +84,11 @@
     void Initialize (const TCHAR *CommandLine);
 
     unsigned int m_RandomSeed;
-    NString m_UserName;
-    NString m_ComputerName;
-    NString m_ProgramName;
-    NString m_ProgramDirectory;
-    NString m_CommandLine;
+    std::string m_UserName;
+    std::string m_ComputerName;
+    std::string m_ProgramName;
+    std::string m_ProgramDirectory;
+    std::string m_CommandLine;
   };
 
 }

=== modified file 'NuxCore/Plugin/NPluginManager.cpp'
--- NuxCore/Plugin/NPluginManager.cpp	2011-04-06 21:54:09 +0000
+++ NuxCore/Plugin/NPluginManager.cpp	2012-10-11 16:27:25 +0000
@@ -63,7 +63,7 @@
         if (! (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
         {
           NFileName FilePath = Path + NUX_PATH_SEPARATOR_STRING + fd.cFileName;
-          dllHandle = LoadLibrary (FilePath.GetTCharPtr() );
+          dllHandle = LoadLibrary (FilePath.c_str() );
 
           if (dllHandle != NULL)
           {
@@ -73,7 +73,7 @@
             if (funcHandle != NULL)
             {
               NPlugin *curPlugin = new NPlugin();
-              curPlugin->SetFileName (FilePath.GetTCharPtr() );
+              curPlugin->SetFileName (FilePath.c_str() );
 
               PLUGIN_TEXTFUNC textFunc;
               textFunc = reinterpret_cast<PLUGIN_TEXTFUNC> (GetProcAddress (dllHandle, "getPluginType") );

=== modified file 'NuxCore/Process.cpp'
--- NuxCore/Process.cpp	2011-04-06 21:54:09 +0000
+++ NuxCore/Process.cpp	2012-10-11 16:27:25 +0000
@@ -31,13 +31,12 @@
 // This is expected to return immediately as the URL is launched by another
 // task.
 //
-  void inlLaunchURL ( const TCHAR *URL, const TCHAR *Parms, NString *Error )
+  void inlLaunchURL(const TCHAR *URL, const TCHAR *Parms, std::string Error)
   {
     nuxDebugMsg ( TEXT ("LaunchURL %s %s"), URL, Parms ? Parms : TEXT ("") );
     HINSTANCE Code = CALL_OS_TCHAR_FUNCTION (ShellExecuteW (NULL, TEXT ("open"), URL, Parms ? Parms : TEXT (""), TEXT (""), SW_SHOWNORMAL), ShellExecuteA (NULL, "open", TCHAR_TO_ANSI (URL), Parms ? TCHAR_TO_ANSI (Parms) : "", "", SW_SHOWNORMAL) );
 
-    if (Error)
-      *Error = (int) Code <= 32 ? TEXT ("UrlFailed") : TEXT ("");
+    Error = (int) Code <= 32 ? TEXT ("UrlFailed") : TEXT ("");
   }
 
 //

=== modified file 'NuxCore/Process.h'
--- NuxCore/Process.h	2011-04-06 21:54:09 +0000
+++ NuxCore/Process.h	2012-10-11 16:27:25 +0000
@@ -31,8 +31,8 @@
   * Launches a uniform resource locator (i.e. http://www.yahoo.com/finance).
   * This is expected to return immediately as the URL is launched by another task.
   */
-  void inlLaunchURL ( const TCHAR *URL, const TCHAR *Parms = NULL, NString *Error = NULL );
-  void *inlCreateProc ( const TCHAR *URL, const TCHAR *Parms );
+  void inlLaunchURL ( const TCHAR* URL, const TCHAR* Parms, std::string Error);
+  void *inlCreateProc ( const TCHAR* URL, const TCHAR* Parms );
 //! Get process termination code of a process
   BOOL inlGetProcReturnCode ( void *ProcessHandle, INT *ReturnCode );
 

=== modified file 'NuxCore/TextString.cpp'
--- NuxCore/TextString.cpp	2012-09-19 04:53:45 +0000
+++ NuxCore/TextString.cpp	2012-10-11 16:27:25 +0000
@@ -35,25 +35,6 @@
     return Dest;
   }
 
-//
-// Concatenate a string with length checking
-//
-  TCHAR *Strncat (TCHAR *Dest, size_t Size, const TCHAR *Src, size_t MaxLen)
-  {
-    size_t Len = StringLength (Dest);
-    nuxAssert (Size >= Len);
-    TCHAR *NewDest = Dest + Len;
-
-    if ( (MaxLen -= Len) > 0)
-    {
-      Strncpy (NewDest, Size - Len, Src, MaxLen);
-      NewDest[MaxLen-1] = 0;
-    }
-
-    return Dest;
-  }
-
-
 // Search a string inside a string. Return a pointer to the beginning of the searched string if it is found. Else, return NULL;
 // The shearched string must be preceded by a non alpha numeric character in Str.
 
@@ -91,1256 +72,10 @@
     return NULL;
   }
 
-  bool IsLastChar (const TCHAR *CharString, const TCHAR Chr)
-  {
-    nuxAssert (CharString != 0);
-
-    if (CharString == 0)
-      return false;
-
-    size_t Size = StringLength (CharString);
-
-    if (Size == 0)
-      return false;
-
-    if (CharString[Size-1] == Chr)
-      return true;
-
-    return false;
-  }
-
-  NString Itoa (int InNum)
-  {
-    SQWORD	Num					= InNum; // This avoids having to deal with negating -MaxS32 - 1
-    NString NumberString;
-    const TCHAR	*NumberChar[10]		= { TEXT ("0"), TEXT ("1"), TEXT ("2"), TEXT ("3"), TEXT ("4"), TEXT ("5"), TEXT ("6"), TEXT ("7"), TEXT ("8"), TEXT ("9") };
-    bool	bIsNumberNegative	= false;
-
-    // Correctly handle negative numbers and convert to positive integer.
-    if (Num < 0)
-    {
-      bIsNumberNegative = true;
-      Num = -Num;
-    }
-
-    // Convert to string assuming base ten and a positive integer.
-    do
-    {
-      NumberString += NumberChar[Num % 10];
-      Num /= 10;
-    }
-    while (Num);
-
-    // Append sign as we're going to reverse string afterwards.
-    if (bIsNumberNegative)
-    {
-      NumberString += TEXT ("-");
-    }
-
-    NumberString.Reverse();
-    return NumberString;
-  }
-
-//! Duplicate a null terminated string using new[]. The resulting string is NULL terminated. Use delete[] to destroy.
-  TCHAR *Strdup (const TCHAR *str)
-  {
-    if (str == 0)
-      return 0;
-
-    size_t len = StringLength (str);
-
-    TCHAR *res = new TCHAR[len+1];
-    Strncpy (res, len + 1, str, len);
-    return res;
-  }
-
-//! Duplicate a null terminated ANSICHAR string using new[]. The resulting string is NULL terminated. Use delete[] to destroy.
-  ANSICHAR *StrdupA ( const ANSICHAR *str)
-  {
-    if (str == 0)
-      return 0;
-
-    int len = (int) strlen (str);
-
-    if (len >= 0)
-    {
-      ANSICHAR *res = new ANSICHAR[len+1];
-      STRNCPY_S ( (char *) res, len + 1, (const char *) str, len);
-      return res;
-    }
-
-    return 0;
-  }
-
-//! Duplicate a null terminated UNICHAR string using new[]. The resulting string is NULL terminated. Use delete[] to destroy.
-  UNICHAR *StrdupU ( const UNICHAR *str)
-  {
-    if (str == 0)
-      return 0;
-
-    int len = (int) wcslen ( (const wchar_t *) str);
-
-    if (len >= 0)
-    {
-      UNICHAR *res = new UNICHAR[len+1];
-      WCSNCPY_S ( (wchar_t *) res, len + 1, (const wchar_t *) str, len);
-      return res;
-    }
-
-    return 0;
-  }
-// /*
-// * Standard string formatted print.
-// */
-// VARARG_BODY(int, inlSprintf, const TCHAR*, VARARG_EXTRA(TCHAR* Dest))
-// {
-//     int	Result = -1;
-//     va_list ap;
-//     va_start(ap, Fmt);
-//     //@warning: make sure code using inlSprintf allocates enough memory if the below 1024 is ever changed.
-//     GET_VARARGS_RESULT(Dest,1024/*!!*/,Fmt,Result);
-//     return Result;
-// }
-
-
-  size_t ValueToLiteralString (char *buffer, unsigned int len, unsigned short     value)
-  {
-    return ToCharString (buffer, len, "%hu",     value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, short     value)
-  {
-    return ToCharString (buffer, len, "%hi",     value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, unsigned int     value)
-  {
-    return ToCharString (buffer, len, "%lu",     value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, int     value)
-  {
-    return ToCharString (buffer, len, "%li",     value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, unsigned long   value)
-  {
-    return ToCharString (buffer, len, "%lu",     value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, long    value)
-  {
-    return ToCharString (buffer, len, "%li",     value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, unsigned long long     value)
-  {
-    return ToCharString (buffer, len, "%I64u",   value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, long long     value)
-  {
-    return ToCharString (buffer, len, "%I64i",   value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, float   value)
-  {
-    return ToCharString (buffer, len, "%.10g",   value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, double  value)
-  {
-    return ToCharString (buffer, len, "%.20lg",  value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, unsigned char      value)
-  {
-    return ValueToLiteralString (buffer, len,    (unsigned int) value);
-  }
-  size_t ValueToLiteralString (char *buffer, unsigned int len, char    value)
-  {
-    return ValueToLiteralString (buffer, len,    (int) value);
-  }
-
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, unsigned short    &value)
-  {
-    return FromCharString (buffer, len, "%hu", value );
-  }
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, short    &value)
-  {
-    return FromCharString (buffer, len, "%hi", value );
-  }
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, unsigned int    &value)
-  {
-    return FromCharString (buffer, len, "%lu", value );
-  }
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, int    &value)
-  {
-    return FromCharString (buffer, len, "%li", value );
-  }
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, unsigned long  &value)
-  {
-    return FromCharString (buffer, len, "%lu", value );
-  }
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, long   &value)
-  {
-    return FromCharString (buffer, len, "%li", value );
-  }
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, unsigned long long    &value)
-  {
-    return FromCharString (buffer, len, "%I64u", value );
-  }
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, long long    &value)
-  {
-    return FromCharString (buffer, len, "%I64i", value );
-  }
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, float  &value)
-  {
-    return FromCharString (buffer, len, "%g", value );
-  }
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, double &value)
-  {
-    return FromCharString (buffer, len, "%lg", value );
-  }
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, unsigned char     &value)
-  {
-    unsigned int tmp = 0;
-    bool result;
-    result = ValueFromLiteralString (buffer, len, tmp);
-    value = (unsigned char) tmp;
-    return result;
-  }
-
-  bool ValueFromLiteralString (const char *buffer, unsigned int len, char &value)
-  {
-    int tmp = 0;
-    bool result;
-    result = ValueFromLiteralString (buffer, len, tmp);
-    value = (char) tmp;
-    return result;
-  }
-
   VARARG_BODY (int, Snprintf, const TCHAR *, VARARG_EXTRA (TCHAR *Dest) VARARG_EXTRA (int Size) VARARG_EXTRA (int Count) )
   {
     int Result = -1;
     GET_VARARGS_RESULT (Dest, Size, Count, Fmt, Result);
     return Result;
   }
-
-  NString::NString()
-  {
-    m_string = TEXT("");
-  }
-
-  NString::NString (const NString &s)
-  {
-    m_string = s.m_string;
-  }
-
-  NString &NString::operator= (const NString &s)
-  {
-    m_string = s.m_string;
-    return *this;
-  }
-
-  NString::NString (const tstring &s)
-  {
-    m_string = s;
-  }
-
-  NString::NString (const TCHAR &s)
-  {
-    m_string = s;
-  }
-
-  NString::NString (const ANSICHAR *s)
-  {
-#ifdef UNICODE
-
-    if (s == 0)
-      m_string = TEXT ("");
-    else
-      m_string = ANSICHAR_TO_UNICHAR (s);
-
-#else
-
-    if (s == 0)
-      m_string = TEXT ("");
-    else
-      m_string = s;
-
-#endif
-  }
-
-  NString::NString (const UNICHAR *s)
-  {
-#ifdef UNICODE
-
-    if (s == 0)
-      m_string = TEXT ("");
-    else
-      m_string = s;
-
-#else
-
-    if (s == 0)
-      m_string = TEXT ("");
-    else
-      m_string = UNICHAR_TO_ANSICHAR (s);
-
-#endif
-  }
-
-
-  NString::~NString()
-  {
-  }
-
-  const tstring &NString::GetTStringRef() const
-  {
-    return m_string;
-  }
-
-//const TCHAR* NString::GetTChar() const
-//{
-//    return m_string.c_str();
-//}
-
-  const TCHAR *NString::GetTCharPtr() const
-  {
-    return m_string.c_str();
-  }
-
-  size_t NString::Length() const
-  {
-    return m_string.length();
-  }
-
-  size_t NString::Size() const
-  {
-    return m_string.size();
-  }
-
-  void NString::Clear()
-  {
-    m_string.clear();
-  }
-
-  bool NString::IsEmpty() const
-  {
-    return m_string.empty();
-  }
-
-  void NString::Erase (size_t Pos, size_t Count)
-  {
-    m_string.erase (Pos, Count);
-  }
-
-  NString &NString::Insert (size_t Pos, const TCHAR *Ptr)
-  {
-    m_string.insert (Pos, Ptr);
-    return *this;
-  }
-
-  NString &NString::Insert (size_t Pos, const TCHAR *Ptr, size_t Count)
-  {
-    m_string.insert (Pos, Ptr, Count);
-    return *this;
-  }
-
-  NString &NString::Insert (size_t Pos, const tstring &Str)
-  {
-    m_string.insert (Pos, Str);
-    return *this;
-  }
-
-  NString &NString::Insert (size_t Pos, const tstring &Str, size_t Offset, size_t Count)
-  {
-    m_string.insert (Pos, Str, Offset, Count);
-    return *this;
-  }
-
-  NString &NString::Insert (size_t Pos, const NString &Str)
-  {
-    m_string.insert (Pos, Str.m_string);
-    return *this;
-  }
-
-  NString &NString::Insert (size_t Pos, const NString &Str, size_t Offset, size_t Count)
-  {
-    m_string.insert (Pos, Str.m_string, Offset, Count);
-    return *this;
-  }
-
-  NString &NString::Insert (size_t Pos, int Count, const TCHAR &Ch)
-  {
-    m_string.insert (Pos, Count, Ch);
-    return *this;
-  }
-
-  const TCHAR &NString::operator[] (size_t ChPos) const
-  {
-    return m_string[ChPos];
-  }
-
-  TCHAR &NString::operator[] (size_t ChPos)
-  {
-    return m_string[ChPos];
-  }
-
-  NString &NString::Replace (size_t Pos1, size_t Num1, const TCHAR *Ptr)
-  {
-    m_string.replace (Pos1, Num1, Ptr);
-    return *this;
-  }
-
-  NString &NString::Replace (size_t Pos1, size_t Num1, const TCHAR *Ptr, size_t Num2)
-  {
-    m_string.replace (Pos1, Num1, Ptr, Num2);
-    return *this;
-  }
-
-  NString &NString::Replace (size_t Pos1, size_t Num1, const tstring &Str)
-  {
-    m_string.replace (Pos1, Num1, Str);
-    return *this;
-  }
-
-  NString &NString::Replace (size_t Pos1, size_t Num1, const tstring &Str, size_t Pos2, size_t Num2)
-  {
-    m_string.replace (Pos1, Num1, Str, Pos2, Num2);
-    return *this;
-  }
-
-  NString &NString::Replace (size_t Pos1, size_t Num1, const NString &Str)
-  {
-    m_string.replace (Pos1, Num1, Str.m_string);
-    return *this;
-  }
-
-  NString &NString::Replace (size_t Pos1, size_t Num1, const NString &Str, size_t Pos2, size_t Num2)
-  {
-    m_string.replace (Pos1, Num1, Str.m_string, Pos2, Num2);
-    return *this;
-  }
-
-  NString &NString::Replace (size_t Pos1, size_t Num1, size_t Count, TCHAR Ch)
-  {
-    m_string.replace (Pos1, Num1, Count, Ch);
-    return *this;
-  }
-
-  void NString::Reverse()
-  {
-    NString rev;
-    size_t l = Length();
-
-    for (int i = l - 1; i >= 0; i--)
-    {
-      rev += m_string[i];
-    }
-
-    (*this) = rev;
-  }
-
-  NString &NString::SearchAndReplace (TCHAR ChOut, TCHAR ChIn)
-  {
-    for (size_t i = 0; i < Length(); i++)
-      if (m_string[i] == ChOut)
-        m_string[i] = ChIn;
-
-    return *this;
-  }
-
-//! Return The last position of the substring suffix or -1 if it is not found.
-  size_t NString::FindLastOccurence (const TCHAR &suffix) const
-  {
-    size_t start = 0;
-    size_t pos = 0;
-
-    do
-    {
-      pos = m_string.find (suffix, start);
-
-      if (pos != tstring::npos)
-        start = pos + 1;
-    }
-    while (pos != tstring::npos);
-
-    return start - 1;
-  }
-
-//! Return The last position of the substring suffix or -1 if it is not found.
-  size_t NString::FindLastOccurence (const TCHAR *suffix) const
-  {
-    size_t start = 0;
-    size_t pos = 0;
-
-    do
-    {
-      pos = m_string.find (suffix, start);
-
-      if (pos != tstring::npos)
-        start = pos + 1;
-    }
-    while (pos != tstring::npos);
-
-    return start - 1;
-  }
-
-//! Return The last position of the substring suffix or -1 if it is not found.
-  size_t NString::FindLastOccurence (const tstring &suffix) const
-  {
-    size_t start = 0;
-    size_t pos = 0;
-
-    do
-    {
-      pos = m_string.find (suffix, start);
-
-      if (pos != tstring::npos)
-        start = pos + 1;
-    }
-    while (pos != tstring::npos);
-
-    return start - 1;
-  }
-
-//! Return The last position of the substring suffix or -1 if it is not found.
-  size_t NString::FindLastOccurence (const NString &suffix) const
-  {
-    size_t start = 0;
-    size_t pos = 0;
-
-    do
-    {
-      pos = m_string.find (suffix.m_string, start);
-
-      if (pos != tstring::npos)
-        start = pos + 1;
-    }
-    while (pos != tstring::npos);
-
-    return start - 1;
-  }
-
-
-//! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-  size_t NString::FindFirstOccurence (const TCHAR &suffix)  const
-  {
-    size_t pos = 0;
-    pos = m_string.find (suffix, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-//! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-  size_t NString::FindFirstOccurence (const TCHAR *suffix)  const
-  {
-    size_t pos = 0;
-    pos = m_string.find (suffix, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-//! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-  size_t NString::FindFirstOccurence (const tstring &suffix)  const
-  {
-    size_t pos = 0;
-    pos = m_string.find (suffix, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-//! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-  size_t NString::FindFirstOccurence (const NString &suffix) const
-  {
-    size_t pos = 0;
-    pos = m_string.find (suffix.m_string, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-//! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-  size_t NString::FindNextOccurence (const TCHAR &suffix, size_t start) const
-  {
-    size_t pos = 0;
-    pos = m_string.find (suffix, start);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-//! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-  size_t NString::FindNextOccurence (const TCHAR *suffix, size_t start) const
-  {
-    size_t pos = 0;
-    pos = m_string.find (suffix, start);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-//! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-  size_t NString::FindNextOccurence (const tstring &suffix, size_t start) const
-  {
-    size_t pos = 0;
-    pos = m_string.find (suffix, start);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-//! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-  size_t NString::FindNextOccurence (const NString &suffix, size_t start) const
-  {
-    size_t pos = 0;
-    pos = m_string.find (suffix.m_string, start);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-//! Searches through a string for the first character that matches any element of a specified string. Return -1 if it is not found.
-  size_t NString::FindFirstOccurenceOf (const TCHAR &str) const
-  {
-    size_t pos = 0;
-    pos = m_string.find_first_of (str, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-//! Searches through a string for the first character that matches any element of a specified string. Return -1 if it is not found.
-  size_t NString::FindFirstOccurenceOf (const TCHAR *str) const
-  {
-    size_t pos = 0;
-    pos = m_string.find_first_of (str, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-//! Searches through a string for the first character that matches any element of a specified string. Return -1 if it is not found.
-  size_t NString::FindFirstOccurenceOf (const tstring &str) const
-  {
-    size_t pos = 0;
-    pos = m_string.find_first_of (str, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-//! Searches through a string for the first character that matches any element of a specified string. Return -1 if it is not found.
-  size_t NString::FindFirstOccurenceOf (const NString &str) const
-  {
-    size_t pos = 0;
-    pos = m_string.find_first_of (str.m_string, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-//! Searches through a string for the last character that matches any element of a specified string. Return -1 if it is not found.
-  size_t NString::FindLastOccurenceOf (const TCHAR &str) const
-  {
-    size_t pos = 0;
-    pos = m_string.find_last_of (str, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-//! Searches through a string for the last character that matches any element of a specified string. Return -1 if it is not found.
-  size_t NString::FindLastOccurenceOf (const TCHAR *str) const
-  {
-    size_t pos = 0;
-    pos = m_string.find_last_of (str, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-//! Searches through a string for the last character that matches any element of a specified string. Return -1 if it is not found.
-  size_t NString::FindLastOccurenceOf (const tstring &str) const
-  {
-    size_t pos = 0;
-    pos = m_string.find_last_of (str, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-//! Searches through a string for the last character that matches any element of a specified string. Return -1 if it is not found.
-  size_t NString::FindLastOccurenceOf (const NString &str) const
-  {
-    size_t pos = 0;
-    pos = m_string.find_last_of (str.m_string, pos);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-  size_t NString::Find (NString str, int start)
-  {
-    size_t pos = m_string.find (str.m_string, start);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-  size_t NString::Find (TCHAR c, int start)
-  {
-    size_t pos = m_string.find (c, start);
-    return (pos != tstring::npos) ? pos : -1;
-  }
-
-  bool NString::IsSuffix (const TCHAR &suffix)
-  {
-    int l = m_string.length() - 1;
-
-    if (l < 0)
-      return false;
-
-    size_t pos = FindLastOccurence (suffix);
-
-    if (pos == tstring::npos)
-      return false;
-
-    return (pos == (size_t)l);
-  }
-
-  bool NString::IsSuffix (const TCHAR *suffix)
-  {
-    size_t sl = StringLength (suffix);
-
-    if (sl == 0)
-      return false;
-
-    int l = m_string.length() - sl;
-
-    if (l < 0)
-      return false;
-
-    size_t pos = FindLastOccurence (suffix);
-
-    if (pos == tstring::npos)
-      return false;
-
-    return (pos == (size_t)l);
-  }
-
-//! Return True is the the string is terminated by the tstring 'suffix'
-  bool NString::IsSuffix (const tstring &suffix)
-  {
-    size_t sl = suffix.length();
-
-    if (sl == 0)
-      return false;
-
-    int l = m_string.length() - sl;
-
-    if (l < 0)
-      return false;
-
-    size_t pos = FindLastOccurence (suffix);
-
-    if (pos == tstring::npos)
-      return false;
-
-    return (pos == (size_t)l);
-  }
-
-//! Return True is the the string is terminated by the NString 'suffix'
-  bool NString::IsSuffix (const NString &suffix)
-  {
-    size_t sl = suffix.Length();
-
-    if (sl == 0)
-      return false;
-
-    int l = m_string.length() - sl;
-
-    if (l < 0)
-      return false;
-
-    size_t pos = FindLastOccurence (suffix);
-
-    if (pos == tstring::npos)
-      return false;
-
-    return (pos == (size_t)l);
-  }
-
-//! Return True if the string start with the character contained in prefix
-  bool NString::IsPrefix (const TCHAR &prefix)
-  {
-    int l = m_string.length() - 1;
-
-    if (l < 0)
-      return false;
-
-    size_t pos = FindFirstOccurence (prefix);
-
-    if (pos == tstring::npos)
-      return false;
-
-    return (pos == 0);
-  }
-
-//! Return True if the string start with the character string contained in prefix
-  bool NString::IsPrefix (const TCHAR *prefix)
-  {
-    size_t sl = StringLength (prefix);
-
-    if (sl == 0)
-      return false;
-
-    size_t pos = FindFirstOccurence (prefix);
-
-    if (pos == tstring::npos)
-      return false;
-
-    return (pos == 0);
-  }
-
-//! Return True if the string start with the tstring contained in prefix
-  bool NString::IsPrefix (const tstring &prefix)
-  {
-    size_t sl = prefix.length();
-
-    if (sl == 0)
-      return false;
-
-    size_t pos = FindFirstOccurence (prefix);
-
-    if (pos == tstring::npos)
-      return false;
-
-    return (pos == 0);
-  }
-//! Return True if the string start with the NString contained in prefix
-  bool NString::IsPrefix (const NString &prefix)
-  {
-    size_t sl = prefix.Length();
-
-    if (sl == 0)
-      return false;
-
-    size_t pos = FindFirstOccurence (prefix);
-
-    if (pos == tstring::npos)
-      return false;
-
-    return (pos == 0);
-  }
-
-//! Return an NString without the character contained in suffix
-  void NString::RemoveSuffix (const TCHAR &suffix)
-  {
-    if (IsSuffix (suffix) )
-    {
-      size_t pos = FindLastOccurence (suffix);
-      *this = NString (m_string.substr (0, pos) );
-    }
-  }
-
-//! Return an NString without the character string 'suffix'
-  void NString::RemoveSuffix (const TCHAR *suffix)
-  {
-    if (IsSuffix (suffix) )
-    {
-      size_t pos = FindLastOccurence (suffix);
-      *this = NString (m_string.substr (0, pos) );
-    }
-  }
-
-//! Return an NString without the tstring 'suffix'
-  void NString::RemoveSuffix (const tstring &suffix)
-  {
-    if (IsSuffix (suffix) )
-    {
-      size_t pos = FindLastOccurence (suffix);
-      *this = NString (m_string.substr (0, pos) );
-    }
-  }
-
-//! Return an NString without the NString 'suffix'
-  void NString::RemoveSuffix (const NString &suffix)
-  {
-    if (IsSuffix (suffix) )
-    {
-      size_t pos = FindLastOccurence (suffix);
-      *this = NString (m_string.substr (0, pos) );
-    }
-  }
-
-//! Return an NString striped out of the prefix contained in prefix
-  void NString::RemovePrefix (const TCHAR &prefix)
-  {
-    if (IsPrefix (prefix) )
-    {
-      *this = NString (m_string.substr (1) );
-    }
-  }
-
-//! Return an NString striped out of the prefix contained in prefix
-  void NString::RemovePrefix (const TCHAR *prefix)
-  {
-    if (IsPrefix (prefix) )
-    {
-      size_t l = StringLength (prefix);
-      *this = NString (m_string.substr (l) );
-    }
-  }
-
-//! Return an NString striped out of the prefix contained in prefix
-  void NString::RemovePrefix (const tstring &prefix)
-  {
-    if (IsPrefix (prefix) )
-    {
-      size_t l = prefix.length();
-      *this = NString (m_string.substr (l) );
-    }
-  }
-
-//! Return an NString striped out of the prefix contained in prefix
-  void NString::RemovePrefix (const NString &prefix)
-  {
-    if (IsPrefix (prefix) )
-    {
-      size_t l = prefix.Length();
-      *this = NString (m_string.substr (l) );
-    }
-  }
-
-  NString NString::GetSubString (size_t count) const
-  {
-    return NString (m_string.substr (0, count) );
-  }
-
-  NString NString::GetSubString (size_t start, size_t count) const
-  {
-    return NString (m_string.substr (start, count) );
-  }
-
-  NString NString::Mid (size_t count) const
-  {
-    return GetSubString (count);
-  }
-
-  NString NString::Mid (size_t start, size_t count) const
-  {
-    return GetSubString (start, count);
-  }
-
-  NString NString::Left (size_t N) const
-  {
-    if (N >= Length() )
-      return *this;
-
-    return GetSubString (0, N);
-  }
-
-  NString NString::Right (size_t N) const
-  {
-    if (N >= Length() )
-      return *this;
-
-    return GetSubString (Length() - N, N);
-  }
-
-  NString NString::Trim() const
-  {
-    return TrimLeft().TrimRight();
-  }
-
-  NString NString::TrimLeft() const
-  {
-    size_t n = 0;
-    size_t L = Length() - 1;
-
-    while (n <= L)
-    {
-      if (IsWhitespaceChar (m_string[n]) )
-      {
-        n++;
-      }
-      else
-      {
-        break;
-      }
-    }
-
-    return GetSubString (n, Length() - n);
-  }
-
-  NString NString::TrimRight() const
-  {
-    int L = Length() - 1;
-
-    while (0 <= L)
-    {
-      if (IsWhitespaceChar (m_string[L]) )
-      {
-        L--;
-      }
-      else
-      {
-        break;
-      }
-    }
-
-    return GetSubString (0, Length() + 1);
-  }
-
-  NString NString::TrimLeft (NString str) const
-  {
-    size_t n = 0;
-    size_t L = Length();
-
-    if (L == 0)
-      return *this;
-
-    while (n < L)
-    {
-      bool trim = false;
-      size_t sz = str.Length();
-
-      for (size_t i = 0; i < sz; i++)
-      {
-        if (m_string[n] == str[i])
-        {
-          trim = true;
-          break;
-        }
-      }
-
-      if (trim)
-      {
-        n++;
-      }
-      else
-      {
-        break;
-      }
-    }
-
-    return GetSubString (n, Length() - n);
-  }
-
-  NString NString::TrimRight (NString str) const
-  {
-    int L = Length();
-
-    if (L == 0)
-      return *this;
-
-    L = L - 1;
-
-    while (0 <= L)
-    {
-      bool trim = false;
-      size_t sz = str.Length();
-
-      for (size_t i = 0; i < sz; i++)
-      {
-        if (m_string[L] == str[i])
-        {
-          trim = true;
-          break;
-        }
-      }
-
-      if (trim)
-      {
-        L--;
-      }
-      else
-      {
-        break;
-      }
-    }
-
-    return GetSubString (0, L + 1);
-  }
-
-  const TCHAR *NString::operator () () const
-  {
-    if (Size() == 0)
-      return 0;
-
-    return GetTCharPtr();
-  }
-
-  const TCHAR *NString::operator * () const
-  {
-    if (Size() == 0)
-      return 0;
-
-    return GetTCharPtr();
-  }
-
-// NString::operator const TCHAR*() const
-// {
-//     return (const TCHAR*)GetTCharPtr();
-// }
-
-  NString &NString::operator += (const TCHAR &sufix)
-  {
-    m_string += sufix;
-    return *this;
-  }
-
-  NString &NString::operator += (const TCHAR *sufix)
-  {
-    m_string += sufix;
-    return *this;
-  }
-
-  NString &NString::operator += (const tstring sufix)
-  {
-    m_string += sufix;
-    return *this;
-  }
-
-  NString &NString::operator += (const NString sufix)
-  {
-    m_string += sufix.m_string;
-    return *this;
-  }
-
-  void NString::SplitAtFirstOccurenceOf (const TCHAR *SplitString, NString &Left, NString &Right)
-  {
-    size_t start = FindFirstOccurence (SplitString);
-
-    if (start != tstring::npos)
-    {
-      size_t size = StringLength (SplitString);
-      Left = GetSubString (0, start);
-      Right = GetSubString (start + size, Length() - (start + size) );
-    }
-    else
-    {
-      Left = *this;
-      Right = "";
-    }
-  }
-
-  void NString::SplitAtFirstOccurenceOf (const TCHAR &SplitChar, NString &Left, NString &Right)
-  {
-    SplitAtFirstOccurenceOf (NString (SplitChar), Left, Right);
-  }
-
-  void NString::SplitAtFirstOccurenceOf (const NString &SplitString, NString &Left, NString &Right)
-  {
-    SplitAtFirstOccurenceOf (SplitString.GetTCharPtr(), Left, Right);
-  }
-
-  void NString::SplitAtLastOccurenceOf (const TCHAR *SplitString, NString &Left, NString &Right)
-  {
-    size_t start = FindLastOccurence (SplitString);
-
-    if (start != tstring::npos)
-    {
-      size_t size = StringLength (SplitString);
-      Left = GetSubString (0, start);
-      Right = GetSubString (start + size, Length() - (start + size) );
-    }
-    else
-    {
-      Left = *this;
-      Right = "";
-    }
-  }
-
-  void NString::SplitAtLastOccurenceOf (const TCHAR &SplitChar, NString &Left, NString &Right)
-  {
-    SplitAtLastOccurenceOf (NString (SplitChar), Left, Right);
-  }
-
-  void NString::SplitAtLastOccurenceOf (const NString &SplitString, NString &Left, NString &Right)
-  {
-    SplitAtLastOccurenceOf (SplitString.GetTCharPtr(), Left, Right);
-  }
-
-  void NString::ParseToArray (std::vector<NString>& StringArray, const NString &delimiter)
-  {
-    NString Left;
-    NString Right;
-    NString Temp;
-    SplitAtFirstOccurenceOf (delimiter, Left, Temp);
-
-    if (Left.Size() )
-    {
-      Left = Left.Trim();
-      StringArray.push_back (Left);
-    }
-
-    Right = Temp;
-
-    while (Right.Size() )
-    {
-      Right.SplitAtFirstOccurenceOf (delimiter, Left, Temp);
-
-      if (Left.Size() )
-      {
-        Left = Left.Trim();
-        StringArray.push_back (Left);
-      }
-
-      Right = Temp;
-    }
-  }
-
-  TCHAR NString::GetFirstChar() const
-  {
-    if (IsEmpty() )
-      return 0;
-    return m_string[0];
-  }
-
-  TCHAR NString::GetLastChar() const
-  {
-    if (IsEmpty() )
-      return 0;
-    return m_string[Size()-1];
-  }
-
-  bool operator != (const NString &left, const NString &right)
-  {
-    return left.m_string != right.m_string;
-  }
-  bool operator == (const NString &left, const NString &right)
-  {
-    return left.m_string == right.m_string;
-  }
-  bool operator <  (const NString &left, const NString &right)
-  {
-    return left.m_string < right.m_string;
-  }
-  bool operator <= (const NString &left, const NString &right)
-  {
-    return left.m_string <= right.m_string;
-  }
-  bool operator >  (const NString &left, const NString &right)
-  {
-    return left.m_string > right.m_string;
-  }
-  bool operator >= (const NString &left, const NString &right)
-  {
-    return left.m_string >= right.m_string;
-  }
-
-  NString operator+ (const NString &left, const NString &right)
-  {
-    return NString (left.m_string + right.m_string);
-  }
-
-  NString operator+ (const NString &left, const TCHAR *right)
-  {
-    return NString (left.m_string + right);
-  }
-
-  NString operator+ (const NString &left, const TCHAR right)
-  {
-    return NString (left.m_string + right);
-  }
-
-  NString operator+ (const TCHAR *left, const NString &right)
-  {
-    return NString (left + right.m_string);
-  }
-
-  NString operator+ (const TCHAR left, const NString &right)
-  {
-    return NString (left + right.m_string);
-  }
-
-  tostream &operator << (tostream &o, const NString &s)
-  {
-    return o << s.m_string;
-  }
-
-  /*!
-      Behave like printf. Use an internal buffer of 1024 characters. Do not use this function if you are expecting
-      the result to be more that 1024-1 characters.
-      @return A string with formated arguments in a NString.
-  */
-  VARARG_BODY (NString, NString::Printf, const TCHAR *, VARARG_NONE)
-  {
-    unsigned int  BufferSize  = 1024;
-    TCHAR *Buffer      = NULL;
-    size_t Result      = tstring::npos;
-
-    while (Result == tstring::npos)
-    {
-      Buffer = (TCHAR *) Realloc (Buffer, BufferSize * sizeof (TCHAR) );
-      GET_VARARGS_RESULT (Buffer, BufferSize, BufferSize - 1, Fmt, Result);
-      BufferSize *= 2;
-    };
-
-    Buffer[Result] = 0;
-
-    NString ResultString (Buffer);
-
-    free (Buffer);
-
-    return ResultString;
-  }
-
 }

=== modified file 'NuxCore/TextString.h'
--- NuxCore/TextString.h	2012-10-01 23:37:25 +0000
+++ NuxCore/TextString.h	2012-10-11 16:27:25 +0000
@@ -28,8 +28,6 @@
 namespace nux
 {
 
-  class NString;
-
   class TCharToUpperCase
   {
     TCHAR *UpperCaseString;
@@ -640,240 +638,6 @@
 
   bool IsLastChar (const TCHAR *CharString, const TCHAR Chr);
 
-//
-// Convert an integer to a string.
-//
-  NString Itoa ( int InNum );
-
-
-
-  class NString
-  {
-  public:
-    NString();
-    NString (const NString &s);
-    NString (const tstring &s);
-    NString (const TCHAR &s);
-    //NString(const TCHAR* s);
-    NString (const ANSICHAR *s);
-    NString (const UNICHAR *s);
-
-    ~NString();
-    NString &operator= (const NString &s);
-
-    const tstring &GetTStringRef() const;
-    //const TCHAR* GetTChar() const;
-    const TCHAR *GetTCharPtr() const;
-
-    size_t Length() const;
-    size_t Size() const;
-    void Clear();
-    bool IsEmpty() const;
-
-    void Erase (size_t Pos, size_t count);
-    NString &Insert (size_t Pos, const TCHAR *Ptr);
-    NString &Insert (size_t Pos, const TCHAR *Ptr, size_t Count);
-    NString &Insert (size_t Pos, const tstring &Str);
-    NString &Insert (size_t Pos, const tstring &Str, size_t Offset, size_t Count);
-    NString &Insert (size_t Pos, const NString &Str);
-    NString &Insert (size_t Pos, const NString &Str, size_t Offset, size_t Count);
-    NString &Insert (size_t Pos, int Count, const TCHAR &Ch);
-
-    const TCHAR &operator[] (size_t ChPos) const;
-    TCHAR &operator[] (size_t ChPos);
-
-    NString &Replace (size_t Pos1, size_t Num1, const TCHAR *Ptr);
-    NString &Replace (size_t Pos1, size_t Num1, const TCHAR *Ptr, size_t Num2);
-    NString &Replace (size_t Pos1, size_t Num1, const tstring &Str);
-    NString &Replace (size_t Pos1, size_t Num1, const tstring &Str, size_t Pos2, size_t Num2);
-    NString &Replace (size_t Pos1, size_t Num1, const NString &Str);
-    NString &Replace (size_t Pos1, size_t Num1, const NString &Str, size_t Pos2, size_t Num2);
-    NString &Replace (size_t Pos1, size_t Num1, size_t Count, TCHAR Ch);
-
-    //! Reverse the string
-    void Reverse();
-
-    //! Replace character ChOut with ChIn in the string
-    NString &SearchAndReplace (TCHAR ChOut, TCHAR ChIn);
-
-    //! Return The last position of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurence (const TCHAR &suffix) const;
-    //! Return The last position of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurence (const TCHAR *suffix) const;
-    //! Return The last position of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurence (const tstring &suffix) const;
-    //! Return The last position of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurence (const NString &suffix) const;
-
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurence (const TCHAR &suffix) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurence (const TCHAR *suffix) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurence (const tstring &suffix) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurence (const NString &suffix) const;
-
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindNextOccurence (const TCHAR &suffix, size_t start = 0) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindNextOccurence (const TCHAR *suffix, size_t start = 0) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindNextOccurence (const tstring &suffix, size_t start = 0) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindNextOccurence (const NString &suffix, size_t start = 0) const;
-
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurenceOf (const TCHAR &str) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurenceOf (const TCHAR *str) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurenceOf (const tstring &str) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurenceOf (const NString &str) const;
-
-    //! Return the position of the last occurrence of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurenceOf (const TCHAR &str) const;
-    //! Return the position of the last occurrence of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurenceOf (const TCHAR *str) const;
-    //! Return the position of the last occurrence of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurenceOf (const tstring &str) const;
-    //! Return the position of the last occurrence of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurenceOf (const NString &str) const;
-
-    //! Searches this string for the first match of a substring.
-    size_t Find (NString str, int start = 0);
-    //! Searches this string for the first match of a character.
-    size_t Find (TCHAR c, int start = 0);
-
-    //! Return True if the string is terminated by the character 'suffix'
-    bool IsSuffix (const TCHAR &suffix);
-    //! Return True if the string is terminated by the character string 'suffix'
-    bool IsSuffix (const TCHAR *suffix);
-    //! Return True if the string is terminated by the tstring 'suffix'
-    bool IsSuffix (const tstring &suffix);
-    //! Return True if the string is terminated by the NString 'suffix'