Completed the string API.

Source/DFPSR/api/bufferAPI.cpp

@@ -24,8 +24,8 @@
 #include <fstream>
 #include <cstdlib>
 #include "bufferAPI.h"
+#include "stringAPI.h"
 #include "../math/scalar.h"
-#include "../base/text.h"
 
 namespace dsr {
 

Source/DFPSR/api/configAPI.h

@@ -24,7 +24,7 @@
 #ifndef DFPSR_API_CONFIG
 #define DFPSR_API_CONFIG
 
-#include "../base/text.h"
+#include "stringAPI.h"
 #include <functional>
 
 namespace dsr {

Source/DFPSR/api/fileAPI.cpp

@@ -23,9 +23,8 @@
 
 #include <fstream>
 #include <cstdlib>
+#include "fileAPI.h"
 #include "bufferAPI.h"
-#include "../math/scalar.h"
-#include "../base/text.h"
 
 namespace dsr {
 

Source/DFPSR/api/fileAPI.h

@@ -24,7 +24,7 @@
 #ifndef DFPSR_API_FILE
 #define DFPSR_API_FILE
 
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 #include "bufferAPI.h"
 
 // A module for file access that exists to prevent cyclic dependencies between strings and buffers.

Source/DFPSR/api/fontAPI.h

@@ -25,7 +25,7 @@
 #define DFPSR_API_FONT
 
 #include "types.h"
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 
 namespace dsr {
 	// Get a handle to the default font

Source/DFPSR/api/guiAPI.h

@@ -26,7 +26,7 @@
 #define DFPSR_API_GUI
 
 #include "types.h"
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 #include "../gui/InputEvent.h"
 
 // createBackendWindow should be implemented outside of the core framework

Source/DFPSR/base/text.cpp → Source/DFPSR/api/stringAPI.cpp

@@ -28,7 +28,7 @@
 #include <streambuf>
 #include <cstring>
 #include <stdexcept>
-#include "text.h"
+#include "stringAPI.h"
 #include "../api/fileAPI.h"
 
 using namespace dsr;

Source/DFPSR/base/text.h → Source/DFPSR/api/stringAPI.h

@@ -21,8 +21,8 @@
 //    3. This notice may not be removed or altered from any source
 //    distribution.
 
-#ifndef DFPSR_BASE_TEXT
-#define DFPSR_BASE_TEXT
+#ifndef DFPSR_API_STRING
+#define DFPSR_API_STRING
 
 #include <stdint.h>
 #include <string>

Source/DFPSR/api/types.h

@@ -29,7 +29,7 @@
 #include <memory>
 #include "../image/Color.h"
 #include "../math/IRect.h"
-#include "../base/text.h"
+#include "stringAPI.h"
 
 // Define DFPSR_INTERNAL_ACCESS before any include to get internal access to exposed types
 #ifdef DFPSR_INTERNAL_ACCESS

Source/DFPSR/base/SafePointer.cpp

@@ -22,7 +22,7 @@
 //    distribution.
 
 #include "SafePointer.h"
-#include "text.h"
+#include "../api/stringAPI.h"
 
 using namespace dsr;
 

Source/DFPSR/collection/BoundChecks.cpp

@@ -22,7 +22,7 @@
 //    3. This notice may not be removed or altered from any source
 //    distribution.
 
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/gui/BackendWindow.h

@@ -29,7 +29,7 @@
 #include "InputEvent.h"
 #include "../image/ImageRgbaU8.h"
 #include "../api/imageAPI.h"
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 #include "../collection/List.h"
 
 namespace dsr {

Source/DFPSR/gui/DsrWindow.h

@@ -28,7 +28,7 @@
 #include <memory>
 #include "../gui/VisualComponent.h"
 #include "../gui/BackendWindow.h"
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 #include "../api/types.h"
 
 // The DSR window is responsible for connecting visual interfaces with the backend window.

Source/DFPSR/gui/FlexRegion.h

@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include "../math/IVector.h"
 #include "../math/IRect.h"
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 #include "../persistent/ClassFactory.h"
 
 namespace dsr {

Source/DFPSR/image/Color.h

@@ -25,7 +25,7 @@
 #define DFPSR_IMAGE_COLOR
 
 #include <stdint.h>
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/image/PackOrder.h

@@ -28,7 +28,7 @@
 #include "../api/types.h"
 #include "../base/simd.h"
 #include "../base/endian.h"
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/image/stbImage/stbImageWrapper.h

@@ -3,7 +3,7 @@
 #define DFPSR_API_IMAGE_STB_WRAPPER
 
 #include "../../api/imageAPI.h"
-#include "../../base/text.h"
+#include "../../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/includeFramework.h

@@ -6,7 +6,7 @@
 
 	// Types needed to use the APIs
 	#include "math/includeMath.h"
-	#include "base/text.h"
+	#include "api/stringAPI.h"
 
 	// Additional functionality for convenience (not to be used in any API)
 	#include "collection/includeCollection.h" // Safer and easier to use than std collections

Source/DFPSR/math/FixedPoint.h

@@ -25,7 +25,7 @@
 #ifndef DFPSR_FIXED_POINT
 #define DFPSR_FIXED_POINT
 
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/math/vectorMethods.h

@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <cassert>
 #include <math.h>
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 
 // Since using templates for vector operands may include unwanted function
 // definitions that does not make any sense and will crash when called,

Source/DFPSR/persistent/ClassFactory.h

@@ -24,7 +24,7 @@
 #ifndef DFPSR_PERSISTENT_CLASSFACTORY
 #define DFPSR_PERSISTENT_CLASSFACTORY
 
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 #include "../collection/List.h"
 #include <memory>
 

Source/DFPSR/render/ResourcePool.h

@@ -26,7 +26,7 @@
 
 #include "../image/ImageRgbaU8.h"
 #include "../collection/List.h"
-#include "../base/text.h"
+#include "../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/render/model/Model.h

@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include "../../api/types.h"
 #include "../../collection/List.h"
-#include "../../base/text.h"
+#include "../../api/stringAPI.h"
 #include "../shader/Shader.h"
 #include "../Camera.h"
 #include "../ResourcePool.h"