Do bulk replace of stl types.

apps/notes_tk/NotesTk.cpp

@@ -16,7 +16,7 @@
 #include "DesktopManager.h"
 #include "MainApplication.h"
 
-NotesTk::NotesTk(std::unique_ptr<CommandLineArgs> args, std::unique_ptr<MainApplication> mainApp)
+NotesTk::NotesTk(Ptr<CommandLineArgs> args, Ptr<MainApplication> mainApp)
     : GuiApplication(std::move(args), std::move(mainApp))
 {
 

apps/notes_tk/NotesTk.h

@@ -5,7 +5,7 @@
 class NotesTk : public GuiApplication
 {
 public:
-    NotesTk(std::unique_ptr<CommandLineArgs> args = nullptr, std::unique_ptr<MainApplication> mainApp = nullptr);
+    NotesTk(Ptr<CommandLineArgs> args = nullptr, Ptr<MainApplication> mainApp = nullptr);
 
 protected:
     void initializeViews() override;

apps/notes_tk/audio_editor/AudioEditorView.cpp

@@ -12,7 +12,7 @@ AudioEditorView::AudioEditorView()
     addWidget(std::move(label));
 }
 
-std::unique_ptr<AudioEditorView> AudioEditorView::Create()
+Ptr<AudioEditorView> AudioEditorView::Create()
 {
     return std::make_unique<AudioEditorView>();
 }

apps/notes_tk/audio_editor/AudioEditorView.h

@@ -8,7 +8,7 @@ public:
 
     AudioEditorView();
 
-    static std::unique_ptr<AudioEditorView> Create();
+    static Ptr<AudioEditorView> Create();
 };
 
-using AudioEditorViewUPtr = std::unique_ptr<AudioEditorView>;
+using AudioEditorViewUPtr = Ptr<AudioEditorView>;

apps/notes_tk/canvas/CanvasController.cpp

@@ -1,6 +1,6 @@
 #include "CanvasController.h"
 
-std::unique_ptr<CanvasController> CanvasController::Create()
+Ptr<CanvasController> CanvasController::Create()
 {
     return std::make_unique<CanvasController>();
 }

apps/notes_tk/canvas/CanvasController.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <memory>
+#include "Memory.h"
 
 class CanvasController
 {
 public:
-    static std::unique_ptr<CanvasController> Create();
+    static Ptr<CanvasController> Create();
 };

apps/notes_tk/canvas/CanvasDrawingArea.h

@@ -24,6 +24,6 @@ private:
 
     CanvasDrawCommand mActiveDrawingCommand{CanvasDrawCommand::LINE};
 
-    std::vector<std::unique_ptr<GeometryNode> > mSceneNodes;
+    Vector<Ptr<GeometryNode> > mSceneNodes;
     bool mContentDirty{false};
 };

apps/notes_tk/canvas/CanvasView.cpp

@@ -27,7 +27,7 @@ CanvasView::~CanvasView()
 
 }
 
-std::unique_ptr<CanvasView> CanvasView::Create()
+Ptr<CanvasView> CanvasView::Create()
 {
     return std::make_unique<CanvasView>();
 }
@@ -70,7 +70,7 @@ void CanvasView::onDrawCommandChanged(CanvasDrawCommand command)
     mDrawingArea->setActiveDrawingCommand(command);
 }
 
-std::unique_ptr<Widget> CanvasView::initializeCacheButtons()
+Ptr<Widget> CanvasView::initializeCacheButtons()
 {
     auto saveButton = Button::Create();
     saveButton->setLabel("Save");

apps/notes_tk/canvas/CanvasView.h

@@ -13,17 +13,17 @@ public:
 
     ~CanvasView();
 
-    static std::unique_ptr<CanvasView> Create();
+    static Ptr<CanvasView> Create();
 
 private:
     void onDrawCommandChanged(CanvasDrawCommand command);
 
     void initialize();
 
-    std::unique_ptr<Widget> initializeCacheButtons();
+    Ptr<Widget> initializeCacheButtons();
 
-    std::unique_ptr<CanvasController> mController;
+    Ptr<CanvasController> mController;
 
     CanvasDrawingArea* mDrawingArea{nullptr};
 };
-using CanvasViewPtr = std::unique_ptr<CanvasView>;
+using CanvasViewPtr = Ptr<CanvasView>;

apps/notes_tk/image_editor/ImageEditorView.cpp

@@ -28,7 +28,7 @@ ImageEditorView::~ImageEditorView()
 
 }
 
-std::unique_ptr<ImageEditorView> ImageEditorView::Create()
+Ptr<ImageEditorView> ImageEditorView::Create()
 {
     return std::make_unique<ImageEditorView>();
 }

apps/notes_tk/image_editor/ImageEditorView.h

@@ -10,7 +10,7 @@ public:
 
     virtual ~ImageEditorView();
 
-    static std::unique_ptr<ImageEditorView> Create();
+    static Ptr<ImageEditorView> Create();
 };
 
-using ImageEditorViewUPtr = std::unique_ptr<ImageEditorView>;
+using ImageEditorViewUPtr = Ptr<ImageEditorView>;

apps/notes_tk/image_editor/ImageViewWidget.h

@@ -16,5 +16,5 @@ private:
     unsigned mNumX{5};
     unsigned mNumY{5};
 
-    std::unique_ptr<GridNode> mGridNode;
+    Ptr<GridNode> mGridNode;
 };

apps/notes_tk/main-win.cpp

@@ -13,8 +13,8 @@
 #include "windows.h"
 
 #include <iostream>
-#include <vector>
-#include <string>
+#include "Vector.h"
+#include "String.h"
 
 int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine, int nCmdShow)
 {

apps/notes_tk/main.cpp

@@ -1,4 +1,4 @@
-#include <memory>
+#include "Memory.h"
 
 #include "NotesTk.h"
 #include "MainApplication.h"

apps/notes_tk/mesh_viewer/MeshViewerView.cpp

@@ -10,7 +10,7 @@
 
 #include <iostream>
 
-std::unique_ptr<MeshViewerView> MeshViewerView::Create()
+Ptr<MeshViewerView> MeshViewerView::Create()
 {
     return std::make_unique<MeshViewerView>();
 }

apps/notes_tk/mesh_viewer/MeshViewerView.h

@@ -10,10 +10,10 @@ class MeshViewerView : public Widget
 public:
     MeshViewerView();
     ~MeshViewerView();
-    static std::unique_ptr<MeshViewerView> Create();
+    static Ptr<MeshViewerView> Create();
     void doPaint(const PaintEvent* event) override;
 private:
 
-    std::unique_ptr<AbstractMesh> mMesh;
-    std::unique_ptr<MeshNode> mMeshNode;
+    Ptr<AbstractMesh> mMesh;
+    Ptr<MeshNode> mMeshNode;
 };

apps/notes_tk/text_editor/PlainTextDocument.cpp

@@ -6,17 +6,17 @@ PlainTextDocument::PlainTextDocument()
 
 }
 
-std::unique_ptr<PlainTextDocument> PlainTextDocument::Create()
+Ptr<PlainTextDocument> PlainTextDocument::Create()
 {
     return std::make_unique<PlainTextDocument>();
 }
 
-std::string PlainTextDocument::GetContent() const
+String PlainTextDocument::GetContent() const
 {
     return mContent;
 }
 
-void PlainTextDocument::SetContent(const std::string& content)
+void PlainTextDocument::SetContent(const String& content)
 {
     mContent = content;
 }

apps/notes_tk/text_editor/PlainTextDocument.h

@@ -1,24 +1,24 @@
 #pragma once
 
-#include <string>
-#include <memory>
+#include "String.h"
+#include "Memory.h"
 
 class PlainTextDocument
 {
-    std::string mContent;
+    String mContent;
 
 public:
 
     PlainTextDocument();
 
-    static std::unique_ptr<PlainTextDocument> Create();
+    static Ptr<PlainTextDocument> Create();
 
-    std::string GetContent() const;
+    String GetContent() const;
 
-    void SetContent(const std::string& content);
+    void SetContent(const String& content);
 
     void Clear();
 
 };
 
-using PlainTextDocumentUPtr = std::unique_ptr<PlainTextDocument>;
+using PlainTextDocumentUPtr = Ptr<PlainTextDocument>;

apps/notes_tk/text_editor/TextEditorController.cpp

@@ -9,17 +9,17 @@ TextEditorController::TextEditorController()
 
 }
 
-std::unique_ptr<TextEditorController> TextEditorController::Create()
+Ptr<TextEditorController> TextEditorController::Create()
 {
     return std::make_unique<TextEditorController>();
 }
 
-void TextEditorController::SetContent(const std::string& content)
+void TextEditorController::SetContent(const String& content)
 {
     mModel->GetDocument()->SetContent(content);
 }
 
-std::string TextEditorController::GetContent() const
+String TextEditorController::GetContent() const
 {
     return mModel->GetDocument()->GetContent();
 }

apps/notes_tk/text_editor/TextEditorController.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <memory>
+#include "Memory.h"
 #include <filesystem>
 #include "TextEditorModel.h"
 
@@ -9,7 +9,7 @@ public:
 
     TextEditorController();
 
-    static std::unique_ptr<TextEditorController> Create();
+    static Ptr<TextEditorController> Create();
 
     void OnSave();
 
@@ -17,9 +17,9 @@ public:
 
     void OnLoad();
 
-    std::string GetContent() const;
+    String GetContent() const;
 
-    void SetContent(const std::string& content);
+    void SetContent(const String& content);
 
     void SetSavePath(const std::filesystem::path& path);
 
@@ -31,4 +31,4 @@ private:
     std::filesystem::path mLoadPath;
 };
 
-using TextEditorControllerUPtr = std::unique_ptr<TextEditorController>;
+using TextEditorControllerUPtr = Ptr<TextEditorController>;

apps/notes_tk/text_editor/TextEditorModel.cpp

@@ -6,7 +6,7 @@ TextEditorModel::TextEditorModel()
 
 }
 
-std::unique_ptr<TextEditorModel> TextEditorModel::Create()
+Ptr<TextEditorModel> TextEditorModel::Create()
 {
     return std::make_unique<TextEditorModel>();
 }

apps/notes_tk/text_editor/TextEditorModel.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "PlainTextDocument.h"
-#include <memory>
+#include "Memory.h"
 
 class TextEditorModel
 {
@@ -11,9 +11,9 @@ public:
 
     TextEditorModel();
 
-    static std::unique_ptr<TextEditorModel> Create();
+    static Ptr<TextEditorModel> Create();
 
     PlainTextDocument* GetDocument() const;
 };
 
-using TextEditorModelUPtr = std::unique_ptr<TextEditorModel>;
+using TextEditorModelUPtr = Ptr<TextEditorModel>;

apps/notes_tk/text_editor/TextEditorView.cpp

@@ -81,7 +81,7 @@ void TextEditorView::initialize()
     addWidget(std::move(hSpacer));
 }
 
-std::unique_ptr<TextEditorView> TextEditorView::Create()
+Ptr<TextEditorView> TextEditorView::Create()
 {
     return std::make_unique<TextEditorView>();
 }

apps/notes_tk/text_editor/TextEditorView.h

@@ -13,7 +13,7 @@ class TextEditorView : public Widget
 public:
     TextEditorView();
 
-    static std::unique_ptr<TextEditorView> Create();
+    static Ptr<TextEditorView> Create();
 
     TextEditorController* getController();
 
@@ -23,4 +23,4 @@ private:
     TextBox* mTextBox;
     TextEditorControllerUPtr mController;
 };
-using TextEditorViewUPtr = std::unique_ptr<TextEditorView>;
+using TextEditorViewUPtr = Ptr<TextEditorView>;

apps/notes_tk/web_client/WebClientView.cpp

@@ -14,7 +14,7 @@ WebClientView::WebClientView()
     addWidget(std::move(label));
 }
 
-std::unique_ptr<WebClientView> WebClientView::Create()
+Ptr<WebClientView> WebClientView::Create()
 {
     return std::make_unique<WebClientView>();
 }

apps/notes_tk/web_client/WebClientView.h

@@ -8,7 +8,7 @@ public:
 
     WebClientView();
 
-    static std::unique_ptr<WebClientView> Create();
+    static Ptr<WebClientView> Create();
 };
 
-using WebClientViewUPtr = std::unique_ptr<WebClientView>;
+using WebClientViewUPtr = Ptr<WebClientView>;

apps/website-generator/ContentFile.cpp

@@ -23,7 +23,7 @@ Path ContentFile::getFilename() const
     return mFilename;
 }
 
-std::string ContentFile::getOutputLocation() const
+String ContentFile::getOutputLocation() const
 {
     const auto metadata_item = getMetadataItem("save_as");
     return metadata_item.empty() ? PathUtils::getBaseFilename(mFilename) : metadata_item;
@@ -55,7 +55,7 @@ void ContentFile::doLinkTagSubstitution(const Path& basePath)
     }
 }
 
-std::string ContentFile::getMetadataItem(const std::string& key) const
+String ContentFile::getMetadataItem(const String& key) const
 {
     const auto check = mMetadata.find(key);
     if (check == mMetadata.end())

apps/website-generator/ContentFile.h

@@ -3,7 +3,7 @@
 #include "MarkdownContentParser.h"
 #include "File.h"
 
-#include <string>
+#include "String.h"
 #include <iostream>
 #include <unordered_map>
 
@@ -12,8 +12,8 @@ class MarkdownDocument;
 class ContentFile
 {
 public:
-    using FileMetadata = std::unordered_map<std::string, std::string>;
-    using FileContentBody = std::vector<std::string>;
+    using FileMetadata = std::unordered_map<String, String>;
+    using FileContentBody = Vector<String>;
 
     ContentFile(const Path& filename);
 
@@ -23,9 +23,9 @@ public:
 
     virtual void load();
 
-    std::string getMetadataItem(const std::string& key) const;
+    String getMetadataItem(const String& key) const;
 
-    virtual std::string getOutputLocation() const;
+    virtual String getOutputLocation() const;
 
     MarkdownDocument* getContentBody() const
     {
@@ -36,15 +36,15 @@ public:
 
     void write(const Path& path);
 
-    void setProcessedOutput(const std::string& output)
+    void setProcessedOutput(const String& output)
     {
         mProcessedOutput = output;
     }
 protected:
     Path mFilename;
     FileMetadata mMetadata;
-    std::unique_ptr<MarkdownDocument> mContentBody;
-    std::string mProcessedOutput;
+    Ptr<MarkdownDocument> mContentBody;
+    String mProcessedOutput;
 };
 
 class ContentArticle : public ContentFile

apps/website-generator/MarkdownContentParser.cpp

@@ -7,7 +7,7 @@
 
 #include "File.h"
 
-std::pair<MarkdownContentParser::FileMetadata, std::unique_ptr<MarkdownDocument>> MarkdownContentParser::run(const Path& path)
+std::pair<MarkdownContentParser::FileMetadata, Ptr<MarkdownDocument>> MarkdownContentParser::run(const Path& path)
 {
     FileMetadata metadata;
     FileMetadata output_metadata;
@@ -15,7 +15,7 @@ std::pair<MarkdownContentParser::FileMetadata, std::unique_ptr<MarkdownDocument>
     const auto lines = File(path).readLines();
     bool metadata_finished = false;
 
-    std::string content_body;
+    String content_body;
     for (const auto& line : lines)
     {
         if (!metadata_finished)
@@ -54,11 +54,11 @@ std::pair<MarkdownContentParser::FileMetadata, std::unique_ptr<MarkdownDocument>
     return {output_metadata, std::move(document)};
 }
 
-std::optional<MarkdownContentParser::FileMetadataItem> MarkdownContentParser::checkForMetadataItem(const std::string& line) const
+std::optional<MarkdownContentParser::FileMetadataItem> MarkdownContentParser::checkForMetadataItem(const String& line) const
 {
     unsigned char_count = 0;
-    std::string prefix;
-    std::string suffix;
+    String prefix;
+    String suffix;
     bool building_prefix = true;
     for (const auto c : line)
     {

apps/website-generator/MarkdownContentParser.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <string>
+#include "String.h"
 #include <optional>
 #include <unordered_map>
 #include <filesystem>
-#include <vector>
+#include "Vector.h"
 
 using Path = std::filesystem::path;
 
@@ -13,10 +13,10 @@ class MarkdownDocument;
 class MarkdownContentParser
 {
 public:
-    using FileMetadataItem = std::pair<std::string, std::string>;
-    using FileMetadata = std::unordered_map<std::string, std::string>;
+    using FileMetadataItem = std::pair<String, String>;
+    using FileMetadata = std::unordered_map<String, String>;
 
-    std::pair<FileMetadata, std::unique_ptr<MarkdownDocument>> run(const Path& path);
+    std::pair<FileMetadata, Ptr<MarkdownDocument>> run(const Path& path);
 private:
-    std::optional<FileMetadataItem> checkForMetadataItem(const std::string& line) const;
+    std::optional<FileMetadataItem> checkForMetadataItem(const String& line) const;
 };

apps/website-generator/SiteGeneratorConfig.cpp

@@ -5,7 +5,7 @@ Path SiteGeneratorConfig::getThemePath() const
     return mThemesPath;
 }
 
-std::string SiteGeneratorConfig::getActiveTheme() const
+String SiteGeneratorConfig::getActiveTheme() const
 {
     return mActiveTheme;
 }
@@ -15,7 +15,7 @@ void SiteGeneratorConfig::setThemePath(const Path& path)
     mThemesPath = path;
 }
 
-void SiteGeneratorConfig::setActiveTheme(const std::string& theme)
+void SiteGeneratorConfig::setActiveTheme(const String& theme)
 {
     mActiveTheme = theme;
 }

apps/website-generator/SiteGeneratorConfig.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <string>
+#include "String.h"
 #include <filesystem>
 
 using Path = std::filesystem::path;
@@ -10,13 +10,13 @@ class SiteGeneratorConfig
 public:
     Path getThemePath() const;
 
-    std::string getActiveTheme() const;
+    String getActiveTheme() const;
 
     void setThemePath(const Path& path);
 
-    void setActiveTheme(const std::string& theme);
+    void setActiveTheme(const String& theme);
 
 private:
     Path mThemesPath;
-    std::string mActiveTheme;
+    String mActiveTheme;
 };

apps/website-generator/WebsiteGenerator.cpp

@@ -30,7 +30,7 @@ WebsiteGenerator::~WebsiteGenerator()
 
 }
 
-void WebsiteGenerator::findProject(const std::string& searchPath)
+void WebsiteGenerator::findProject(const String& searchPath)
 {
     const auto config_path = std::filesystem::path(searchPath) / "config.toml";
     if (std::filesystem::exists(config_path))

apps/website-generator/WebsiteGenerator.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <string>
+#include "String.h"
 #include <iostream>
 #include <filesystem>
 #include <unordered_map>
-#include <vector>
+#include "Vector.h"
 
 using Path = std::filesystem::path;
 
@@ -22,7 +22,7 @@ public:
 
     void doSubstitutions();
 
-    void findProject(const std::string& searchPath);
+    void findProject(const String& searchPath);
 
     void parseContentFiles();
 
@@ -47,9 +47,9 @@ private:
 
     std::filesystem::path mProjectPath;
 
-    std::unique_ptr<SiteGeneratorConfig> mConfig;
-    std::unique_ptr<TemplatingEngine> mTemplateEngine;
+    Ptr<SiteGeneratorConfig> mConfig;
+    Ptr<TemplatingEngine> mTemplateEngine;
 
-    std::vector<std::unique_ptr<ContentPage> > mPages;
-    std::vector<std::unique_ptr<ContentArticle> > mArticles;
+    Vector<Ptr<ContentPage> > mPages;
+    Vector<Ptr<ContentArticle> > mArticles;
 };