← Back to branch summary

~stolowski/nux/merge-trunk

~stolowski/nux/merge-trunk

Viewing all changes in revision 660.2.1.

Committer: Michi Henning
Date: 2012-09-21 02:14:12 UTC
mto: (686.1.1 nux) (660.2.2 michi.nstring)
mto: This revision was merged to the branch mainline in revision 687.
Revision ID: michi.henning@canonical.com-20120921021412-8ftf6v23zjuikzh2

Removed NString and replaced it with std::string.

files modified:
Nux/ActionItem.cpp

Nux/ActionItem.h

Nux/BaseWindow.h

Nux/ColorPreview.cpp

Nux/DoubleValidator.cpp

Nux/DoubleValidator.h

Nux/EditTextBox.cpp

Nux/EditTextBox.h

Nux/FileSelector.cpp

Nux/FloatingWindow.cpp

Nux/FloatingWindow.h

Nux/HLayout.cpp

Nux/HLayout.h

Nux/HexRegExpValidator.cpp

Nux/HexRegExpValidator.h

Nux/IntegerValidator.cpp

Nux/IntegerValidator.h

Nux/KeyboardHandler.cpp

Nux/KeyboardHandler.h

Nux/Layout.h

Nux/MenuPage.cpp

Nux/MenuPage.h

Nux/NumericValuator.cpp

Nux/PangoText.cpp

Nux/RGBValuator.cpp

Nux/RGBValuator.h

Nux/RangeValue.cpp

Nux/RangeValue.h

Nux/RangeValueInteger.cpp

Nux/RangeValueInteger.h

Nux/SpinBox.cpp

Nux/SpinBoxDouble.cpp

Nux/StaticTextBox.cpp

Nux/StaticTextBox.h

Nux/SystemThread.h

Nux/TabView.cpp

Nux/TabView.h

Nux/Theme.cpp

Nux/VLayout.cpp

Nux/VLayout.h

Nux/Validator.cpp

Nux/Validator.h

Nux/WindowCompositor.cpp

Nux/WindowCompositor.h

NuxCore/FileIO.cpp

NuxCore/FileIO.h

NuxCore/FileManager/NFileManagerGNU.h

NuxCore/FileManager/NFileManagerGeneric.cpp

NuxCore/FileManager/NFileManagerGeneric.h

NuxCore/FileName.cpp

NuxCore/FileName.h

NuxCore/FilePath.cpp

NuxCore/FilePath.h

NuxCore/NumberConversion.cpp

NuxCore/NumberConversion.h

NuxCore/OutputDevice.cpp

NuxCore/OutputDevice.h

NuxCore/Parsing.cpp

NuxCore/Parsing.h

NuxCore/Platform.cpp

NuxCore/Platform.h

NuxCore/TextString.cpp

NuxCore/TextString.h

NuxCore/TimeFunctions.cpp

NuxCore/TimeFunctions.h

NuxGraphics/FontTexture.cpp

NuxGraphics/FontTexture.h

NuxGraphics/GLSh_ColorPicker.cpp

NuxGraphics/GLSh_DrawFunction.cpp

NuxGraphics/GLShaderParameter.h

NuxGraphics/GpuDevice.cpp

NuxGraphics/GpuDevice.h

NuxGraphics/GraphicsDisplayWin.cpp

NuxGraphics/GraphicsDisplayX11.cpp

NuxGraphics/GraphicsDisplayX11.h

NuxGraphics/GraphicsEngine.cpp

NuxGraphics/IOpenGLAsmShader.cpp

NuxGraphics/IOpenGLAsmShader.h

NuxGraphics/IOpenGLGLSLShader.cpp

NuxGraphics/IOpenGLGLSLShader.h

NuxGraphics/NuxGraphics.h

NuxGraphics/NuxGraphicsResources.cpp

NuxGraphics/NuxGraphicsResources.h

NuxGraphics/RenderingPipeAsm.cpp

NuxGraphics/RenderingPipeGLSL.cpp

NuxGraphics/RenderingPipeTextureBlend.cpp

Show diffs side-by-side

added added

removed removed

Nux/ActionItem.cpp

Nux/ActionItem.h

Nux/BaseWindow.h

Nux/ColorPreview.cpp

Nux/DoubleValidator.cpp

Nux/DoubleValidator.h

Nux/EditTextBox.cpp

Nux/EditTextBox.h

Nux/FileSelector.cpp

Nux/FloatingWindow.cpp

Nux/FloatingWindow.h

Nux/HLayout.cpp

Nux/HexRegExpValidator.cpp

Nux/HexRegExpValidator.h

Nux/IntegerValidator.cpp

Nux/IntegerValidator.h

Nux/KeyboardHandler.cpp

Nux/KeyboardHandler.h

Nux/MenuPage.cpp

Nux/NumericValuator.cpp

Nux/PangoText.cpp

Nux/RGBValuator.cpp

Nux/RGBValuator.h

Nux/RangeValue.cpp

Nux/RangeValue.h

Nux/RangeValueInteger.cpp

Nux/RangeValueInteger.h

Nux/SpinBox.cpp

Nux/SpinBoxDouble.cpp

Nux/StaticTextBox.cpp

Nux/StaticTextBox.h

Nux/SystemThread.h

Nux/TabView.cpp

Nux/VLayout.cpp

Nux/Validator.cpp

Nux/Validator.h

Nux/WindowCompositor.cpp

Nux/WindowCompositor.h

NuxCore/FileIO.cpp

NuxCore/FileIO.h

NuxCore/FileManager/NFileManagerGNU.h

NuxCore/FileManager/NFileManagerGeneric.cpp

NuxCore/FileManager/NFileManagerGeneric.h

NuxCore/FileName.cpp

NuxCore/FileName.h

NuxCore/FilePath.cpp

NuxCore/FilePath.h

NuxCore/NumberConversion.cpp

NuxCore/NumberConversion.h

NuxCore/OutputDevice.cpp

NuxCore/OutputDevice.h

NuxCore/Parsing.cpp

NuxCore/Parsing.h

NuxCore/Platform.cpp

NuxCore/Platform.h

NuxCore/TextString.cpp

NuxCore/TextString.h

NuxCore/TimeFunctions.cpp

NuxCore/TimeFunctions.h

NuxGraphics/FontTexture.cpp

NuxGraphics/FontTexture.h

NuxGraphics/GLSh_ColorPicker.cpp

NuxGraphics/GLSh_DrawFunction.cpp

NuxGraphics/GLShaderParameter.h

NuxGraphics/GpuDevice.cpp

NuxGraphics/GpuDevice.h

NuxGraphics/GraphicsDisplayWin.cpp

NuxGraphics/GraphicsDisplayX11.cpp

NuxGraphics/GraphicsDisplayX11.h

NuxGraphics/GraphicsEngine.cpp

NuxGraphics/IOpenGLAsmShader.cpp

NuxGraphics/IOpenGLAsmShader.h

NuxGraphics/IOpenGLGLSLShader.cpp

NuxGraphics/IOpenGLGLSLShader.h

NuxGraphics/NuxGraphics.h

NuxGraphics/NuxGraphicsResources.cpp

NuxGraphics/NuxGraphicsResources.h

NuxGraphics/RenderingPipeAsm.cpp

NuxGraphics/RenderingPipeGLSL.cpp

NuxGraphics/RenderingPipeTextureBlend.cpp

Older »