diff --git a/apps/notes_tk/canvas/CanvasController.h b/apps/notes_tk/canvas/CanvasController.h index 8722a00..88ece5c 100644 --- a/apps/notes_tk/canvas/CanvasController.h +++ b/apps/notes_tk/canvas/CanvasController.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class CanvasController { diff --git a/apps/notes_tk/main.cpp b/apps/notes_tk/main.cpp index 7b2f7cb..fbd0fbb 100644 --- a/apps/notes_tk/main.cpp +++ b/apps/notes_tk/main.cpp @@ -1,4 +1,4 @@ -#include "Memory.h" +#include "Pointer.h" #include "NotesTk.h" #include "MainApplication.h" diff --git a/apps/notes_tk/text_editor/PlainTextDocument.h b/apps/notes_tk/text_editor/PlainTextDocument.h index 4c255fc..f3354a5 100644 --- a/apps/notes_tk/text_editor/PlainTextDocument.h +++ b/apps/notes_tk/text_editor/PlainTextDocument.h @@ -1,7 +1,7 @@ #pragma once #include "String.h" -#include "Memory.h" +#include "Pointer.h" class PlainTextDocument { diff --git a/apps/notes_tk/text_editor/TextEditorController.h b/apps/notes_tk/text_editor/TextEditorController.h index fe3fe44..8601a7e 100644 --- a/apps/notes_tk/text_editor/TextEditorController.h +++ b/apps/notes_tk/text_editor/TextEditorController.h @@ -1,5 +1,5 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include #include "TextEditorModel.h" diff --git a/apps/notes_tk/text_editor/TextEditorModel.h b/apps/notes_tk/text_editor/TextEditorModel.h index 7353c9c..55e4d8e 100644 --- a/apps/notes_tk/text_editor/TextEditorModel.h +++ b/apps/notes_tk/text_editor/TextEditorModel.h @@ -1,7 +1,7 @@ #pragma once #include "PlainTextDocument.h" -#include "Memory.h" +#include "Pointer.h" class TextEditorModel { diff --git a/apps/website-generator/ContentFile.h b/apps/website-generator/ContentFile.h index 572d835..b240bd0 100644 --- a/apps/website-generator/ContentFile.h +++ b/apps/website-generator/ContentFile.h @@ -5,14 +5,14 @@ #include "String.h" #include -#include +#include Map.h class MarkdownDocument; class ContentFile { public: - using FileMetadata = std::unordered_map; + using FileMetadata = Map; using FileContentBody = Vector; ContentFile(const Path& filename); diff --git a/apps/website-generator/MarkdownContentParser.h b/apps/website-generator/MarkdownContentParser.h index a9a3224..7dafbca 100644 --- a/apps/website-generator/MarkdownContentParser.h +++ b/apps/website-generator/MarkdownContentParser.h @@ -2,7 +2,7 @@ #include "String.h" #include -#include +#include Map.h #include #include "Vector.h" @@ -14,7 +14,7 @@ class MarkdownContentParser { public: using FileMetadataItem = std::pair; - using FileMetadata = std::unordered_map; + using FileMetadata = Map; std::pair> run(const Path& path); private: diff --git a/apps/website-generator/WebsiteGenerator.h b/apps/website-generator/WebsiteGenerator.h index 2ada094..eb46075 100644 --- a/apps/website-generator/WebsiteGenerator.h +++ b/apps/website-generator/WebsiteGenerator.h @@ -3,7 +3,7 @@ #include "String.h" #include #include -#include +#include Map.h #include "Vector.h" using Path = std::filesystem::path; diff --git a/plugins/circuits/src/CircuitElement.h b/plugins/circuits/src/CircuitElement.h index 0b4ced4..59e7b92 100644 --- a/plugins/circuits/src/CircuitElement.h +++ b/plugins/circuits/src/CircuitElement.h @@ -1,7 +1,7 @@ #pragma once #include "String.h" -#include "Memory.h" +#include "Pointer.h" class CircuitElement diff --git a/plugins/circuits/src/ElectronicCircuit.h b/plugins/circuits/src/ElectronicCircuit.h index 449a27c..978986d 100644 --- a/plugins/circuits/src/ElectronicCircuit.h +++ b/plugins/circuits/src/ElectronicCircuit.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" #include "CircuitElement.h" diff --git a/plugins/circuits/src/TruthTable.h b/plugins/circuits/src/TruthTable.h index 2564f8f..954abac 100644 --- a/plugins/circuits/src/TruthTable.h +++ b/plugins/circuits/src/TruthTable.h @@ -8,7 +8,7 @@ class TruthTable public: using TableData = std::map, Vector >; - TruthTable(std::size_t, std::size_t) + TruthTable(size_t, size_t) //: mNumInputColumns(numInputColumns), // mNumOutputColumns(numOutputColumns) { @@ -25,8 +25,8 @@ public: static const TruthTable::TableData AND_TRUTH_TABLE; private: - //std::size_t mNumInputColumns{ 0 }; - //std::size_t mNumOutputColumns{ 0 }; + //size_t mNumInputColumns{ 0 }; + //size_t mNumOutputColumns{ 0 }; TableData mTable; }; diff --git a/plugins/circuits/src/gates/LogicGate.cpp b/plugins/circuits/src/gates/LogicGate.cpp index b8a7512..6a05cef 100644 --- a/plugins/circuits/src/gates/LogicGate.cpp +++ b/plugins/circuits/src/gates/LogicGate.cpp @@ -1,6 +1,6 @@ #include "LogicGate.h" -NInMOutLogicGate::NInMOutLogicGate(std::size_t numIn, std::size_t numOut, Vector inputs, Vector outputs) +NInMOutLogicGate::NInMOutLogicGate(size_t numIn, size_t numOut, Vector inputs, Vector outputs) : LogicGate(), mNumIn(numIn), mNumOut(numOut) @@ -24,17 +24,17 @@ NInMOutLogicGate::NInMOutLogicGate(std::size_t numIn, std::size_t numOut, Vector } } -std::size_t NInMOutLogicGate::getNumInputs() const +size_t NInMOutLogicGate::getNumInputs() const { return mNumIn; } -std::size_t NInMOutLogicGate::getNumOutputs() const +size_t NInMOutLogicGate::getNumOutputs() const { return mNumOut; } -Wire* NInMOutLogicGate::getInput(std::size_t idx) const +Wire* NInMOutLogicGate::getInput(size_t idx) const { if (idx < mNumIn) { @@ -46,7 +46,7 @@ Wire* NInMOutLogicGate::getInput(std::size_t idx) const } } -Wire* NInMOutLogicGate::getOutput(std::size_t idx) const +Wire* NInMOutLogicGate::getOutput(size_t idx) const { if (idx < mNumOut) { @@ -58,7 +58,7 @@ Wire* NInMOutLogicGate::getOutput(std::size_t idx) const } } -void NInMOutLogicGate::setAtInput(std::size_t idx, Wire* value) +void NInMOutLogicGate::setAtInput(size_t idx, Wire* value) { if (idx < mInputs.size()) { @@ -66,7 +66,7 @@ void NInMOutLogicGate::setAtInput(std::size_t idx, Wire* value) } } -void NInMOutLogicGate::setAtOutput(std::size_t idx, Wire* value) +void NInMOutLogicGate::setAtOutput(size_t idx, Wire* value) { if (idx < mOutputs.size()) { diff --git a/plugins/circuits/src/gates/LogicGate.h b/plugins/circuits/src/gates/LogicGate.h index 4a588c4..e36dcf6 100644 --- a/plugins/circuits/src/gates/LogicGate.h +++ b/plugins/circuits/src/gates/LogicGate.h @@ -4,7 +4,7 @@ #include "TruthTable.h" #include "Wire.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class LogicGate : public CircuitElement @@ -20,13 +20,13 @@ public: }; virtual ~LogicGate() = default; - virtual std::size_t getNumInputs() const = 0; + virtual size_t getNumInputs() const = 0; - virtual std::size_t getNumOutputs() const = 0; + virtual size_t getNumOutputs() const = 0; - virtual Wire* getInput(std::size_t idx) const = 0; + virtual Wire* getInput(size_t idx) const = 0; - virtual Wire* getOutput(std::size_t idx) const = 0; + virtual Wire* getOutput(size_t idx) const = 0; virtual const TruthTable& getTruthTable() = 0; @@ -41,25 +41,25 @@ public: class NInMOutLogicGate : public LogicGate { public: - NInMOutLogicGate(std::size_t numIn, std::size_t numOut, Vector inputs = {}, Vector outputs = {}); + NInMOutLogicGate(size_t numIn, size_t numOut, Vector inputs = {}, Vector outputs = {}); virtual ~NInMOutLogicGate() = default; - std::size_t getNumInputs() const override; + size_t getNumInputs() const override; - std::size_t getNumOutputs() const override; + size_t getNumOutputs() const override; - Wire* getInput(std::size_t idx) const override; + Wire* getInput(size_t idx) const override; - Wire* getOutput(std::size_t idx) const override; + Wire* getOutput(size_t idx) const override; - void setAtInput(std::size_t idx, Wire* value); + void setAtInput(size_t idx, Wire* value); - void setAtOutput(std::size_t idx, Wire* value); + void setAtOutput(size_t idx, Wire* value); private: - std::size_t mNumIn{ 1 }; - std::size_t mNumOut{ 1 }; + size_t mNumIn{ 1 }; + size_t mNumOut{ 1 }; Vector mInputs; Vector mOutputs; diff --git a/plugins/circuits/src/visuals/ElectronicCircuitNode.cpp b/plugins/circuits/src/visuals/ElectronicCircuitNode.cpp index 8a3dfad..7984a45 100644 --- a/plugins/circuits/src/visuals/ElectronicCircuitNode.cpp +++ b/plugins/circuits/src/visuals/ElectronicCircuitNode.cpp @@ -37,12 +37,12 @@ void ElectronicCircuitNode::buildWireConnections() for (auto gate : mContent->getLogicGates()) { - for (std::size_t idx = 0; idx < gate->getNumInputs(); idx++) + for (size_t idx = 0; idx < gate->getNumInputs(); idx++) { mWireInputConnections[gate->getInput(idx)] = gate; } - for (std::size_t idx = 0; idx < gate->getNumOutputs(); idx++) + for (size_t idx = 0; idx < gate->getNumOutputs(); idx++) { mWireOutputConnections[gate->getOutput(idx)] = gate; } diff --git a/plugins/circuits/src/visuals/ElectronicCircuitNode.h b/plugins/circuits/src/visuals/ElectronicCircuitNode.h index 5d41d42..0088098 100644 --- a/plugins/circuits/src/visuals/ElectronicCircuitNode.h +++ b/plugins/circuits/src/visuals/ElectronicCircuitNode.h @@ -4,7 +4,7 @@ #include "ElectronicCircuit.h" -#include +#include Map.h class WireNode; class TerminalNode; @@ -36,8 +36,8 @@ private: Vector > mWireNodes; Vector > mLogicGateNodes; - std::unordered_map mWireInputConnections; - std::unordered_map mWireOutputConnections; + Map mWireInputConnections; + Map mWireOutputConnections; - std::unordered_map mNodesForContent; + Map mNodesForContent; }; diff --git a/plugins/circuits/src/visuals/LogicGateNode.cpp b/plugins/circuits/src/visuals/LogicGateNode.cpp index 31bc9fb..e64e18e 100644 --- a/plugins/circuits/src/visuals/LogicGateNode.cpp +++ b/plugins/circuits/src/visuals/LogicGateNode.cpp @@ -21,9 +21,9 @@ LogicGateNode::~LogicGateNode() Point2 LogicGateNode::getConnectionLocation(Wire* wire) const { bool is_input{ false }; - std::size_t connection_id{ 0 }; + size_t connection_id{ 0 }; - for (std::size_t idx = 0; idx < mContent->getNumInputs(); idx++) + for (size_t idx = 0; idx < mContent->getNumInputs(); idx++) { if (mContent->getInput(idx) == wire) { @@ -33,7 +33,7 @@ Point2 LogicGateNode::getConnectionLocation(Wire* wire) const } } - for (std::size_t idx = 0; idx < mContent->getNumOutputs(); idx++) + for (size_t idx = 0; idx < mContent->getNumOutputs(); idx++) { if (mContent->getOutput(idx) == wire) { diff --git a/plugins/circuits/src/visuals/LogicGatePrimitiveShapes.cpp b/plugins/circuits/src/visuals/LogicGatePrimitiveShapes.cpp index fff269f..cd89ba2 100644 --- a/plugins/circuits/src/visuals/LogicGatePrimitiveShapes.cpp +++ b/plugins/circuits/src/visuals/LogicGatePrimitiveShapes.cpp @@ -5,7 +5,7 @@ String LogicGatePrimitiveShapes::getAndGateShape() return "M4 8 h24 a16 16 0 0 1 0 32 h-24Z"; } -Point2 LogicGatePrimitiveShapes::getAndGateConnectionLocation(bool isInput, std::size_t idx) +Point2 LogicGatePrimitiveShapes::getAndGateConnectionLocation(bool isInput, size_t idx) { if (isInput) { @@ -29,7 +29,7 @@ String LogicGatePrimitiveShapes::getOrGateShape() return "M4 8 h16 q16 2 24 16 q-12 16 -24 16 h-16 q12 -16 0 -32Z"; } -Point2 LogicGatePrimitiveShapes::getOrGateConnectionLocation(bool isInput, std::size_t idx) +Point2 LogicGatePrimitiveShapes::getOrGateConnectionLocation(bool isInput, size_t idx) { if (isInput) { diff --git a/plugins/circuits/src/visuals/LogicGatePrimitiveShapes.h b/plugins/circuits/src/visuals/LogicGatePrimitiveShapes.h index 4323086..01b628a 100644 --- a/plugins/circuits/src/visuals/LogicGatePrimitiveShapes.h +++ b/plugins/circuits/src/visuals/LogicGatePrimitiveShapes.h @@ -7,11 +7,11 @@ class LogicGatePrimitiveShapes { public: - static Point2 getAndGateConnectionLocation(bool isInput, std::size_t idx); + static Point2 getAndGateConnectionLocation(bool isInput, size_t idx); static String getAndGateShape(); - static Point2 getOrGateConnectionLocation(bool isInput, std::size_t idx); + static Point2 getOrGateConnectionLocation(bool isInput, size_t idx); static String getOrGateShape(); }; \ No newline at end of file diff --git a/plugins/music/src/midi/MetaMidiEvent.h b/plugins/music/src/midi/MetaMidiEvent.h index 0eed5a6..7567462 100644 --- a/plugins/music/src/midi/MetaMidiEvent.h +++ b/plugins/music/src/midi/MetaMidiEvent.h @@ -2,7 +2,7 @@ #include "MidiEvent.h" #include "MidiElements.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" class MetaMidiEvent : public MidiEvent diff --git a/plugins/music/src/midi/MidiDocument.h b/plugins/music/src/midi/MidiDocument.h index e9835e6..d7c3ed2 100644 --- a/plugins/music/src/midi/MidiDocument.h +++ b/plugins/music/src/midi/MidiDocument.h @@ -1,7 +1,7 @@ #pragma once #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include "MidiElements.h" diff --git a/plugins/music/src/midi/MidiEvent.h b/plugins/music/src/midi/MidiEvent.h index d36e460..80f8d2f 100644 --- a/plugins/music/src/midi/MidiEvent.h +++ b/plugins/music/src/midi/MidiEvent.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class MidiEvent { diff --git a/plugins/music/src/midi/MidiTrack.cpp b/plugins/music/src/midi/MidiTrack.cpp index fc3e3ab..61dec89 100644 --- a/plugins/music/src/midi/MidiTrack.cpp +++ b/plugins/music/src/midi/MidiTrack.cpp @@ -17,12 +17,12 @@ void MidiTrack::AddEvent(MidiEventPtr event) mEvents.push_back(std::move(event)); } -MidiEvent* MidiTrack::GetEvent(std::size_t idx) const +MidiEvent* MidiTrack::GetEvent(size_t idx) const { return mEvents[idx].get(); } -std::size_t MidiTrack::GetNumEvents() +size_t MidiTrack::GetNumEvents() { return mEvents.size(); } diff --git a/plugins/music/src/midi/MidiTrack.h b/plugins/music/src/midi/MidiTrack.h index f9f5963..ba58b56 100644 --- a/plugins/music/src/midi/MidiTrack.h +++ b/plugins/music/src/midi/MidiTrack.h @@ -1,7 +1,7 @@ #pragma once #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include "MidiEvent.h" @@ -18,9 +18,9 @@ public: void AddEvent(MidiEventPtr event); - MidiEvent* GetEvent(std::size_t idx) const; + MidiEvent* GetEvent(size_t idx) const; - std::size_t GetNumEvents(); + size_t GetNumEvents(); String Serialize() const; diff --git a/plugins/quantum_computing/src/QuantumCircuit.cpp b/plugins/quantum_computing/src/QuantumCircuit.cpp index b025f37..c39f1d9 100644 --- a/plugins/quantum_computing/src/QuantumCircuit.cpp +++ b/plugins/quantum_computing/src/QuantumCircuit.cpp @@ -94,7 +94,7 @@ void QuantumCircuit::buildWireConnections() { if (wire->getOutput() == gate) { - for (std::size_t idx = 0; idx < gate->getNumInputs(); idx++) + for (size_t idx = 0; idx < gate->getNumInputs(); idx++) { if (gate->getInput(idx) == nullptr) { @@ -107,7 +107,7 @@ void QuantumCircuit::buildWireConnections() if (wire->getInput() == gate) { - for (std::size_t idx = 0; idx < gate->getNumOutputs(); idx++) + for (size_t idx = 0; idx < gate->getNumOutputs(); idx++) { if (gate->getOutput(idx) == nullptr) { diff --git a/plugins/quantum_computing/src/QuantumCircuitReader.cpp b/plugins/quantum_computing/src/QuantumCircuitReader.cpp index cef516a..cc5c6cd 100644 --- a/plugins/quantum_computing/src/QuantumCircuitReader.cpp +++ b/plugins/quantum_computing/src/QuantumCircuitReader.cpp @@ -21,7 +21,7 @@ Ptr QuantumCircuitReader::read(const String& content) auto circuit = std::make_unique(); mWorkingCircuit = circuit.get(); - std::size_t cursor = 0; + size_t cursor = 0; for (const auto& line : StringUtils::toLines(content)) { onLine(line, cursor); @@ -31,10 +31,10 @@ Ptr QuantumCircuitReader::read(const String& content) return circuit; } -void QuantumCircuitReader::onLine(const String& line, std::size_t jdx) +void QuantumCircuitReader::onLine(const String& line, size_t jdx) { mWorkingString.clear(); - std::size_t cursor = 0; + size_t cursor = 0; while (cursor < line.size()) { @@ -157,9 +157,9 @@ void QuantumCircuitReader::onKet(Location, const String value) mWorkingCircuit->addInputTerminal(std::move(input_terminal)); } -std::size_t QuantumCircuitReader::getWireEnd(const String& segment) +size_t QuantumCircuitReader::getWireEnd(const String& segment) { - std::size_t idx = 0; + size_t idx = 0; for (const auto c : segment) { if (c != '-') diff --git a/plugins/quantum_computing/src/QuantumCircuitReader.h b/plugins/quantum_computing/src/QuantumCircuitReader.h index 3e1c786..576204c 100644 --- a/plugins/quantum_computing/src/QuantumCircuitReader.h +++ b/plugins/quantum_computing/src/QuantumCircuitReader.h @@ -16,15 +16,15 @@ public: Ptr read(const String& content); private: - using Location = std::pair; + using Location = std::pair; - void onLine(const String& line, std::size_t jdx); + void onLine(const String& line, size_t jdx); String checkForKet(const String& segment); String checkForGate(const String& segment); - std::size_t getWireEnd(const String& segment); + size_t getWireEnd(const String& segment); void onGate(Location loc, const String value); diff --git a/plugins/quantum_computing/src/Qubit.cpp b/plugins/quantum_computing/src/Qubit.cpp index 49603d8..1e58b6f 100644 --- a/plugins/quantum_computing/src/Qubit.cpp +++ b/plugins/quantum_computing/src/Qubit.cpp @@ -29,7 +29,7 @@ bool Qubit::isIn1State() const return mBeta.getReal() == 1.0 && mAlpha.getMagnitude() == 0.0; } -String Qubit::toString(std::size_t precision) const +String Qubit::toString(size_t precision) const { Stringstream sstr; sstr.precision(precision); diff --git a/plugins/quantum_computing/src/Qubit.h b/plugins/quantum_computing/src/Qubit.h index 4223214..bf74e25 100644 --- a/plugins/quantum_computing/src/Qubit.h +++ b/plugins/quantum_computing/src/Qubit.h @@ -17,7 +17,7 @@ public: bool isIn1State() const; - String toString(std::size_t precision=3) const; + String toString(size_t precision=3) const; private: ComplexNumber mAlpha; ComplexNumber mBeta; diff --git a/plugins/quantum_computing/src/circuit_elements/QuantumCircuitElement.h b/plugins/quantum_computing/src/circuit_elements/QuantumCircuitElement.h index bd8bc13..e0b55cf 100644 --- a/plugins/quantum_computing/src/circuit_elements/QuantumCircuitElement.h +++ b/plugins/quantum_computing/src/circuit_elements/QuantumCircuitElement.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class QuantumCircuitElement { diff --git a/plugins/quantum_computing/src/circuit_elements/QuantumGate.cpp b/plugins/quantum_computing/src/circuit_elements/QuantumGate.cpp index 47a2fcb..156f0b7 100644 --- a/plugins/quantum_computing/src/circuit_elements/QuantumGate.cpp +++ b/plugins/quantum_computing/src/circuit_elements/QuantumGate.cpp @@ -1,6 +1,6 @@ #include "QuantumGate.h" -NInMOutQuantumGate::NInMOutQuantumGate(std::size_t numIn, std::size_t numOut, Vector inputs, Vector outputs) +NInMOutQuantumGate::NInMOutQuantumGate(size_t numIn, size_t numOut, Vector inputs, Vector outputs) : QuantumGate(), mNumIn(numIn), mNumOut(numOut) @@ -24,17 +24,17 @@ NInMOutQuantumGate::NInMOutQuantumGate(std::size_t numIn, std::size_t numOut, Ve } } -std::size_t NInMOutQuantumGate::getNumInputs() const +size_t NInMOutQuantumGate::getNumInputs() const { return mNumIn; } -std::size_t NInMOutQuantumGate::getNumOutputs() const +size_t NInMOutQuantumGate::getNumOutputs() const { return mNumOut; } -AbstractQuantumWire* NInMOutQuantumGate::getInput(std::size_t idx) const +AbstractQuantumWire* NInMOutQuantumGate::getInput(size_t idx) const { if (idx < mNumIn) { @@ -46,7 +46,7 @@ AbstractQuantumWire* NInMOutQuantumGate::getInput(std::size_t idx) const } } -AbstractQuantumWire* NInMOutQuantumGate::getOutput(std::size_t idx) const +AbstractQuantumWire* NInMOutQuantumGate::getOutput(size_t idx) const { if (idx < mNumOut) { @@ -58,7 +58,7 @@ AbstractQuantumWire* NInMOutQuantumGate::getOutput(std::size_t idx) const } } -void NInMOutQuantumGate::setAtInput(std::size_t idx, AbstractQuantumWire* value) +void NInMOutQuantumGate::setAtInput(size_t idx, AbstractQuantumWire* value) { if (idx < mInputs.size()) { @@ -66,7 +66,7 @@ void NInMOutQuantumGate::setAtInput(std::size_t idx, AbstractQuantumWire* value) } } -void NInMOutQuantumGate::setAtOutput(std::size_t idx, AbstractQuantumWire* value) +void NInMOutQuantumGate::setAtOutput(size_t idx, AbstractQuantumWire* value) { if (idx < mOutputs.size()) { diff --git a/plugins/quantum_computing/src/circuit_elements/QuantumGate.h b/plugins/quantum_computing/src/circuit_elements/QuantumGate.h index 36570f5..2e73e32 100644 --- a/plugins/quantum_computing/src/circuit_elements/QuantumGate.h +++ b/plugins/quantum_computing/src/circuit_elements/QuantumGate.h @@ -20,17 +20,17 @@ public: }; virtual ~QuantumGate() = default; - virtual std::size_t getNumInputs() const = 0; + virtual size_t getNumInputs() const = 0; - virtual std::size_t getNumOutputs() const = 0; + virtual size_t getNumOutputs() const = 0; - virtual AbstractQuantumWire* getInput(std::size_t idx) const = 0; + virtual AbstractQuantumWire* getInput(size_t idx) const = 0; - virtual AbstractQuantumWire* getOutput(std::size_t idx) const = 0; + virtual AbstractQuantumWire* getOutput(size_t idx) const = 0; - virtual void setAtInput(std::size_t idx, AbstractQuantumWire* value) = 0; + virtual void setAtInput(size_t idx, AbstractQuantumWire* value) = 0; - virtual void setAtOutput(std::size_t idx, AbstractQuantumWire* value) = 0; + virtual void setAtOutput(size_t idx, AbstractQuantumWire* value) = 0; virtual GateType getGateType() const = 0; @@ -45,21 +45,21 @@ using QuantumGatePtr = Ptr; class NInMOutQuantumGate : public QuantumGate { public: - NInMOutQuantumGate(std::size_t numIn, std::size_t numOut, Vector inputs = {}, Vector outputs = {}); + NInMOutQuantumGate(size_t numIn, size_t numOut, Vector inputs = {}, Vector outputs = {}); virtual ~NInMOutQuantumGate() = default; - std::size_t getNumInputs() const override; + size_t getNumInputs() const override; - std::size_t getNumOutputs() const override; + size_t getNumOutputs() const override; - AbstractQuantumWire* getInput(std::size_t idx) const override; + AbstractQuantumWire* getInput(size_t idx) const override; - AbstractQuantumWire* getOutput(std::size_t idx) const override; + AbstractQuantumWire* getOutput(size_t idx) const override; - void setAtInput(std::size_t idx, AbstractQuantumWire* value) override; + void setAtInput(size_t idx, AbstractQuantumWire* value) override; - void setAtOutput(std::size_t idx, AbstractQuantumWire* value) override; + void setAtOutput(size_t idx, AbstractQuantumWire* value) override; bool isFullyConnected() const override { @@ -82,8 +82,8 @@ public: } private: - std::size_t mNumIn{ 1 }; - std::size_t mNumOut{ 1 }; + size_t mNumIn{ 1 }; + size_t mNumOut{ 1 }; Vector mInputs; Vector mOutputs; diff --git a/plugins/quantum_computing/src/circuit_elements/QuantumTerminal.h b/plugins/quantum_computing/src/circuit_elements/QuantumTerminal.h index a8e6707..1111926 100644 --- a/plugins/quantum_computing/src/circuit_elements/QuantumTerminal.h +++ b/plugins/quantum_computing/src/circuit_elements/QuantumTerminal.h @@ -4,7 +4,7 @@ #include "Qubit.h" #include "String.h" -#include "Memory.h" +#include "Pointer.h" class QuantumWire; diff --git a/plugins/quantum_computing/src/visuals/BlochSphereNode.h b/plugins/quantum_computing/src/visuals/BlochSphereNode.h index 140aae4..00f0aa9 100644 --- a/plugins/quantum_computing/src/visuals/BlochSphereNode.h +++ b/plugins/quantum_computing/src/visuals/BlochSphereNode.h @@ -2,7 +2,7 @@ #include "AbstractVisualNode.h" -#include "Memory.h" +#include "Pointer.h" class BlochSphere; class CircleNode; diff --git a/plugins/quantum_computing/src/visuals/QuantumCircuitNode.cpp b/plugins/quantum_computing/src/visuals/QuantumCircuitNode.cpp index 9d6fcc1..7e0f1d2 100644 --- a/plugins/quantum_computing/src/visuals/QuantumCircuitNode.cpp +++ b/plugins/quantum_computing/src/visuals/QuantumCircuitNode.cpp @@ -45,12 +45,12 @@ void QuantumCircuitNode::buildWireConnections() for (auto gate : mContent->getLogicGates()) { - for (std::size_t idx = 0; idx < gate->getNumInputs(); idx++) + for (size_t idx = 0; idx < gate->getNumInputs(); idx++) { mWireInputConnections[gate->getInput(idx)] = gate; } - for (std::size_t idx = 0; idx < gate->getNumOutputs(); idx++) + for (size_t idx = 0; idx < gate->getNumOutputs(); idx++) { mWireOutputConnections[gate->getOutput(idx)] = gate; } diff --git a/plugins/quantum_computing/src/visuals/QuantumCircuitNode.h b/plugins/quantum_computing/src/visuals/QuantumCircuitNode.h index be9baef..ef61314 100644 --- a/plugins/quantum_computing/src/visuals/QuantumCircuitNode.h +++ b/plugins/quantum_computing/src/visuals/QuantumCircuitNode.h @@ -2,7 +2,7 @@ #include "AbstractVisualNode.h" -#include +#include Map.h class QuantumCircuit; class QuantumCircuitElement; @@ -34,8 +34,8 @@ private: Vector > mGateNodes; Vector > mWireNodes; - std::unordered_map mWireInputConnections; - std::unordered_map mWireOutputConnections; + Map mWireInputConnections; + Map mWireOutputConnections; - std::unordered_map mNodesForContent; + Map mNodesForContent; }; \ No newline at end of file diff --git a/plugins/quantum_computing/src/visuals/QuantumGateNode.cpp b/plugins/quantum_computing/src/visuals/QuantumGateNode.cpp index c47dcba..b58b9f3 100644 --- a/plugins/quantum_computing/src/visuals/QuantumGateNode.cpp +++ b/plugins/quantum_computing/src/visuals/QuantumGateNode.cpp @@ -75,9 +75,9 @@ void QuantumGateNode::createOrUpdateGeometry(SceneInfo*) Point2 QuantumGateNode::getConnectionLocation(AbstractQuantumWire* wire) const { bool is_input{ false }; - //std::size_t connection_id{ 0 }; + //size_t connection_id{ 0 }; - for (std::size_t idx = 0; idx < mContent->getNumInputs(); idx++) + for (size_t idx = 0; idx < mContent->getNumInputs(); idx++) { if (mContent->getInput(idx) == wire) { @@ -87,7 +87,7 @@ Point2 QuantumGateNode::getConnectionLocation(AbstractQuantumWire* wire) const } } - for (std::size_t idx = 0; idx < mContent->getNumOutputs(); idx++) + for (size_t idx = 0; idx < mContent->getNumOutputs(); idx++) { if (mContent->getOutput(idx) == wire) { diff --git a/src/base/compiler/template_engine/TemplateFile.cpp b/src/base/compiler/template_engine/TemplateFile.cpp index 0a6073a..40cdb32 100644 --- a/src/base/compiler/template_engine/TemplateFile.cpp +++ b/src/base/compiler/template_engine/TemplateFile.cpp @@ -73,7 +73,7 @@ void TemplateFile::onTextSpanFinished() mWorkingLineContent.clear(); } -std::size_t TemplateFile::checkForStatement(const String& lineSection) +size_t TemplateFile::checkForStatement(const String& lineSection) { if (lineSection.empty()) { @@ -81,7 +81,7 @@ std::size_t TemplateFile::checkForStatement(const String& lineSection) } Vector hits; - std::size_t hit_size{0}; + size_t hit_size{0}; if (Lexer::matchPattern("{%@%}", lineSection, '@', hits)) { if (hits.size() == 1) @@ -97,7 +97,7 @@ std::size_t TemplateFile::checkForStatement(const String& lineSection) return hit_size; } -std::size_t TemplateFile::checkForExpression(const String& lineSection) +size_t TemplateFile::checkForExpression(const String& lineSection) { if (lineSection.empty()) { @@ -105,7 +105,7 @@ std::size_t TemplateFile::checkForExpression(const String& lineSection) } Vector hits; - std::size_t hit_size{0}; + size_t hit_size{0}; if (Lexer::matchPattern("{{@}}", lineSection, '@', hits)) { if (hits.size() == 1) @@ -123,7 +123,7 @@ std::size_t TemplateFile::checkForExpression(const String& lineSection) void TemplateFile::processLine(const String& line) { - std::size_t line_position = 0; + size_t line_position = 0; mWorkingLineContent.clear(); while(line_position < line.size()) { diff --git a/src/base/compiler/template_engine/TemplateFile.h b/src/base/compiler/template_engine/TemplateFile.h index 15a009c..184f0d7 100644 --- a/src/base/compiler/template_engine/TemplateFile.h +++ b/src/base/compiler/template_engine/TemplateFile.h @@ -27,9 +27,9 @@ public: void loadContent(); private: - std::size_t checkForStatement(const String& lineSection); + size_t checkForStatement(const String& lineSection); - std::size_t checkForExpression(const String& lineSection); + size_t checkForExpression(const String& lineSection); void onTextSpanFinished(); diff --git a/src/base/compiler/template_engine/TemplateNode.cpp b/src/base/compiler/template_engine/TemplateNode.cpp index 20f8c82..d97a09a 100644 --- a/src/base/compiler/template_engine/TemplateNode.cpp +++ b/src/base/compiler/template_engine/TemplateNode.cpp @@ -18,7 +18,7 @@ void TemplateNode::addChild(Ptr child) mChildren.push_back(std::move(child)); } -std::size_t TemplateNode::getNumChildren() const +size_t TemplateNode::getNumChildren() const { return mChildren.size(); } @@ -55,7 +55,7 @@ String TemplateNode::getIdentifier() const return {}; } -TemplateNode* TemplateNode::getChild(std::size_t index) const +TemplateNode* TemplateNode::getChild(size_t index) const { return mChildren[index].get(); } diff --git a/src/base/compiler/template_engine/TemplateNode.h b/src/base/compiler/template_engine/TemplateNode.h index 0693ad4..6a9b14e 100644 --- a/src/base/compiler/template_engine/TemplateNode.h +++ b/src/base/compiler/template_engine/TemplateNode.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include "Vector.h" @@ -24,13 +24,13 @@ public: virtual void addChild(Ptr child); - TemplateNode* getChild(std::size_t index) const; + TemplateNode* getChild(size_t index) const; TemplateNode* getFirstChildShallow(Type type, const String& identifier = {}) const; virtual String getIdentifier() const; - std::size_t getNumChildren() const; + size_t getNumChildren() const; TemplateNode* getParent() const; diff --git a/src/base/compiler/template_engine/TemplateSubstitutionContext.h b/src/base/compiler/template_engine/TemplateSubstitutionContext.h index ef137fe..d68fec5 100644 --- a/src/base/compiler/template_engine/TemplateSubstitutionContext.h +++ b/src/base/compiler/template_engine/TemplateSubstitutionContext.h @@ -1,7 +1,7 @@ #pragma once #include "String.h" -#include +#include Map.h class TemplateSubstitutionContext { @@ -31,5 +31,5 @@ public: } private: - std::unordered_map mSubstitutions; + Map mSubstitutions; }; diff --git a/src/base/compiler/template_engine/TemplatingEngine.h b/src/base/compiler/template_engine/TemplatingEngine.h index 0398414..091fbe3 100644 --- a/src/base/compiler/template_engine/TemplatingEngine.h +++ b/src/base/compiler/template_engine/TemplatingEngine.h @@ -5,8 +5,8 @@ #include "Vector.h" #include "String.h" -#include "Memory.h" -#include +#include "Pointer.h" +#include Map.h class TemplateSubstitutionContext; @@ -24,7 +24,7 @@ private: void loadTemplateFiles(); void processTemplate(TemplateFile* file, TemplateNode* parent = nullptr); - std::unordered_map > mTemplateFiles; + Map > mTemplateFiles; Path mWorkingDirectory; String mTemplateExtension{ ".html" }; }; diff --git a/src/base/compression/CyclicRedundancyChecker.cpp b/src/base/compression/CyclicRedundancyChecker.cpp index f73abfc..bf51244 100644 --- a/src/base/compression/CyclicRedundancyChecker.cpp +++ b/src/base/compression/CyclicRedundancyChecker.cpp @@ -4,7 +4,7 @@ void CyclicRedundancyChecker::createTable() { mTable = Vector(TABLE_SIZE, 0); unsigned long c{0}; - for (std::size_t n = 0; n < TABLE_SIZE; n++) + for (size_t n = 0; n < TABLE_SIZE; n++) { c = (unsigned long) n; for (int k = 0; k < 8; k++) diff --git a/src/base/compression/CyclicRedundancyChecker.h b/src/base/compression/CyclicRedundancyChecker.h index 9f0ec5a..9aa4446 100644 --- a/src/base/compression/CyclicRedundancyChecker.h +++ b/src/base/compression/CyclicRedundancyChecker.h @@ -19,6 +19,6 @@ private: uint32_t mLastValue{0xffffffffL}; - static const std::size_t TABLE_SIZE{ 256 }; + static const size_t TABLE_SIZE{ 256 }; Vector mTable; }; diff --git a/src/base/compression/Lz77Encoder.h b/src/base/compression/Lz77Encoder.h index fb5c6b4..e0555d7 100644 --- a/src/base/compression/Lz77Encoder.h +++ b/src/base/compression/Lz77Encoder.h @@ -6,7 +6,7 @@ #include "String.h" #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" #include class PrefixCodeGenerator; diff --git a/src/base/compression/ZlibEncoder.h b/src/base/compression/ZlibEncoder.h index f8a8642..bc1eab4 100644 --- a/src/base/compression/ZlibEncoder.h +++ b/src/base/compression/ZlibEncoder.h @@ -4,7 +4,7 @@ #include "DeflateElements.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class AbstractChecksumCalculator; diff --git a/src/base/compression/deflate/DeflateBlock.h b/src/base/compression/deflate/DeflateBlock.h index 4872f22..0573b0b 100644 --- a/src/base/compression/deflate/DeflateBlock.h +++ b/src/base/compression/deflate/DeflateBlock.h @@ -5,7 +5,7 @@ #include "BitStream.h" -#include "Memory.h" +#include "Pointer.h" class AbstractChecksumCalculator; diff --git a/src/base/compression/deflate/DeflateEncoder.h b/src/base/compression/deflate/DeflateEncoder.h index 4e750e4..eb5164f 100644 --- a/src/base/compression/deflate/DeflateEncoder.h +++ b/src/base/compression/deflate/DeflateEncoder.h @@ -4,7 +4,7 @@ #include "DeflateElements.h" #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" class DeflateBlock; diff --git a/src/base/compression/huffman/HuffmanCodeLengthTable.cpp b/src/base/compression/huffman/HuffmanCodeLengthTable.cpp index 35d0c03..ad8f8a6 100644 --- a/src/base/compression/huffman/HuffmanCodeLengthTable.cpp +++ b/src/base/compression/huffman/HuffmanCodeLengthTable.cpp @@ -25,15 +25,15 @@ void HuffmanCodeLengthTable::buildCompressedLengthSequence() const auto count = entry.second; if (count < 3) { - for(std::size_t idx=0; idx(19, 0); + mCompressedLengthCounts = Vector(19, 0); for (const auto& entry : mCompressedLengthSequence) { mCompressedLengthCounts[entry.first]++; @@ -89,7 +89,7 @@ const Vector& HuffmanCodeLength return mCompressedLengthSequence; } -const Vector HuffmanCodeLengthTable::getCompressedLengthCounts() const +const Vector HuffmanCodeLengthTable::getCompressedLengthCounts() const { return mCompressedLengthCounts; } @@ -106,7 +106,7 @@ bool HuffmanCodeLengthTable::readNextSymbol(unsigned& result, BitStream* stream) return false; } - std::size_t working_index{0}; + size_t working_index{0}; auto length = getCodeLength(working_index); auto delta = length; @@ -181,7 +181,7 @@ void HuffmanCodeLengthTable::buildPrefixCodes() next_code[bits] = code; } - for(std::size_t idx=0; idx= DEFLATE_PERMUTATION_SIZE) { @@ -218,17 +218,17 @@ std::size_t HuffmanCodeLengthTable::mapToDeflateIndex(std::size_t index) const } } -std::size_t HuffmanCodeLengthTable::getNumCodeLengths() const +size_t HuffmanCodeLengthTable::getNumCodeLengths() const { return mTree.getNumCodeLengths(); } -std::optional HuffmanCodeLengthTable::findMatch(std::size_t treeIndex, uint32_t code) const +std::optional HuffmanCodeLengthTable::findMatch(size_t treeIndex, uint32_t code) const { return mTree.findMatch(treeIndex, code); } -unsigned HuffmanCodeLengthTable::getCodeLength(std::size_t index) const +unsigned HuffmanCodeLengthTable::getCodeLength(size_t index) const { return mTree.getCodeLength(index); } @@ -240,7 +240,7 @@ void HuffmanCodeLengthTable::setInputLengthSequence(const Vector& if (targetDeflate) { mInputLengthSequence = Vector(DEFLATE_PERMUTATION_SIZE, 0); - for(std::size_t idx=0; idx(sequence[idx]) << std::endl; diff --git a/src/base/compression/huffman/HuffmanCodeLengthTable.h b/src/base/compression/huffman/HuffmanCodeLengthTable.h index f1d9f00..6125919 100644 --- a/src/base/compression/huffman/HuffmanCodeLengthTable.h +++ b/src/base/compression/huffman/HuffmanCodeLengthTable.h @@ -17,24 +17,24 @@ public: String dumpPrefixCodes() const; - std::optional findMatch(std::size_t treeIndex, uint32_t code) const; + std::optional findMatch(size_t treeIndex, uint32_t code) const; const HuffmanTree& getTree() const; - const PrefixCode& getCode(std::size_t index) const; + const PrefixCode& getCode(size_t index) const; std::optional getCodeForSymbol(unsigned symbol) const; using CompressedSequenceEntry = std::pair; const Vector& getCompressedLengthSequence() const; - const Vector getCompressedLengthCounts() const; + const Vector getCompressedLengthCounts() const; - std::size_t getNumCodeLengths() const; + size_t getNumCodeLengths() const; - unsigned getCodeLength(std::size_t treeIndex) const; + unsigned getCodeLength(size_t treeIndex) const; - std::size_t mapToDeflateIndex(std::size_t index) const; + size_t mapToDeflateIndex(size_t index) const; void setInputLengthSequence(const Vector& sequence, bool targetDeflate = true); @@ -49,7 +49,7 @@ private: Vector mCodes; Vector mCompressedLengthSequence; - Vector mCompressedLengthCounts; + Vector mCompressedLengthCounts; static constexpr unsigned DEFLATE_PERMUTATION_SIZE{19}; static constexpr unsigned DEFLATE_PERMUTATION[DEFLATE_PERMUTATION_SIZE]{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; diff --git a/src/base/compression/huffman/HuffmanEncoder.cpp b/src/base/compression/huffman/HuffmanEncoder.cpp index a0906b3..0e89e78 100644 --- a/src/base/compression/huffman/HuffmanEncoder.cpp +++ b/src/base/compression/huffman/HuffmanEncoder.cpp @@ -4,7 +4,7 @@ #include "HuffmanFixedCodes.h" -#include +#include Map.h #include #include #include @@ -90,7 +90,7 @@ void HuffmanEncoder::encode(const Vector& counts) //std::cout << "********" << std::endl; } -void HuffmanEncoder::encode(const std::unordered_map& counts) +void HuffmanEncoder::encode(const Map& counts) { Vector just_counts; for (const auto& data: counts) diff --git a/src/base/compression/huffman/HuffmanEncoder.h b/src/base/compression/huffman/HuffmanEncoder.h index e4e4e6c..a18bd9a 100644 --- a/src/base/compression/huffman/HuffmanEncoder.h +++ b/src/base/compression/huffman/HuffmanEncoder.h @@ -7,7 +7,7 @@ #include "Vector.h" #include -#include +#include Map.h class PrefixCodeGenerator { @@ -27,7 +27,7 @@ class HuffmanEncoder : public PrefixCodeGenerator public: void encode(const Vector& counts); - void encode(const std::unordered_map& counts); + void encode(const Map& counts); uint32_t getLengthValue(unsigned length); diff --git a/src/base/compression/huffman/HuffmanStream.cpp b/src/base/compression/huffman/HuffmanStream.cpp index 9579549..0870c56 100644 --- a/src/base/compression/huffman/HuffmanStream.cpp +++ b/src/base/compression/huffman/HuffmanStream.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include Map.h #include Vector DISTANCE_OFFSETS @@ -172,7 +172,7 @@ void HuffmanStream::readCodeLengths() void HuffmanStream::copyFromBuffer(unsigned length, unsigned distance) { - std::size_t offset = mBuffer.size() - 1 - distance; + size_t offset = mBuffer.size() - 1 - distance; for(unsigned idx=0; idx HuffmanTree::findMatch(std::size_t treeIndex, uint32_t code) const +std::optional HuffmanTree::findMatch(size_t treeIndex, uint32_t code) const { const auto& legth_data = mTable[treeIndex]; for(const auto& entry : legth_data.second) @@ -96,12 +96,12 @@ std::optional HuffmanTree::getCode(Symbol symbol) const return std::nullopt; } -std::size_t HuffmanTree::getNumCodeLengths() const +size_t HuffmanTree::getNumCodeLengths() const { return mTable.size(); } -unsigned HuffmanTree::getCodeLength(std::size_t idx) const +unsigned HuffmanTree::getCodeLength(size_t idx) const { return mTable[idx].first; } diff --git a/src/base/compression/huffman/HuffmanTree.h b/src/base/compression/huffman/HuffmanTree.h index acd2682..700395e 100644 --- a/src/base/compression/huffman/HuffmanTree.h +++ b/src/base/compression/huffman/HuffmanTree.h @@ -41,11 +41,11 @@ public: String dump(bool bitsAsRightToLeft = true) const; - std::optional findMatch(std::size_t treeIndex, uint32_t code) const; + std::optional findMatch(size_t treeIndex, uint32_t code) const; - std::size_t getNumCodeLengths() const; + size_t getNumCodeLengths() const; - unsigned getCodeLength(std::size_t idx) const; + unsigned getCodeLength(size_t idx) const; std::optional getCode(Symbol symbol) const; diff --git a/src/base/core/base_types/Color.cpp b/src/base/core/base_types/Color.cpp index 29b3cd7..d760b32 100644 --- a/src/base/core/base_types/Color.cpp +++ b/src/base/core/base_types/Color.cpp @@ -34,17 +34,17 @@ Ptr Color::Create(unsigned char r, unsigned char g, unsigned char b, doub return std::make_unique(r, g, b, a); } -std::size_t Color::getSize() const +size_t Color::getSize() const { return getSize(mFormat, mBitDepth); } -std::size_t Color::getSize(Format format, unsigned bitDepth) +size_t Color::getSize(Format format, unsigned bitDepth) { return getNumChannels(format) * bitDepth / 8; } -std::size_t Color::getNumChannels(Format format) +size_t Color::getNumChannels(Format format) { if (format == Format::GRAYSCALE || format == Format::LUT) { @@ -56,7 +56,7 @@ std::size_t Color::getNumChannels(Format format) } } -uint8_t Color::getByte(std::size_t index) const +uint8_t Color::getByte(size_t index) const { if (mFormat == Format::GRAYSCALE || mFormat == Format::LUT) { diff --git a/src/base/core/base_types/Color.h b/src/base/core/base_types/Color.h index fd116d3..7a5fbab 100644 --- a/src/base/core/base_types/Color.h +++ b/src/base/core/base_types/Color.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" #include "String.h" #include @@ -35,13 +35,13 @@ public: String toString() const; - std::size_t getSize() const; + size_t getSize() const; - static std::size_t getNumChannels(Format format); + static size_t getNumChannels(Format format); - static std::size_t getSize(Format format, unsigned bitDepth); + static size_t getSize(Format format, unsigned bitDepth); - uint8_t getByte(std::size_t index) const; + uint8_t getByte(size_t index) const; void setAlpha(float alpha); diff --git a/src/base/core/base_types/Index.cpp b/src/base/core/base_types/Index.cpp index 0a62876..fad50ac 100644 --- a/src/base/core/base_types/Index.cpp +++ b/src/base/core/base_types/Index.cpp @@ -1,6 +1,6 @@ #include "Index.h" -Index::Index(std::size_t value) +Index::Index(size_t value) : m_value(value), m_valid(true) { @@ -11,7 +11,7 @@ bool Index::valid() const return m_valid; } -std::size_t Index::value() const +size_t Index::value() const { return m_value; } \ No newline at end of file diff --git a/src/base/core/base_types/Index.h b/src/base/core/base_types/Index.h index 2e46485..f6b8f58 100644 --- a/src/base/core/base_types/Index.h +++ b/src/base/core/base_types/Index.h @@ -7,13 +7,13 @@ class Index public: Index() = default; - Index(std::size_t value); + Index(size_t value); bool valid() const; - std::size_t value() const; + size_t value() const; private: - std::size_t m_value{0}; + size_t m_value{0}; bool m_valid{false}; }; \ No newline at end of file diff --git a/src/base/core/data_structures/CircleBuffer.h b/src/base/core/data_structures/CircleBuffer.h index 30612da..bcab357 100644 --- a/src/base/core/data_structures/CircleBuffer.h +++ b/src/base/core/data_structures/CircleBuffer.h @@ -6,7 +6,7 @@ template class CircleBuffer { public: - CircleBuffer(std::size_t size) + CircleBuffer(size_t size) : mData(size) { @@ -33,12 +33,12 @@ public: } } - std::size_t getNumItems() const + size_t getNumItems() const { return mEndPointer; } - const T& getItem(std::size_t index) const + const T& getItem(size_t index) const { if (mEndPointer < mData.size()) { @@ -56,7 +56,7 @@ public: } private: - std::size_t mStartPointer{0}; - std::size_t mEndPointer{0}; + size_t mStartPointer{0}; + size_t mEndPointer{0}; Vector mData; }; diff --git a/src/base/core/data_structures/Dictionary.cpp b/src/base/core/data_structures/Dictionary.cpp index 916f640..269d814 100644 --- a/src/base/core/data_structures/Dictionary.cpp +++ b/src/base/core/data_structures/Dictionary.cpp @@ -7,12 +7,12 @@ bool Dictionary::hasKey(const String& key) const bool Dictionary::hasStringKey(const String& key) const { - return mStringData.count(key) > 0; + return mStringData.has_key(key); } bool Dictionary::hasDictKey(const String& key) const { - return mDictData.count(key) > 0; + return mDictData.has_key(key); } Vector Dictionary::getStringKeys() const @@ -20,7 +20,7 @@ Vector Dictionary::getStringKeys() const Vector keys; for (const auto& item : mStringData) { - keys.push_back(item.first); + keys.push_back(item.key()); } return keys; } @@ -30,27 +30,28 @@ Vector Dictionary::getDictKeys() const Vector keys; for (const auto& item : mDictData) { - keys.push_back(item.first); + keys.push_back(item.key()); } return keys; } Dictionary* Dictionary::getDict(const String& key) const { - return mDictData.at(key).get(); + //return (*mDictData.find(key)).value().get(); + return nullptr; } String Dictionary::getItem(const String& key) const { - return mStringData.at(key); + return (*mStringData.find(key)).value(); } void Dictionary::addStringItem(const String& key, const String& item) { - mStringData[key] = item; + mStringData.insert(key, item); } void Dictionary::addDictItem(const String& key, Ptr dict) { - mDictData[key] = std::move(dict); + mDictData.insert(key, std::move(dict)); } diff --git a/src/base/core/data_structures/Dictionary.h b/src/base/core/data_structures/Dictionary.h index e8439d4..2a00b1c 100644 --- a/src/base/core/data_structures/Dictionary.h +++ b/src/base/core/data_structures/Dictionary.h @@ -1,8 +1,8 @@ #pragma once #include "String.h" #include "Vector.h" -#include -#include "Memory.h" +#include "Map.h" +#include "Pointer.h" class Dictionary { @@ -27,8 +27,8 @@ public: bool hasStringKey(const String& key) const; bool hasDictKey(const String& key) const; + protected: - - std::map mStringData; - std::map > mDictData; + Map mStringData; + Map > mDictData; }; diff --git a/src/base/core/data_structures/List.h b/src/base/core/data_structures/List.h index d75f846..abee3dd 100644 --- a/src/base/core/data_structures/List.h +++ b/src/base/core/data_structures/List.h @@ -1,68 +1,195 @@ #pragma once #include "Error.h" +#include "Pointer.h" #include "Vector.h" +#include "Optional.h" -class AbstractList -{ -public: - virtual ~AbstractList() = default; - - virtual std::size_t getLength() const = 0; -}; +#include template -class List : public AbstractList +class List { public: - List() = default; - - void initializeTo(std::size_t size, T value) + List(const T& item) + : m_item(item) { - mData = Vector(size, value); } - const T* getDataPtr() const + List(T&& item) + : m_item(std::move(item)) { - return mData.data(); } - const Vector& getData() const + List* next() { - return mData; + return m_next.get(); } - T getItem(std::size_t index) const + const List* next() const { - if (index < mData.size()) + return m_next.get(); + } + + const List* end() const + { + if (is_end()) { - return mData[index]; + return this; } - else + auto next_entry = next(); + while(next_entry) { - const auto msg = "Tried to access out of range index: " + std::to_string(index) + " with size " + std::to_string(mData.size()); - throw std::out_of_range(msg); + if(!next_entry->is_end()) + { + next_entry = next_entry->next(); + } + else + { + break; + } + } + return next_entry; + } + + using onItemFunc = std::function; + void forEach(onItemFunc item_func) const + { + if (is_end()) + { + return; + } + auto next_entry = next(); + while(next_entry) + { + if (!item_func(next_entry->item())) + { + return; + } + next_entry = next_entry->next(); } } - void setData(const Vector& data) + List* end() { - mData = data; - } - - void setItem(std::size_t index, T item) - { - if (index < mData.size()) + if (is_end()) { - mData[index] = item; + return this; } + auto next_entry = next(); + while(next_entry) + { + if(!next_entry->is_end()) + { + next_entry = next_entry->next(); + } + else + { + break; + } + } + return next_entry; } - std::size_t getLength() const override + const List* find(const T& item) const { - return mData.size(); + if (m_item == item) + { + return this; + } + auto next_entry = next(); + while(next_entry) + { + if (next_entry->m_item == item) + { + return next_entry; + } + next_entry = next_entry->next(); + } + return nullptr; + } + + Optional find_index(const T& item) const + { + if (item == m_item) + { + return {0}; + } + auto next_entry = next(); + size_t count = 1; + while(next_entry) + { + if (next_entry->m_item == item) + { + return {count}; + } + next_entry = next_entry->next(); + count++; + } + return {}; + } + + size_t size() const + { + auto next_entry = next(); + size_t count = 1; + while(next_entry) + { + next_entry = next_entry->next(); + count++; + } + return count; + } + + void insert(const T& item) + { + auto end_entry = end(); + end_entry->set_next(Ptr::create(item)); + } + + void insert(T&& item) + { + auto end_entry = end(); + end_entry->set_next(Ptr::create(std::move(item))); + } + + const T& item() const + { + return m_item; + } + + T& item() + { + return m_item; + } + + bool empty() const + { + return is_end(); + } + + bool is_end() const + { + return !bool(m_next); + } + + void flatten(Vector& items) const + { + items.push_back(m_item); + auto next_entry = next(); + while(next_entry) + { + items.push_back(next_entry->item()); + next_entry = next_entry->next(); + } } private: - Vector mData; + void set_next(Ptr entry) + { + m_next = std::move(entry); + } + + T m_item; + Ptr m_next; }; diff --git a/src/base/core/data_structures/Map.h b/src/base/core/data_structures/Map.h index 68e9a86..94a4d37 100644 --- a/src/base/core/data_structures/Map.h +++ b/src/base/core/data_structures/Map.h @@ -1,6 +1,363 @@ #pragma once -template +#include "String.h" +#include "List.h" +#include "Pair.h" +#include "Optional.h" + +#include +#include + +template class Map{ +public: + struct KvPair + { + KvPair() = default; + + KvPair(const K& key) + :m_key(key) + { + } + + KvPair(const K& key, const T& value) + : m_key(key), + m_value(value) + { + } + + KvPair(const K& key, T&& value) + : m_key(key), + m_value(std::move(value)) + { + } + + bool operator==(const KvPair& other) const + { + return m_key == other.m_key; + } + + const K& key() const + { + return m_key; + } + + const T& value() const + { + return m_value; + } + + T& value() + { + return m_value; + } + + K m_key; + T m_value; + }; + + Map() = default; + + void insert(const K& key, const T& value) + { + auto& map_entry = m_buffer[(hash(key))]; + if (!map_entry.is_set()) + { + map_entry.init(KvPair(key, value)); + } + else + { + map_entry.m_list->insert(KvPair(key, value)); + } + } + + void insert(const K& key, T&& value) + { + auto& map_entry = m_buffer[(hash(key))]; + if (!map_entry.is_set()) + { + map_entry.init(std::move(KvPair(key, std::move(value)))); + } + else + { + map_entry.m_list->insert(std::move(KvPair(key, std::move(value)))); + } + } + + using onItemFunc = std::function; + void forEach(onItemFunc item_func) + { + for(size_t idx=0; idx& value(const K& key) const + { + const auto& map_entry = m_buffer[(hash(key))]; + if (!map_entry.is_set()) + { + return {}; + } + KvPair search_term(key); + if (auto list_item = map_entry.find(search_term); list_item != nullptr) + { + return list_item->value(); + } + return {}; + } + + bool has_key(const K& key) const + { + const auto& map_entry = m_buffer[(hash(key))]; + if (!map_entry.is_set()) + { + return false; + } + KvPair search_term(key); + if (auto list_item = map_entry.m_list->find(search_term); list_item != nullptr) + { + return true; + } + return false; + } + + Vector items() const + { + Vector ret; + for(size_t idx=0; idxflatten(ret); + } + } + return ret; + } + + class MapIter + { + public: + MapIter(const Map* container, int index = -1) + : m_index(index), m_container(container) + { + } + + bool operator!=(const MapIter& other) const + { + return m_index != other.m_index; + } + + const KvPair& operator*() const + { + bool found{false}; + return m_container->get_item(m_index, found); + } + + void operator++() + { + m_index++; + } + + private: + int m_index{-1}; + const Map* m_container{nullptr}; + }; + + MapIter begin() const + { + if (empty()) + { + return MapIter(this, -1); + } + else + { + return MapIter(this, 0); + } + } + + MapIter end() const + { + if (empty()) + { + return MapIter(this, -1); + } + else + { + return MapIter(this, size()); + } + } + + MapIter find(const K& key) const + { + if (empty()) + { + return MapIter(this, -1); + } + size_t count{0}; + for(size_t idx=0; idxfind_index(key); + if (loc_index.is_set()) + { + return MapIter(this, count + loc_index.value()); + } + else + { + count += map_entry.m_list->size(); + } + } + } + return MapIter(this, -1); + } + + size_t size() const + { + size_t count{0}; + for(size_t kdx=0; kdxnext(); + while(next_item) + { + next_item = next_item->next(); + count++; + } + } + } + return count; + } + +private: + struct MapEntry + { + bool is_set() const + { + return bool(m_list); + } + void init(const KvPair& kv) + { + m_list = Ptr >::create(kv); + } + void init(KvPair&& kv) + { + m_list = Ptr >::create(std::move(kv)); + } + void clear() + { + m_list.reset(); + } + Ptr > m_list; + }; + + size_t hash(const K& key) const + { + size_t result{0}; + for(const auto c : key.data()) + { + result += static_cast(c); + } + return result / BUFFER_SIZE; + } + + const KvPair& get_item(size_t idx, bool& found) const + { + static KvPair s_bad_item; + + size_t count{0}; + for(size_t kdx=0; kdxitem(); + } + count++; + auto next_item = map_entry.m_list->next(); + while(next_item) + { + if (idx == count) + { + found = true; + return next_item->item(); + } + next_item = next_item->next(); + count++; + } + } + } + return s_bad_item; + } + + KvPair& get_item(size_t idx, bool& found) + { + static KvPair s_bad_item; + + size_t count{0}; + for(size_t kdx=0; kdxitem(); + } + count++; + auto next_item = map_entry.m_list->next(); + while(next_item) + { + if (idx == count) + { + found = true; + return next_item->item(); + } + next_item = next_item->next(); + count++; + } + } + } + return s_bad_item; + } + + static constexpr size_t BUFFER_SIZE{5000}; + MapEntry m_buffer[BUFFER_SIZE]; }; \ No newline at end of file diff --git a/src/base/core/data_structures/Stack.h b/src/base/core/data_structures/Stack.h new file mode 100644 index 0000000..307bb12 --- /dev/null +++ b/src/base/core/data_structures/Stack.h @@ -0,0 +1,71 @@ +#pragma once + +#include "Pointer.h" +#include "Optional.h" + +template +class Stack +{ + struct StackItem + { + StackItem(const T& value, Ptr prev) + : m_value(value), + m_previous(std::move(prev)) + { + } + + T m_value; + Ptr m_previous; + }; + +public: + + bool empty() const + { + return !bool(m_end); + } + + Optional pop() + { + if (!m_end) + { + return {}; + } + auto end_tmp = m_end->m_value; + remove_end(); + return end_tmp; + } + + T* top() + { + if (!m_end) + { + return nullptr; + } + return &(m_end->m_value); + } + + void push(const T& value) + { + //auto new_end = Ptr::create(value, std::move(m_end)); + //m_end = std::move(new_end); + } + +private: + void remove_end() + { + if (m_end) + { + if (m_end->m_previous) + { + m_end = std::move(m_end->m_previous); + } + else + { + m_end.reset(); + } + } + } + + Ptr m_end; +}; \ No newline at end of file diff --git a/src/base/core/data_structures/String.cpp b/src/base/core/data_structures/String.cpp index bb020dc..6e2cb31 100644 --- a/src/base/core/data_structures/String.cpp +++ b/src/base/core/data_structures/String.cpp @@ -8,6 +8,12 @@ String::String() m_data.push_back('\0'); } +String::String(size_t size, char c) +{ + m_data.resize(size, c); + m_data.push_back('\0'); +} + String::String(const Vector& data) { append(data); @@ -87,6 +93,20 @@ void String::append(const char* data) m_data.push_back('\0'); } +void String::eraseIf(erasePredicate func) +{ + size_t count{0}; + for(size_t idx=0; idx& String::data() const { return m_data; @@ -138,7 +158,7 @@ Pair String::rsplit(char c) const return {*this, {}}; } -bool String::slice(std::size_t idx, String& out) const +bool String::slice(size_t idx, String& out) const { if (idx >= m_data.size()) { @@ -153,7 +173,7 @@ bool String::slice(std::size_t idx, String& out) const return true; } -bool String::slice(std::size_t start, std::size_t end, String& out) const +bool String::slice(size_t start, size_t end, String& out) const { if (end >= m_data.size()) { @@ -174,7 +194,7 @@ Index String::rindex(char c) const { return {}; } - for(std::size_t idx=m_data.size()-2; idx >= 0; idx--) + for(size_t idx=m_data.size()-2; idx >= 0; idx--) { if (m_data[idx] == c) { @@ -189,7 +209,7 @@ const char* String::raw() const return m_data.data(); } -std::size_t String::size() const +size_t String::size() const { return m_data.size() - 1; } @@ -223,7 +243,7 @@ String String::to_string(size_t input) return conv; } -char String::operator[](std::size_t idx) const +char String::operator[](size_t idx) const { return m_data[idx]; } @@ -256,6 +276,16 @@ String& String::operator<<(size_t idx) return *this; } +void String::push_back(char c) +{ + if (m_data.empty()) + { + m_data.push_back('\0'); + } + m_data.push_back('\0'); + m_data[m_data.size()-2] = c; +} + String& String::operator+=(const String& str) { if (m_data.empty()) @@ -279,12 +309,7 @@ String String::operator+(const String& str) const String& String::operator+=(char c) { - if (m_data.empty()) - { - m_data.push_back('\0'); - } - m_data.push_back('\0'); - m_data[m_data.size()-2] = c; + push_back(c); return *this; } diff --git a/src/base/core/data_structures/String.h b/src/base/core/data_structures/String.h index 28e039c..b7cfe1b 100644 --- a/src/base/core/data_structures/String.h +++ b/src/base/core/data_structures/String.h @@ -5,6 +5,8 @@ #include "Index.h" #include "ByteTypes.h" +#include + class String { public: @@ -14,6 +16,8 @@ public: String(const char* data); + String(size_t size, char c); + static String fmt(const char* fmt, ...); void append(const Vector& data); @@ -22,6 +26,11 @@ public: bool empty() const; + using erasePredicate = std::function; + void eraseIf(erasePredicate func); + + void push_back(char c); + const char* raw() const; Pair rsplit(char c) const; @@ -30,15 +39,15 @@ public: void reverse(); - std::size_t size() const; + size_t size() const; - bool slice(std::size_t idx, String& out) const; + bool slice(size_t idx, String& out) const; - bool slice(std::size_t start, std::size_t end, String& out) const; + bool slice(size_t start, size_t end, String& out) const; static String to_string(size_t input); - char operator[](std::size_t idx) const; + char operator[](size_t idx) const; String& operator<<(const String& body); @@ -63,6 +72,59 @@ public: bool operator!=(const String& other) const; + + class StringIter + { + public: + StringIter(const String* container, int index = -1) + : m_index(index), m_container(container) + { + } + + bool operator!=(const StringIter& other) const + { + return m_index != other.m_index; + } + + char operator*() const + { + return (*m_container)[m_index]; + } + + void operator++() + { + m_index++; + } + + private: + int m_index{-1}; + const String* m_container{nullptr}; + }; + + StringIter begin() const + { + if (empty()) + { + return StringIter(this, -1); + } + else + { + return StringIter(this, 0); + } + } + + StringIter end() const + { + if (empty()) + { + return StringIter(this, -1); + } + else + { + return StringIter(this, size()); + } + } + private: void append(const char* data); diff --git a/src/base/core/data_structures/Vector.h b/src/base/core/data_structures/Vector.h index 8cb9199..2c1e6cd 100644 --- a/src/base/core/data_structures/Vector.h +++ b/src/base/core/data_structures/Vector.h @@ -9,7 +9,7 @@ class Vector public: Vector() = default; - Vector(std::size_t size) + Vector(size_t size) { resize(size); } @@ -44,40 +44,40 @@ public: return m_data; } - bool slice(std::size_t slice_idx, Vector& v) const + bool slice(size_t slice_idx, Vector& v) const { if (slice_idx >= m_size) { return false; } v.resize(slice_idx); - for(std::size_t idx=0; idx m_size) { return false; } v.resize(slice_end - slice_start); - for(std::size_t idx=slice_start; idx= m_capacity) { - const std::size_t new_size = 1.5*m_size; + const size_t new_size = 1.5*m_size; resize_capacity(new_size); } m_data[m_size] = item; m_size++; } - const T& operator[] (const std::size_t idx) const + void push_back(T&& item) + { + if (!has_allocated()) + { + resize_capacity(10); + } + else if (m_size >= m_capacity) + { + const size_t new_size = 1.5*m_size; + resize_capacity(new_size); + } + m_data[m_size] = std::move(item); + m_size++; + } + + const T& operator[] (const size_t idx) const { return m_data[idx]; } - T& operator[] (const std::size_t idx) + T& operator[] (const size_t idx) { return m_data[idx]; } @@ -165,7 +180,7 @@ public: Vector& operator=(const Vector& v) { resize(v.size()); - for(std::size_t idx=0; idx m_allocator; - std::size_t m_size{0}; - std::size_t m_capacity{0}; + size_t m_size{0}; + size_t m_capacity{0}; }; \ No newline at end of file diff --git a/src/base/core/encoding/ByteUtils.cpp b/src/base/core/encoding/ByteUtils.cpp index 8710031..b052a29 100644 --- a/src/base/core/encoding/ByteUtils.cpp +++ b/src/base/core/encoding/ByteUtils.cpp @@ -1,32 +1,32 @@ #include "ByteUtils.h" -bool ByteUtils::MostSignificantBitIsOne(char c) +bool ByteUtils::MostSignificantBitIsOne(Byte c) { return c & (1 << 7); } -ByteUtils::Word ByteUtils::GetWordFirstBit(const Word word) +Word ByteUtils::GetWordFirstBit(const Word word) { return word & ByteUtils::WORD_FIRST_BIT; }; -ByteUtils::Word ByteUtils::GetWordLastByte(const Word word) +Word ByteUtils::GetWordLastByte(const Word word) { return word & ByteUtils::WORD_LAST_BYTE; } -unsigned char ByteUtils::getHigherNBits(unsigned char input, unsigned num) +unsigned char ByteUtils::getHigherNBits(Byte input, size_t num) { return input >> (8 - num); } -unsigned char ByteUtils::getByteN(uint32_t input, unsigned n) +unsigned char ByteUtils::getByteN(DWord input, size_t n) { return (input << 8*n) >> 24; } -uint32_t ByteUtils::mirror(uint32_t byte, unsigned length) +uint32_t ByteUtils::mirror(DWord byte, size_t length) { uint32_t ret{0}; for(unsigned idx=0; idx> n; } -unsigned char ByteUtils::getMBitsAtN(unsigned char input, unsigned m, unsigned n) +unsigned char ByteUtils::getMBitsAtN(Byte input, size_t m, size_t n) { switch (m) { @@ -94,7 +94,7 @@ unsigned char ByteUtils::getMBitsAtN(unsigned char input, unsigned m, unsigned n } } -bool ByteUtils::getBitN(uint32_t input, unsigned n) +bool ByteUtils::getBitN(DWord input, size_t n) { return input & (1 << n); } @@ -103,7 +103,7 @@ unsigned char ByteUtils::getFromString(const String& string) { unsigned char ret{0}; - if (string.length() < 8) + if (string.size() < 8) { return ret; } @@ -118,7 +118,7 @@ unsigned char ByteUtils::getFromString(const String& string) return ret; } -String ByteUtils::toString(uint32_t input, unsigned length) +String ByteUtils::toString(DWord input, size_t length) { String ret; if (length > 8) @@ -144,7 +144,7 @@ String ByteUtils::toString(uint32_t input, unsigned length) return ret; } -void ByteUtils::ReverseBuffer(char* buffer, char* reverse, unsigned size, unsigned targetSize) +void ByteUtils::ReverseBuffer(Byte* buffer, char* reverse, size_t size, size_t targetSize) { for(unsigned idx=0; idx(buffer, reverse); } -ByteUtils::DWord ByteUtils::ToDWord(char* buffer, bool reverse) +DWord ByteUtils::ToDWord(Byte* buffer, bool reverse) { return ToType(buffer, reverse); } -ByteUtils::QWord ByteUtils::ToQWord(char* buffer, bool reverse) +QWord ByteUtils::ToQWord(Byte* buffer, bool reverse) { return ToType(buffer, reverse); } -bool ByteUtils::Compare(char* buffer, const char* tag, unsigned size) +bool ByteUtils::Compare(Byte* buffer, const char* tag, size_t size) { for(unsigned idx=0; idx class ByteUtils { @@ -13,25 +12,25 @@ public: static Word GetWordLastByte(const Word word); - static Byte getByteN(DWord input, std::size_t n); + static Byte getByteN(DWord input, size_t n); - static Byte getHigherNBits(Byte input, std::size_t num); + static Byte getHigherNBits(Byte input, size_t num); - static Byte getLowerNBits(DWord input, std::size_t num); + static Byte getLowerNBits(DWord input, size_t num); - static Byte getTwoBitsAtN(Byte input, std::size_t n); + static Byte getTwoBitsAtN(Byte input, size_t n); - static Byte getMBitsAtN(Byte input, std::size_t m, std::size_t n); + static Byte getMBitsAtN(Byte input, size_t m, size_t n); - static bool getBitN(DWord input, std::size_t n); + static bool getBitN(DWord input, size_t n); static Byte getFromString(const String& string); - static String toString(DWord input, std::size_t length = 8); + static String toString(DWord input, size_t length = 8); - static DWord mirror(DWord input, std::size_t length=0); + static DWord mirror(DWord input, size_t length=0); - static void ReverseBuffer(Byte* buffer, Byte* reverse, std::size_t size, std::size_t targetSize); + static void ReverseBuffer(Byte* buffer, char* reverse, size_t size, size_t targetSize); template static T ToType(Byte* buffer, bool reverse = true) @@ -41,11 +40,11 @@ public: { char reversed[sizeof(T)]; ReverseBuffer(buffer, reversed, sizeof(T), sizeof(T)); - std::memcpy(&result, reversed, sizeof(T)); + //std::memcpy(&result, reversed, sizeof(T)); } else { - std::memcpy(&result, buffer, sizeof(T)); + //std::memcpy(&result, buffer, sizeof(T)); } return result; } @@ -56,7 +55,7 @@ public: static QWord ToQWord(Byte* buffer, bool reverse = true); - static bool Compare(Byte* buffer, const char* tag, std::size_t size); + static bool Compare(Byte* buffer, const char* tag, size_t size); static bool CompareDWords(Byte* buffer, const char* tag); diff --git a/src/base/core/encoding/StringUtils.cpp b/src/base/core/encoding/StringUtils.cpp index c6bf8e0..de28102 100644 --- a/src/base/core/encoding/StringUtils.cpp +++ b/src/base/core/encoding/StringUtils.cpp @@ -53,7 +53,7 @@ bool StringUtils::isWhitespaceOnly(const String& input) } } -std::size_t StringUtils::countFirstConsecutiveHits(const String& input, char c) +size_t StringUtils::countFirstConsecutiveHits(const String& input, char c) { auto found_id = input.find(c); if(found_id == String::npos) @@ -62,8 +62,8 @@ std::size_t StringUtils::countFirstConsecutiveHits(const String& input, char c) } else { - std::size_t count = 1; - for(std::size_t idx=found_id+1; idx 0; idx--) + for (size_t idx = last_nonspace; idx > 0; idx--) { if (!std::isspace(input[idx])) { @@ -162,8 +162,8 @@ String StringUtils::stripQuotes(const String& input) { return input; } - std::size_t start_index = 0; - std::size_t end_index = input.size()-1; + size_t start_index = 0; + size_t end_index = input.size()-1; if (input[start_index] == '"') { start_index = 1; @@ -177,7 +177,7 @@ String StringUtils::stripQuotes(const String& input) String StringUtils::removeUpTo(const String& input, const String& prefix) { - std::size_t found = input.find(prefix); + size_t found = input.find(prefix); if (found != String::npos) { return input.substr(found + prefix.size(), input.size()-found); diff --git a/src/base/core/encoding/StringUtils.h b/src/base/core/encoding/StringUtils.h index a3e98ba..0405d03 100644 --- a/src/base/core/encoding/StringUtils.h +++ b/src/base/core/encoding/StringUtils.h @@ -18,7 +18,7 @@ public: static constexpr char SINGLE_QUOTE = '\''; static constexpr char COLON = ':'; - static std::size_t countFirstConsecutiveHits(const String& input, char c); + static size_t countFirstConsecutiveHits(const String& input, char c); static bool isAlphaNumeric(char c); diff --git a/src/base/core/encoding/UnicodeUtils.cpp b/src/base/core/encoding/UnicodeUtils.cpp index db6fbee..a132b99 100644 --- a/src/base/core/encoding/UnicodeUtils.cpp +++ b/src/base/core/encoding/UnicodeUtils.cpp @@ -6,6 +6,7 @@ #include #include +/* String UnicodeUtils::utf16ToUtf8String(const std::wstring& input) { if (input.empty()) @@ -23,7 +24,9 @@ String UnicodeUtils::utf16ToUtf8String(const std::wstring& input) throw std::logic_error("Not implemented"); #endif } +*/ +/* std::wstring UnicodeUtils::utf8ToUtf16WString(const String& input) { if (input.empty()) @@ -40,13 +43,15 @@ std::wstring UnicodeUtils::utf8ToUtf16WString(const String& input) throw std::logic_error("Not implemented"); #endif } +*/ Vector UnicodeUtils::utf8ToUtf32(const String& input) { - const auto utf_16 = utf8ToUtf16WString(input); + //const auto utf_16 = utf8ToUtf16WString(input); Vector output; - std::size_t pos = 0; + /* + size_t pos = 0; while (pos < utf_16.size()) { const auto c = utf_16[pos]; @@ -68,6 +73,7 @@ Vector UnicodeUtils::utf8ToUtf32(const String& input) } } } + */ return output; } diff --git a/src/base/core/encoding/UnicodeUtils.h b/src/base/core/encoding/UnicodeUtils.h index d8bebae..26b072c 100644 --- a/src/base/core/encoding/UnicodeUtils.h +++ b/src/base/core/encoding/UnicodeUtils.h @@ -7,9 +7,9 @@ class UnicodeUtils { public: - static String utf16ToUtf8String(const std::wstring& input); + //static String utf16ToUtf8String(const std::wstring& input); - static std::wstring utf8ToUtf16WString(const String& input); + //static std::wstring utf8ToUtf16WString(const String& input); static Vector utf8ToUtf32(const String& input); diff --git a/src/base/core/filesystem/File.cpp b/src/base/core/filesystem/File.cpp index 317b8c0..9be955c 100644 --- a/src/base/core/filesystem/File.cpp +++ b/src/base/core/filesystem/File.cpp @@ -78,31 +78,31 @@ public: return m_open_for_write; } - Result do_read(VecBytes& bytes) + Result do_read(VecBytes& bytes) { errno = 0; const auto rc = ::read(m_fd, bytes.data(), bytes.capacity()); if (rc < 0) { const auto msg = _s("Error in read impl | ") + Error::from_errno(); - return Result(Error(msg)); + return Result(Error(msg)); } - return Result(rc); + return Result(rc); } - Result do_write(const VecBytes& bytes) + Result do_write(const VecBytes& bytes) { errno = 0; const auto rc = ::write(m_fd, bytes.data(), bytes.size()); if (rc < 0) { const auto msg = _s("Error in write impl | ") + Error::from_errno(); - return Result(Error(msg)); + return Result(Error(msg)); } - return Result(rc); + return Result(rc); } - Result do_write(const Vector& bytes, int size = -1) + Result do_write(const Vector& bytes, int size = -1) { errno = 0; int rc = 0; @@ -117,9 +117,9 @@ public: if (rc < 0) { const auto msg = _s("Error in write impl | ") + Error::from_errno(); - return Result(Error(msg)); + return Result(Error(msg)); } - return Result(rc); + return Result(rc); } Status update_size() @@ -139,7 +139,7 @@ public: bool m_open_for_write{false}; bool m_open_for_read{false}; bool m_valid{false}; - std::size_t m_size{0}; + size_t m_size{0}; bool m_is_open{false}; int m_fd{-1}; }; diff --git a/src/base/core/filesystem/FileFormats.cpp b/src/base/core/filesystem/FileFormats.cpp index 201199f..7bfa8e8 100644 --- a/src/base/core/filesystem/FileFormats.cpp +++ b/src/base/core/filesystem/FileFormats.cpp @@ -5,24 +5,24 @@ FileFormat::ExtensionMap FileFormat::mExtensions = [] { ExtensionMap ret; - ret[Format::Markdown] = ".md"; - ret[Format::Html] = ".html"; - ret[Format::Wav] = ".wav"; + //ret.insert(Format::Markdown, ".md"); + //ret.insert(Format::Html, ".html"); + //ret.insert(Format::Wav, ".wav"); return ret; }(); bool FileFormat::isFormat(const String& extension, Format format) { - return StringUtils::toLower(extension) == mExtensions[format]; + return StringUtils::toLower(extension) == (*mExtensions.find(format)).value(); } FileFormat::Format FileFormat::inferFormat(const String& query) { for(const auto& extension : mExtensions) { - if(extension.second == query) + if(extension.value() == query) { - return extension.first; + return extension.key(); } } return Format::Unknown; @@ -30,5 +30,5 @@ FileFormat::Format FileFormat::inferFormat(const String& query) String FileFormat::getExtension(Format format) { - return mExtensions[format]; + return (*mExtensions.find(format)).value(); } diff --git a/src/base/core/filesystem/PathUtils.cpp b/src/base/core/filesystem/PathUtils.cpp index 1b18251..190952b 100644 --- a/src/base/core/filesystem/PathUtils.cpp +++ b/src/base/core/filesystem/PathUtils.cpp @@ -1,19 +1,22 @@ #include "PathUtils.h" -String PathUtils::getBaseFilename(const Path& path) +String PathUtils::getBaseFilename(const FileSystemPath& path) { - return path.stem().string(); + //return path.stem().string(); + return {}; } -Path PathUtils::getRelativePath(const Path& input, const Path& relativeTo) +FileSystemPath PathUtils::getRelativePath(const FileSystemPath& input, const FileSystemPath& relativeTo) { - return std::filesystem::relative(input, relativeTo); + //return std::filesystem::relative(input, relativeTo); + return input; } -String PathUtils::getPathDelimited(const Path& path, char delimiter) +String PathUtils::getPathDelimited(const FileSystemPath& path, char delimiter) { String name; + /* unsigned count = 0; for(const auto& element : path) @@ -28,6 +31,7 @@ String PathUtils::getPathDelimited(const Path& path, char delimiter) } count++; } + */ return name; } diff --git a/src/base/core/filesystem/PathUtils.h b/src/base/core/filesystem/PathUtils.h index eaa308f..1feb44b 100644 --- a/src/base/core/filesystem/PathUtils.h +++ b/src/base/core/filesystem/PathUtils.h @@ -1,17 +1,15 @@ #pragma once -#include +#include "FileSystemPath.h" #include "String.h" #include "Vector.h" -using Path = std::filesystem::path; - class PathUtils { public: - static String getBaseFilename(const Path& path); + static String getBaseFilename(const FileSystemPath& path); - static Path getRelativePath(const Path& path, const Path& relativeTo); + static FileSystemPath getRelativePath(const FileSystemPath& path, const FileSystemPath& relativeTo); - static String getPathDelimited(const Path& path, char delimiter='-'); + static String getPathDelimited(const FileSystemPath& path, char delimiter='-'); }; diff --git a/src/base/core/memory/Allocator.h b/src/base/core/memory/Allocator.h index 54e57c2..26ef3cb 100644 --- a/src/base/core/memory/Allocator.h +++ b/src/base/core/memory/Allocator.h @@ -1,15 +1,21 @@ #pragma once -//#include #include +#include template class Allocator { public: + template + T* allocate(U&& u) + { + return new T(std::forward(u)); + } + T* allocate() { - return new T; + return new T(); } void do_delete(T* p) @@ -17,7 +23,7 @@ public: delete p; } - T* alloc_array(std::size_t size) + T* alloc_array(size_t size) { return new T[size]; } diff --git a/src/base/core/memory/Pointer.h b/src/base/core/memory/Pointer.h index b74fcfe..b2c5639 100644 --- a/src/base/core/memory/Pointer.h +++ b/src/base/core/memory/Pointer.h @@ -11,6 +11,14 @@ public: { } + template + static Ptr create(U&& u) + { + Ptr p; + p.allocate(std::forward(u)); + return std::move(p); + } + static Ptr create() { Ptr p; @@ -18,17 +26,28 @@ public: return std::move(p); } + template + void allocate(U&& u) + { + m_raw = m_allocator.allocate(std::forward(u)); + } + void allocate() { m_raw = m_allocator.allocate(); } ~Ptr() + { + reset(); + } + + void reset() { if (m_raw != nullptr) { m_allocator.do_delete(m_raw); - } + } } Ptr(const Ptr& other) = delete; @@ -38,6 +57,21 @@ public: *this = std::move(other); } + void clear_raw() + { + m_raw = nullptr; + } + + T* get() + { + return m_raw; + } + + const T* get() const + { + return m_raw; + } + Ptr& operator=(const Ptr& other) = delete; template @@ -51,12 +85,7 @@ public: return *this; } - T* get() - { - return m_raw; - } - - const T* get() const + const T* operator->() const { return m_raw; } @@ -66,9 +95,9 @@ public: return m_raw; } - void clear_raw() + operator bool() const { - m_raw = nullptr; + return m_raw != nullptr; } private: diff --git a/src/base/core/memory/SharedMemory.cpp b/src/base/core/memory/SharedMemory.cpp index 481e701..568d1a0 100644 --- a/src/base/core/memory/SharedMemory.cpp +++ b/src/base/core/memory/SharedMemory.cpp @@ -1,4 +1,4 @@ -#include "SharedMemory.h" +#include "SharedPointer.h" #include "RandomUtils.h" @@ -10,7 +10,7 @@ #include #endif -void SharedMemory::allocate(const String& namePrefix, std::size_t size) +void SharedMemory::allocate(const String& namePrefix, size_t size) { createFile(namePrefix); diff --git a/src/base/core/memory/SharedMemory.h b/src/base/core/memory/SharedMemory.h index 0aa1699..4a9d30b 100644 --- a/src/base/core/memory/SharedMemory.h +++ b/src/base/core/memory/SharedMemory.h @@ -5,7 +5,7 @@ class SharedMemory { public: - void allocate(const String& namePrefix, std::size_t size); + void allocate(const String& namePrefix, size_t size); int getFileDescriptor() const; diff --git a/src/base/core/protocol/HttpHeader.cpp b/src/base/core/protocol/HttpHeader.cpp index 993fb4d..6f88b9e 100644 --- a/src/base/core/protocol/HttpHeader.cpp +++ b/src/base/core/protocol/HttpHeader.cpp @@ -26,7 +26,7 @@ void HttpHeader::parse(const Vector& message) bool foundDelimiter{false}; for (const auto& line : message) { - for(std::size_t idx = 0; idx< line.size(); idx++) + for(size_t idx = 0; idx< line.size(); idx++) { const auto c = line[idx]; if (c == StringUtils::COLON) diff --git a/src/base/core/protocol/HttpRequest.cpp b/src/base/core/protocol/HttpRequest.cpp index 14b5005..31b0765 100644 --- a/src/base/core/protocol/HttpRequest.cpp +++ b/src/base/core/protocol/HttpRequest.cpp @@ -66,7 +66,7 @@ void HttpRequest::fromString(const String& message) mRequiredBytes = 0; } -std::size_t HttpRequest::requiredBytes() const +size_t HttpRequest::requiredBytes() const { return mRequiredBytes; } diff --git a/src/base/core/protocol/HttpRequest.h b/src/base/core/protocol/HttpRequest.h index b5a728c..3f468ef 100644 --- a/src/base/core/protocol/HttpRequest.h +++ b/src/base/core/protocol/HttpRequest.h @@ -31,7 +31,7 @@ public: String toString(const String& host) const; - std::size_t requiredBytes() const; + size_t requiredBytes() const; private: Verb mVerb = Verb::UNKNOWN; diff --git a/src/base/core/random/RandomUtils.cpp b/src/base/core/random/RandomUtils.cpp index 8564ca4..9c0fdb7 100644 --- a/src/base/core/random/RandomUtils.cpp +++ b/src/base/core/random/RandomUtils.cpp @@ -4,7 +4,7 @@ #include #include -Vector RandomUtils::getRandomVecUnsigned(std::size_t size) +Vector RandomUtils::getRandomVecUnsigned(size_t size) { std::random_device rnd_device; diff --git a/src/base/core/random/RandomUtils.h b/src/base/core/random/RandomUtils.h index f07ea37..582e069 100644 --- a/src/base/core/random/RandomUtils.h +++ b/src/base/core/random/RandomUtils.h @@ -6,5 +6,5 @@ class RandomUtils { public: - static Vector getRandomVecUnsigned(std::size_t size); + static Vector getRandomVecUnsigned(size_t size); }; diff --git a/src/base/core/serialization/Serializeable.h b/src/base/core/serialization/Serializeable.h index 5c7c29a..6f0213b 100644 --- a/src/base/core/serialization/Serializeable.h +++ b/src/base/core/serialization/Serializeable.h @@ -5,7 +5,7 @@ class Serializeable { public: - virtual std::size_t getSize() const = 0; + virtual size_t getSize() const = 0; - virtual uint8_t getByte(std::size_t index) const = 0; + virtual uint8_t getByte(size_t index) const = 0; }; \ No newline at end of file diff --git a/src/base/core/serialization/TomlReader.cpp b/src/base/core/serialization/TomlReader.cpp index 38f8213..256eb46 100644 --- a/src/base/core/serialization/TomlReader.cpp +++ b/src/base/core/serialization/TomlReader.cpp @@ -1,8 +1,6 @@ #include "TomlReader.h" -#include -#include -#include +#include "CharUtils.h" TomlTable::TomlTable(const String& header) : mHeader(header) @@ -12,17 +10,17 @@ TomlTable::TomlTable(const String& header) void TomlTable::addComment(const Comment& comment) { - mComments.push_back(comment); + //mComments.push_back(comment); } void TomlTable::addTable(Ptr table) { - mTables[table->getHeader()] = std::move(table); + mTables.insert(table->getHeader(), std::move(table)); } void TomlTable::addKeyValuePair(const String& key, const String& value) { - mMap[key] = value; + mMap.insert(key, value); } String TomlTable::getHeader() const @@ -30,49 +28,53 @@ String TomlTable::getHeader() const return mHeader; } -TomlTable* TomlTable::getTable(const String& path) +const TomlTable* TomlTable::getTable(const String& path) { - return mTables[path].get(); + return (*mTables.find(path)).value().get(); } -TomlTable::KeyValuePairs TomlTable::getKeyValuePairs() const +const TomlTable::KeyValuePairs& TomlTable::getKeyValuePairs() const { return mMap; } TomlContent::TomlContent() - : mRootTable(std::make_unique("root")) + : mRootTable(Ptr::create("root")) { } -TomlTable* TomlContent::getRootTable() const +const TomlTable* TomlContent::getRootTable() const { - return mRootTable.get(); + //return mRootTable.get(); + return nullptr; } -TomlTable* TomlContent::getTable(const String& path) const +const TomlTable* TomlContent::getTable(const String& path) const { - return mRootTable->getTable(path); + //return mRootTable->getTable(path); + return nullptr; } TomlReader::TomlReader() - : mContent(std::make_unique()) + : mContent(Ptr::create()) { } -TomlContent* TomlReader::getContent() const +const TomlContent* TomlReader::getContent() const { - return mContent.get(); + //return mContent.get(); + return nullptr; } -void TomlReader::read(const Path& input_path) +void TomlReader::read(const FileSystemPath& input_path) { - const auto lines = File(input_path).readLines(); + Vector lines; + File(input_path).readLines(lines); mLastSectionOffset = 0; - mWorkingTable = mContent->getRootTable(); + //mWorkingTable = mContent->getRootTable(); for (const auto& line : lines) { @@ -126,11 +128,11 @@ void TomlReader::processLine(const String& line) } else if (found_key) { - key_string.erase(std::remove_if(key_string.begin(), key_string.end(), [](char c) {return std::isspace(c); }), key_string.end()); - working_string.erase(std::remove_if(working_string.begin(), working_string.end(), [](char c) {return std::isspace(c); }), working_string.end()); + key_string.eraseIf([](char c) {return CharUtils::is_space(c); }); + working_string.eraseIf([](char c) {return CharUtils::is_space(c); }); if (working_string.size()>2 && working_string[0] == '"' && working_string[working_string.size() - 1] == '"') { - working_string = working_string.substr(1, working_string.size() - 2); + working_string.slice(1, working_string.size() - 2, working_string); } onKeyValuePair(key_string, working_string); @@ -139,7 +141,7 @@ void TomlReader::processLine(const String& line) void TomlReader::onHeader(const String& header) { - auto new_table = std::make_unique(header); + auto new_table = Ptr::create(header); auto table_temp = new_table.get(); mWorkingTable->addTable(std::move(new_table)); mWorkingTable = table_temp; diff --git a/src/base/core/serialization/TomlReader.h b/src/base/core/serialization/TomlReader.h index 7fc9b08..397b08b 100644 --- a/src/base/core/serialization/TomlReader.h +++ b/src/base/core/serialization/TomlReader.h @@ -1,19 +1,16 @@ #pragma once #include "File.h" - -#include -#include "Memory.h" -#include +#include "FileSystemPath.h" +#include "Pointer.h" +#include "Map.h" #include "String.h" -using Path = std::filesystem::path; - class TomlTable { public: - using Comment = std::pair; - using KeyValuePairs = std::unordered_map; + using Comment = Pair; + using KeyValuePairs = Map; TomlTable(const String& header); @@ -25,13 +22,13 @@ public: String getHeader() const; - TomlTable* getTable(const String& path); + const TomlTable* getTable(const String& path); - KeyValuePairs getKeyValuePairs() const; + const KeyValuePairs& getKeyValuePairs() const; private: String mHeader; - std::unordered_map > mTables; + Map > mTables; KeyValuePairs mMap; Vector mComments; }; @@ -41,9 +38,9 @@ class TomlContent public: TomlContent(); - TomlTable* getRootTable() const; + const TomlTable* getRootTable() const; - TomlTable* getTable(const String& path) const; + const TomlTable* getTable(const String& path) const; private: Ptr mRootTable; @@ -54,9 +51,9 @@ class TomlReader public: TomlReader(); - TomlContent* getContent() const; + const TomlContent* getContent() const; - void read(const Path& input_path); + void read(const FileSystemPath& input_path); void processLine(const String& line); diff --git a/src/base/core/serialization/xml/XmlDocument.cpp b/src/base/core/serialization/xml/XmlDocument.cpp index 7bd3c29..97e67ad 100644 --- a/src/base/core/serialization/xml/XmlDocument.cpp +++ b/src/base/core/serialization/xml/XmlDocument.cpp @@ -1,8 +1,5 @@ #include "XmlDocument.h" -#include "XmlProlog.h" -#include "XmlElement.h" - XmlDocument::XmlDocument() : mProlog(XmlProlog::Create("xml")) { @@ -19,7 +16,12 @@ void XmlDocument::setProlog(Ptr prolog) mProlog = std::move(prolog); } -XmlProlog* XmlDocument::getProlog() const +const XmlProlog* XmlDocument::getProlog() const +{ + return mProlog.get(); +} + +XmlProlog* XmlDocument::getProlog() { return mProlog.get(); } @@ -29,7 +31,7 @@ void XmlDocument::setRoot(Ptr root) mRoot = std::move(root); } -XmlElement* XmlDocument::getRoot() const +const XmlElement* XmlDocument::getRoot() const { return mRoot.get(); } diff --git a/src/base/core/serialization/xml/XmlDocument.h b/src/base/core/serialization/xml/XmlDocument.h index 7995916..d00f3c2 100644 --- a/src/base/core/serialization/xml/XmlDocument.h +++ b/src/base/core/serialization/xml/XmlDocument.h @@ -6,21 +6,19 @@ #include "XmlElement.h" #include "XmlProlog.h" -class XmlElement; -class XmlProlog; - class XmlDocument { public: XmlDocument(); virtual ~XmlDocument(); - XmlProlog* getProlog() const; - XmlElement* getRoot() const; + const XmlProlog* getProlog() const; + XmlProlog* getProlog(); + const XmlElement* getRoot() const; void setProlog(Ptr prolog); void setRoot(Ptr root); private: - XmlPrologPtr mProlog; - XmlElementPtr mRoot; + Ptr mProlog; + Ptr mRoot; }; diff --git a/src/base/core/serialization/xml/XmlParser.cpp b/src/base/core/serialization/xml/XmlParser.cpp index 6973426..e02aae8 100644 --- a/src/base/core/serialization/xml/XmlParser.cpp +++ b/src/base/core/serialization/xml/XmlParser.cpp @@ -6,15 +6,13 @@ #include "XmlElement.h" #include "XmlAttribute.h" -#include - using LS = XmlParser::LineState; using DS = XmlParser::DocumentState; XmlParser::XmlParser() : mDocumentState(XmlParser::DocumentState::Await_Prolog), mLineState(XmlParser::LineState::Await_Tag_Open), - mDocument(XmlDocument::Create()), + mDocument(Ptr::create()), mWorkingElements() { @@ -22,7 +20,7 @@ XmlParser::XmlParser() void XmlParser::processLine(const String& input) { - for (std::size_t idx=0; idxsetText(mWorkingText); + (*mWorkingElements.top())->setText(mWorkingText); } void XmlParser::onElementTagEnd() @@ -318,7 +316,7 @@ void XmlParser::onElementTagEnd() void XmlParser::onTagNameStart(char c) { - mWorkingTagName = c; + mWorkingTagName += c; mLineState = LS::Await_Tag_Name_End; if(mDocumentState != DS::Build_Prolog && mDocumentState != DS::Close_Element) { @@ -344,7 +342,7 @@ void XmlParser::onTagNameEnd() } else { - mWorkingElements.top()->addChild(std::move(new_element)); + (*mWorkingElements.top())->addChild(std::move(new_element)); } mWorkingElements.push(working_element); mLineState = LS::Await_Attribute_Name; @@ -353,7 +351,7 @@ void XmlParser::onTagNameEnd() void XmlParser::onAttributeNameStart(char c) { - mWorkingAttributeName = c; + mWorkingAttributeName += c; mLineState = LS::Await_Attribute_Name_End; } @@ -366,7 +364,7 @@ void XmlParser::onAttributeNameEnd() } else if(mDocumentState == DS::Build_Element) { - mWorkingElements.top()->addAttribute(std::move(attribute)); + (*mWorkingElements.top())->addAttribute(std::move(attribute)); } mLineState = LS::Await_Attribute_Value; } @@ -385,7 +383,7 @@ void XmlParser::onAttributeValueEnd() } else if(mDocumentState == DS::Build_Element) { - mWorkingElements.top()->getAttribute(mWorkingAttributeName)->setValue(mWorkingAttributeValue); + (*mWorkingElements.top())->getAttribute(mWorkingAttributeName)->setValue(mWorkingAttributeValue); } mLineState = LS::Await_Attribute_Name; } @@ -403,7 +401,7 @@ void XmlParser::onFinishProlog() mLineState = LS::Await_Tag_Open; } -XmlDocumentPtr XmlParser::getDocument() +Ptr XmlParser::getDocument() { return std::move(mDocument); } diff --git a/src/base/core/serialization/xml/XmlParser.h b/src/base/core/serialization/xml/XmlParser.h index 430e9bb..636f12f 100644 --- a/src/base/core/serialization/xml/XmlParser.h +++ b/src/base/core/serialization/xml/XmlParser.h @@ -1,12 +1,10 @@ #pragma once #include "String.h" -#include -#include "Memory.h" +#include "Stack.h" +#include "Pointer.h" class XmlDocument; -using XmlDocumentPtr = Ptr; - class XmlElement; class XmlParser @@ -38,9 +36,9 @@ public: public: XmlParser(); - void processLine(const String& input); + Ptr getDocument(); - XmlDocumentPtr getDocument(); + void processLine(const String& input); private: void onLeftBracket(); @@ -92,8 +90,8 @@ private: private: DocumentState mDocumentState; LineState mLineState; - XmlDocumentPtr mDocument; - std::stack mWorkingElements; + Ptr mDocument; + Stack mWorkingElements; String mWorkingAttributeName; String mWorkingTagName; diff --git a/src/base/core/serialization/xml/XmlWriter.cpp b/src/base/core/serialization/xml/XmlWriter.cpp index 8d94f63..b5a3986 100644 --- a/src/base/core/serialization/xml/XmlWriter.cpp +++ b/src/base/core/serialization/xml/XmlWriter.cpp @@ -10,7 +10,7 @@ Status XmlWriter::toString(XmlDocument* document, String& output) output += "getAttributes()) { - output += " " + attribute->getName() + "=\"" + attribute->getValue() + "\""; + output += _s(" ") + attribute->getName() + _s("=\"") + attribute->getValue() + _s("\""); } output += "?>\n"; } diff --git a/src/base/core/serialization/xml/xml-elements/XmlAttribute.cpp b/src/base/core/serialization/xml/xml-elements/XmlAttribute.cpp index b89c784..d80eb71 100644 --- a/src/base/core/serialization/xml/xml-elements/XmlAttribute.cpp +++ b/src/base/core/serialization/xml/xml-elements/XmlAttribute.cpp @@ -7,9 +7,9 @@ XmlAttribute::XmlAttribute(const String& name) } -XmlAttributePtr XmlAttribute::Create(const String& name) +Ptr XmlAttribute::Create(const String& name) { - return std::make_unique(name); + return Ptr::create(name); } const String& XmlAttribute::getName() const diff --git a/src/base/core/serialization/xml/xml-elements/XmlAttribute.h b/src/base/core/serialization/xml/xml-elements/XmlAttribute.h index 8cdb730..3589517 100644 --- a/src/base/core/serialization/xml/xml-elements/XmlAttribute.h +++ b/src/base/core/serialization/xml/xml-elements/XmlAttribute.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "String.h" class XmlAttribute @@ -19,5 +19,3 @@ private: String mName; String mValue; }; - -using XmlAttributePtr = Ptr; diff --git a/src/base/core/serialization/xml/xml-elements/XmlElement.cpp b/src/base/core/serialization/xml/xml-elements/XmlElement.cpp index ba0e819..6d1a499 100644 --- a/src/base/core/serialization/xml/xml-elements/XmlElement.cpp +++ b/src/base/core/serialization/xml/xml-elements/XmlElement.cpp @@ -14,9 +14,9 @@ XmlElement::~XmlElement() } -XmlElementPtr XmlElement::Create(const String& tagName) +Ptr XmlElement::Create(const String& tagName) { - return std::make_unique(tagName); + return Ptr::create(tagName); } void XmlElement::setTagName(const String& tagName) @@ -24,19 +24,19 @@ void XmlElement::setTagName(const String& tagName) mTagName = tagName; } -void XmlElement::addChild(XmlElementPtr child) +void XmlElement::addChild(Ptr child) { mChildren.push_back(std::move(child)); } -void XmlElement::addAttribute(XmlAttributePtr attribute) +void XmlElement::addAttribute(Ptr attribute) { - mAttributes[attribute->getName()] = std::move(attribute); + mAttributes.insert(attribute->getName(), std::move(attribute)); } void XmlElement::addAttribute(const String& name, const String& value) { - auto attr = std::make_unique(name); + auto attr = Ptr::create(name); attr->setValue(value); addAttribute(std::move(attr)); } @@ -74,16 +74,30 @@ bool XmlElement::hasAttribute(const String& attribute) const return (bool)(getAttribute(attribute)); } -XmlAttribute* XmlElement::getAttribute(const String& attributeName) const +const XmlAttribute* XmlElement::getAttribute(const String& attributeName) const { if (auto iter = mAttributes.find(attributeName); iter != mAttributes.end()) { - return iter->second.get(); + return (*iter).value().get(); } return nullptr; } -const std::unordered_map& XmlElement::getAttributes() const +XmlAttribute* XmlElement::getAttribute(const String& attributeName) +{ + if (auto iter = mAttributes.find(attributeName); iter != mAttributes.end()) + { + //return (*iter).value().get(); + } + return nullptr; +} + +void XmlElement::forEachAttribute(eachAttrFunc func) const +{ + +} + +const Map >& XmlElement::getAttributes() const { return mAttributes; } @@ -102,18 +116,18 @@ String XmlElement::toString(unsigned depth, bool keepInline) const auto content = prefix + "<" + getTagName(); for (const auto& [key, attribute] : getAttributes()) { - content += " " + attribute->getName() + "=\"" + attribute->getValue() + "\""; + content += _s(" ") + attribute->getName() + _s("=\"") + attribute->getValue() + _s("\""); } const auto num_children = mChildren.size(); if (num_children == 0 && getText().empty()) { - content += "/>" + line_ending; + content += _s("/>") + line_ending; return content; } else { - content += ">"; + content += _s(">"); } if (!getText().empty()) @@ -135,6 +149,6 @@ String XmlElement::toString(unsigned depth, bool keepInline) const content += prefix; } - content += "" + line_ending; + content += _s("") + line_ending; return content; } diff --git a/src/base/core/serialization/xml/xml-elements/XmlElement.h b/src/base/core/serialization/xml/xml-elements/XmlElement.h index e176b4b..e4d064a 100644 --- a/src/base/core/serialization/xml/xml-elements/XmlElement.h +++ b/src/base/core/serialization/xml/xml-elements/XmlElement.h @@ -14,15 +14,20 @@ public: static Ptr Create(const String& tagName); - void addAttribute(XmlAttributePtr attribute); + void addAttribute(Ptr attribute); void addAttribute(const String& name, const String& value); void addChild(Ptr child); const String& getTagName() const; const String& getText() const; - XmlAttribute* getAttribute(const String& attribute) const; - const Map >& getAttributes() const; + using eachAttrFunc = std::function; + void forEachAttribute(eachAttrFunc func) const; + + const XmlAttribute* getAttribute(const String& attribute) const; + XmlAttribute* getAttribute(const String& attribute); + + const Map >& getAttributes() const; const Vector >& getChildren() const; @@ -39,6 +44,6 @@ protected: String mTagName; String mText; - Map > mAttributes; + Map > mAttributes; Vector > mChildren; }; diff --git a/src/base/core/serialization/xml/xml-elements/XmlProlog.cpp b/src/base/core/serialization/xml/xml-elements/XmlProlog.cpp index a88712b..c03f760 100644 --- a/src/base/core/serialization/xml/xml-elements/XmlProlog.cpp +++ b/src/base/core/serialization/xml/xml-elements/XmlProlog.cpp @@ -10,9 +10,9 @@ XmlProlog::XmlProlog(const String& tagName) } -XmlPrologPtr XmlProlog::Create(const String& tagName) +Ptr XmlProlog::Create(const String& tagName) { - return std::make_unique(tagName); + return Ptr::create(tagName); } XmlProlog::Encoding XmlProlog::getEncoding() const diff --git a/src/base/core/serialization/xml/xml-elements/XmlProlog.h b/src/base/core/serialization/xml/xml-elements/XmlProlog.h index 7458e04..5d4a967 100644 --- a/src/base/core/serialization/xml/xml-elements/XmlProlog.h +++ b/src/base/core/serialization/xml/xml-elements/XmlProlog.h @@ -2,7 +2,7 @@ #include "XmlElement.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class XmlProlog : public XmlElement @@ -31,6 +31,4 @@ public: private: Version mVersion; Encoding mEncoding; -}; - -using XmlPrologPtr = Ptr; +}; \ No newline at end of file diff --git a/src/base/core/streams/BitStream.cpp b/src/base/core/streams/BitStream.cpp index 38c58be..1d98d12 100644 --- a/src/base/core/streams/BitStream.cpp +++ b/src/base/core/streams/BitStream.cpp @@ -18,7 +18,7 @@ Byte BitStream::getCurrentByte() void BitStream::write(DWord data) { - for(std::size_t idx=0; idx(data), overshoot, idx*8 + num_left); writeByte(mCurrentByte, false); @@ -107,7 +107,7 @@ void BitStream::writeNBits(DWord data, std::size_t length) } } -bool BitStream::readNextNBits(std::size_t n, Byte& buffer) +bool BitStream::readNextNBits(size_t n, Byte& buffer) { if (mByteOffset < 0) { @@ -169,7 +169,7 @@ void BitStream::flushRemainingBits() } } -std::pair BitStream::getRemainingBits() const +std::pair BitStream::getRemainingBits() const { return {mEndByte, mEndBitOffset}; } diff --git a/src/base/core/streams/BitStream.h b/src/base/core/streams/BitStream.h index e316a7d..5e66ee2 100644 --- a/src/base/core/streams/BitStream.h +++ b/src/base/core/streams/BitStream.h @@ -15,21 +15,21 @@ public: int getCurrentByteOffset() const; - std::size_t getCurrentBitOffset() const; + size_t getCurrentBitOffset() const; virtual bool isFinished() const = 0; - String logNextNBytes(std::size_t n) const; + String logNextNBytes(size_t n) const; String logLocation(); - virtual void peekNextNBytes(std::size_t n, VecBytes& bytes) const = 0; + virtual void peekNextNBytes(size_t n, VecBytes& bytes) const = 0; - virtual bool readNextNBits(std::size_t n, Byte& buffer); + virtual bool readNextNBits(size_t n, Byte& buffer); virtual Optional readNextByte() = 0; - virtual void writeNBits(DWord data, std::size_t length); + virtual void writeNBits(DWord data, size_t length); virtual void writeByte(Byte data, bool checkOverflow = true) = 0; @@ -45,7 +45,7 @@ public: void flushRemainingBits(); - Pair getRemainingBits() const; + Pair getRemainingBits() const; void setChecksumCalculator(AbstractChecksumCalculator* calc); @@ -53,11 +53,11 @@ public: protected: int mByteOffset{-1}; - std::size_t mBitOffset{0}; + size_t mBitOffset{0}; Byte mCurrentByte{0}; int mEndByteOffset{-1}; - std::size_t mEndBitOffset{0}; + size_t mEndBitOffset{0}; Byte mEndByte{0}; AbstractChecksumCalculator* mChecksumCalculator{nullptr}; }; diff --git a/src/base/core/streams/BufferBitStream.cpp b/src/base/core/streams/BufferBitStream.cpp index 12381ae..08babe4 100644 --- a/src/base/core/streams/BufferBitStream.cpp +++ b/src/base/core/streams/BufferBitStream.cpp @@ -9,10 +9,10 @@ bool BufferBitStream::isFinished() const return mByteOffset == static_cast(mBuffer.size()) - 1; } -void BufferBitStream::peekNextNBytes(std::size_t n, VecBytes& ret) const +void BufferBitStream::peekNextNBytes(size_t n, VecBytes& ret) const { ret.resize(n, 0); - std::size_t count = 0; + size_t count = 0; int start = mByteOffset; if (start<0) diff --git a/src/base/core/streams/BufferBitStream.h b/src/base/core/streams/BufferBitStream.h index 04794fb..f8bcc08 100644 --- a/src/base/core/streams/BufferBitStream.h +++ b/src/base/core/streams/BufferBitStream.h @@ -9,7 +9,7 @@ public: bool isFinished() const override; - void peekNextNBytes(std::size_t n, VecBytes& bytes) const override; + void peekNextNBytes(size_t n, VecBytes& bytes) const override; std::optional readNextByte() override; diff --git a/src/base/core/streams/InputBitStream.cpp b/src/base/core/streams/InputBitStream.cpp index c6b19b5..bbc3472 100644 --- a/src/base/core/streams/InputBitStream.cpp +++ b/src/base/core/streams/InputBitStream.cpp @@ -12,7 +12,7 @@ bool InputBitStream::isFinished() const return mStream->good(); } -void InputBitStream::peekNextNBytes(std::size_t, VecBytes&) const +void InputBitStream::peekNextNBytes(size_t, VecBytes&) const { } diff --git a/src/base/core/streams/InputBitStream.h b/src/base/core/streams/InputBitStream.h index c6ff565..af60fd3 100644 --- a/src/base/core/streams/InputBitStream.h +++ b/src/base/core/streams/InputBitStream.h @@ -10,7 +10,7 @@ class InputBitStream : public BitStream bool isFinished() const override; - void peekNextNBytes(std::size_t n, VecBytes& bytes) const override; + void peekNextNBytes(size_t n, VecBytes& bytes) const override; std::optional readNextByte() override; diff --git a/src/base/core/streams/OutputBitStream.cpp b/src/base/core/streams/OutputBitStream.cpp index 37fa6db..b813378 100644 --- a/src/base/core/streams/OutputBitStream.cpp +++ b/src/base/core/streams/OutputBitStream.cpp @@ -12,7 +12,7 @@ bool OutputBitStream::isFinished() const return true; } -void OutputBitStream::peekNextNBytes(std::size_t, VecBytes&) const +void OutputBitStream::peekNextNBytes(size_t, VecBytes&) const { } diff --git a/src/base/core/streams/OutputBitStream.h b/src/base/core/streams/OutputBitStream.h index bd22014..2d6e7e7 100644 --- a/src/base/core/streams/OutputBitStream.h +++ b/src/base/core/streams/OutputBitStream.h @@ -11,7 +11,7 @@ public: bool isFinished() const override; - void peekNextNBytes(std::size_t n, VecBytes& bytes) const override; + void peekNextNBytes(size_t n, VecBytes& bytes) const override; std::optional readNextByte() override; diff --git a/src/base/core/system/process/AbstractApp.h b/src/base/core/system/process/AbstractApp.h index 2434bf9..42e4599 100644 --- a/src/base/core/system/process/AbstractApp.h +++ b/src/base/core/system/process/AbstractApp.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class IApplicationContext { diff --git a/src/base/core/thread/ThreadCollection.cpp b/src/base/core/thread/ThreadCollection.cpp index b3d32e5..88c45df 100644 --- a/src/base/core/thread/ThreadCollection.cpp +++ b/src/base/core/thread/ThreadCollection.cpp @@ -1,7 +1,5 @@ #include "ThreadCollection.h" -#include "Vector.h" - bool ThreadCollection::add(Ptr thread) { if (!mAccepting) @@ -10,7 +8,7 @@ bool ThreadCollection::add(Ptr thread) } std::scoped_lock guard(mMutex); - mThreads[thread->get_id()] = std::move(thread); + //mThreads.insert(thread->get_id(), std::move(thread)); return true; } @@ -23,7 +21,7 @@ void ThreadCollection::joinAndClearAll() std::scoped_lock guard(mMutex); for (const auto& item : mThreads) { - threads.push_back(item.second.get()); + //threads.push_back(item.value().get()); } } @@ -40,9 +38,9 @@ void ThreadCollection::joinAndClearAll() mAccepting = true; } -std::size_t ThreadCollection::size() const +size_t ThreadCollection::size() const { - std::size_t size{ 0 }; + size_t size{ 0 }; { std::scoped_lock guard(mMutex); size = mThreads.size(); @@ -70,7 +68,7 @@ void ThreadCollection::_remove(std::thread::thread::id inputId) { if (auto const& it = mThreads.find(inputId); it != mThreads.end()) { - it->second->detach(); - mThreads.erase(it); + //it->value()->detach(); + //mThreads.erase(it); } } \ No newline at end of file diff --git a/src/base/core/thread/ThreadCollection.h b/src/base/core/thread/ThreadCollection.h index 762330e..a0f7c59 100644 --- a/src/base/core/thread/ThreadCollection.h +++ b/src/base/core/thread/ThreadCollection.h @@ -1,11 +1,12 @@ #pragma once -#include -#include "Memory.h" +#include "Map.h" +#include "Pointer.h" +#include "Vector.h" #include #include #include -#include "Vector.h" + class ThreadCollection { @@ -18,7 +19,7 @@ public: void removeMarked(); - std::size_t size() const; + size_t size() const; private: void _remove(std::thread::thread::id inputId); @@ -27,5 +28,5 @@ private: std::atomic mAccepting{ true }; Vector mMarkedForRemoval; - std::unordered_map > mThreads; + Map > mThreads; }; \ No newline at end of file diff --git a/src/base/database/Database.h b/src/base/database/Database.h index f3cb25d..9446393 100644 --- a/src/base/database/Database.h +++ b/src/base/database/Database.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include diff --git a/src/base/database/DatabaseManager.h b/src/base/database/DatabaseManager.h index 8cc62d6..398559f 100644 --- a/src/base/database/DatabaseManager.h +++ b/src/base/database/DatabaseManager.h @@ -3,7 +3,7 @@ #include "SqliteInterface.h" #include "Database.h" -#include "Memory.h" +#include "Pointer.h" #include using Path = std::filesystem::path; diff --git a/src/base/database/database_interfaces/SqliteInterface.h b/src/base/database/database_interfaces/SqliteInterface.h index 9b04946..934fbb0 100644 --- a/src/base/database/database_interfaces/SqliteInterface.h +++ b/src/base/database/database_interfaces/SqliteInterface.h @@ -1,5 +1,5 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include #include "Database.h" diff --git a/src/base/geometry/grid/AbstractGrid.cpp b/src/base/geometry/grid/AbstractGrid.cpp index 411dd58..fd498b6 100644 --- a/src/base/geometry/grid/AbstractGrid.cpp +++ b/src/base/geometry/grid/AbstractGrid.cpp @@ -1,6 +1,6 @@ #include "AbstractGrid.h" -AbstractGrid::AbstractGrid(const Bounds& bounds, std::size_t numPointsX, std::size_t numPointsY, std::size_t numPointsZ) +AbstractGrid::AbstractGrid(const Bounds& bounds, size_t numPointsX, size_t numPointsY, size_t numPointsZ) : mBounds(bounds), mNumX(numPointsX), mNumY(numPointsY), diff --git a/src/base/geometry/grid/AbstractGrid.h b/src/base/geometry/grid/AbstractGrid.h index 4c36aca..25843a7 100644 --- a/src/base/geometry/grid/AbstractGrid.h +++ b/src/base/geometry/grid/AbstractGrid.h @@ -3,18 +3,18 @@ #include "Bounds.h" #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" class AbstractGrid { public: - AbstractGrid(const Bounds& bounds, std::size_t numPointsX, std::size_t numPointsY, std::size_t numPointsZ = 1); + AbstractGrid(const Bounds& bounds, size_t numPointsX, size_t numPointsY, size_t numPointsZ = 1); virtual ~AbstractGrid(); const Bounds& getBounds() const; - virtual std::size_t getDataSize() const = 0; + virtual size_t getDataSize() const = 0; double getXSpacing() const; @@ -24,7 +24,7 @@ public: protected: Bounds mBounds; - std::size_t mNumX{ 0 }; - std::size_t mNumY{ 0 }; - std::size_t mNumZ{ 0 }; + size_t mNumX{ 0 }; + size_t mNumY{ 0 }; + size_t mNumZ{ 0 }; }; diff --git a/src/base/geometry/grid/Grid.h b/src/base/geometry/grid/Grid.h index 75d77ff..eb0f193 100644 --- a/src/base/geometry/grid/Grid.h +++ b/src/base/geometry/grid/Grid.h @@ -6,18 +6,18 @@ template class Grid : public TypedGrid { public: - Grid(const Bounds& bounds, std::size_t numPointsX, std::size_t numPointsY, std::size_t numPointsZ = 1) + Grid(const Bounds& bounds, size_t numPointsX, size_t numPointsY, size_t numPointsZ = 1) : TypedGrid(bounds, numPointsX, numPointsY, numPointsZ) { this->mData->initializeTo(numPointsX * numPointsY * numPointsZ, T()); } - T getItem(std::size_t idx, std::size_t jdx, std::size_t kdx = 1) const override + T getItem(size_t idx, size_t jdx, size_t kdx = 1) const override { return this->mData->getItem(getOffset(idx, jdx, kdx)); } - std::size_t getOffset(std::size_t idx, std::size_t jdx, std::size_t kdx) const + size_t getOffset(size_t idx, size_t jdx, size_t kdx) const { return idx * this->mNumZ + jdx * this->mNumX * this->mNumZ + kdx; } @@ -27,12 +27,12 @@ public: this->mData->setData(data); } - void setItem(std::size_t idx, std::size_t jdx, std::size_t kdx, const T& value) override + void setItem(size_t idx, size_t jdx, size_t kdx, const T& value) override { this->mData->setItem(getOffset(idx, jdx, kdx), value); } - std::size_t getDataSize() const override + size_t getDataSize() const override { return this->mData->getLength(); } @@ -42,27 +42,27 @@ template class SerializeableGrid : public Grid { public: - SerializeableGrid(std::size_t itemSize, const Bounds& bounds, std::size_t numPointsX, std::size_t numPointsY, std::size_t numPointsZ = 1) + SerializeableGrid(size_t itemSize, const Bounds& bounds, size_t numPointsX, size_t numPointsY, size_t numPointsZ = 1) : Grid(bounds, numPointsX, numPointsY, numPointsZ), mItemSize(itemSize) { } - uint8_t getByte(std::size_t index) + uint8_t getByte(size_t index) { const auto item_index = index/mItemSize; const auto item_internal_index = index % mItemSize; return this->mData->getItem(item_index).getByte(item_internal_index); } - void toBuffer(uint8_t* buffer, std::size_t bufferMaxSize) + void toBuffer(uint8_t* buffer, size_t bufferMaxSize) { - std::size_t count{0}; - std::size_t item_count{0}; + size_t count{0}; + size_t item_count{0}; while(count < bufferMaxSize && item_count < this->mData->getLength()) { const auto& item = this->mData->getItem(item_count); - for(std::size_t idx = 0; idx< item.getSize(); idx++) + for(size_t idx = 0; idx< item.getSize(); idx++) { buffer[count] = item.getByte(idx); count++; @@ -72,5 +72,5 @@ public: } private: - std::size_t mItemSize{1}; + size_t mItemSize{1}; }; diff --git a/src/base/geometry/grid/SparseGrid.h b/src/base/geometry/grid/SparseGrid.h index 6e3aa82..2d419ed 100644 --- a/src/base/geometry/grid/SparseGrid.h +++ b/src/base/geometry/grid/SparseGrid.h @@ -6,7 +6,7 @@ template class SparseGrid : public TypedGrid { public: - SparseGrid(const Bounds& bounds, std::size_t numPointsX, std::size_t numPointsY) + SparseGrid(const Bounds& bounds, size_t numPointsX, size_t numPointsY) : TypedGrid(bounds, numPointsX, numPointsY) { diff --git a/src/base/geometry/grid/TypedGrid.h b/src/base/geometry/grid/TypedGrid.h index d5973a8..5d9b6f6 100644 --- a/src/base/geometry/grid/TypedGrid.h +++ b/src/base/geometry/grid/TypedGrid.h @@ -3,13 +3,13 @@ #include "List.h" #include "AbstractGrid.h" -#include "Memory.h" +#include "Pointer.h" template class TypedGrid : public AbstractGrid { public: - TypedGrid(const Bounds& bounds, std::size_t numPointsX, std::size_t numPointsY, std::size_t numPointsZ = 1) + TypedGrid(const Bounds& bounds, size_t numPointsX, size_t numPointsY, size_t numPointsZ = 1) : AbstractGrid(bounds, numPointsX, numPointsY, numPointsZ), mData(std::make_unique >()) { @@ -17,9 +17,9 @@ public: virtual ~TypedGrid() = default; - virtual T getItem(std::size_t idx, std::size_t jdx, std::size_t kdx) const = 0; + virtual T getItem(size_t idx, size_t jdx, size_t kdx) const = 0; - virtual void setItem(std::size_t idx, std::size_t jdx, std::size_t kdx, const T& value) = 0; + virtual void setItem(size_t idx, size_t jdx, size_t kdx, const T& value) = 0; List* getInternalData() const { diff --git a/src/base/geometry/math/Linalg.cpp b/src/base/geometry/math/Linalg.cpp index c0710d9..34ff30d 100644 --- a/src/base/geometry/math/Linalg.cpp +++ b/src/base/geometry/math/Linalg.cpp @@ -1,7 +1,7 @@ #include "Linalg.h" -template +template Vector Linalg::crossProduct(const Vector& v0, const Vector& v1) { return v0.crossProduct(v1); diff --git a/src/base/geometry/math/Linalg.h b/src/base/geometry/math/Linalg.h index 9544f7f..8d2dcea 100644 --- a/src/base/geometry/math/Linalg.h +++ b/src/base/geometry/math/Linalg.h @@ -4,6 +4,6 @@ class Linalg { - template + template static Vector crossProduct(const Vector& v0, const Vector& v1); }; \ No newline at end of file diff --git a/src/base/geometry/math/Matrix.cpp b/src/base/geometry/math/Matrix.cpp index 9feaaa2..b010417 100644 --- a/src/base/geometry/math/Matrix.cpp +++ b/src/base/geometry/math/Matrix.cpp @@ -3,13 +3,13 @@ #include "String.h" #include -template +template Matrix::Matrix(T value) { mData = Vector(M * N, value); } -template +template Matrix::Matrix(T value, InputType inputType) { if (inputType == InputType::DIAGONAL) @@ -23,13 +23,13 @@ Matrix::Matrix(T value, InputType inputType) } } -template +template void Matrix::applyTo(Vector&) const { } -template +template void Matrix::setDiagonals(T value) { if (!isSquare()) @@ -37,13 +37,13 @@ void Matrix::setDiagonals(T value) throw std::logic_error("Requested setting diagonals on non-square Matrix."); } - for (std::size_t idx = 0; idx < M; idx++) + for (size_t idx = 0; idx < M; idx++) { mData[getFlatIndex(idx, idx)] = value; } } -template +template void Matrix::setDiagonals(const Vector& values) { if (!isSquare()) @@ -51,7 +51,7 @@ void Matrix::setDiagonals(const Vector& values) throw std::logic_error("Requested setting diagonals on non-square Matrix."); } - for (std::size_t idx = 0; idx < values.size(); idx++) + for (size_t idx = 0; idx < values.size(); idx++) { if (idx >= M) { @@ -61,8 +61,8 @@ void Matrix::setDiagonals(const Vector& values) } } -template -void Matrix::setItem(std::size_t rowId, std::size_t columnId, T value) +template +void Matrix::setItem(size_t rowId, size_t columnId, T value) { const auto index = getFlatIndex(rowId, columnId); if (index >= mData.size()) @@ -72,7 +72,7 @@ void Matrix::setItem(std::size_t rowId, std::size_t columnId, T value) mData[index] = value; } -template +template bool Matrix::isIdentity() const { if (!isSquare()) @@ -80,9 +80,9 @@ bool Matrix::isIdentity() const return false; } - for(std::size_t idx=0; idx::isIdentity() const return true; } -template -T Matrix::getItem(std::size_t rowId, std::size_t columnId) const +template +T Matrix::getItem(size_t rowId, size_t columnId) const { const auto index = getFlatIndex(rowId, columnId); if (index >= mData.size()) @@ -114,20 +114,20 @@ T Matrix::getItem(std::size_t rowId, std::size_t columnId) const return mData[getFlatIndex(rowId, columnId)]; } -template +template bool Matrix::isSquare() const { return M == N; } -template +template bool Matrix::isEqual(const Matrix& matrix) const { return mData == matrix.mData; } -template -std::size_t Matrix::getFlatIndex(std::size_t rowId, std::size_t columnId) const +template +size_t Matrix::getFlatIndex(size_t rowId, size_t columnId) const { return columnId + rowId*N; } diff --git a/src/base/geometry/math/Matrix.h b/src/base/geometry/math/Matrix.h index 6999238..3333dc4 100644 --- a/src/base/geometry/math/Matrix.h +++ b/src/base/geometry/math/Matrix.h @@ -5,7 +5,7 @@ #include "Vector.h" #include -template +template class Matrix { public: @@ -21,9 +21,9 @@ public: void applyTo(Vector& v) const; - std::size_t getFlatIndex(std::size_t rowId, std::size_t columnId) const; + size_t getFlatIndex(size_t rowId, size_t columnId) const; - T getItem(std::size_t rowId, std::size_t columnId) const; + T getItem(size_t rowId, size_t columnId) const; bool isIdentity() const; @@ -35,7 +35,7 @@ public: void setDiagonals(const Vector& values); - void setItem(std::size_t rowId, std::size_t columnId, T value); + void setItem(size_t rowId, size_t columnId, T value); bool operator==(const Matrix& rhs) const { diff --git a/src/base/geometry/math/Vector.cpp b/src/base/geometry/math/Vector.cpp index b8c73f8..15955cb 100644 --- a/src/base/geometry/math/Vector.cpp +++ b/src/base/geometry/math/Vector.cpp @@ -6,7 +6,7 @@ #include #include -template +template Vector::Vector(Primitive p) { mData = Vector(DIM, 0.0); @@ -33,7 +33,7 @@ Vector::Vector(Primitive p) } } -template +template Vector::Vector(const Vector& values) { mData = Vector(DIM, 0.0); @@ -43,18 +43,18 @@ Vector::Vector(const Vector& values) return; } - for (std::size_t idx = 0; idx < std::min(values.size(), DIM); idx++) + for (size_t idx = 0; idx < std::min(values.size(), DIM); idx++) { mData[idx] = values[idx]; } } -template +template Vector::~Vector() { }; -template +template Vector Vector::add(const Vector& v) const { Vector result = *this; @@ -62,25 +62,25 @@ Vector Vector::add(const Vector& v) const return result; } -template +template void Vector::inPlaceAdd(const Vector& v) { std::transform(mData.begin(), mData.end(), v.mData.begin(), mData.begin(), std::plus()); } -template +template bool Vector::equals(const Vector& v) const { return mData == v.mData; } -template +template void Vector::inPlaceMultiply(double) { //std::transform(mData.begin(), mData.end(), mData.begin(), std::bind(std::multiplies(), std::placeholders::_1, v)); } -template +template Vector Vector::multiply(double v) const { Vector result = *this; @@ -88,14 +88,14 @@ Vector Vector::multiply(double v) const return result; } -template +template void Vector::reverseDirection() { inPlaceMultiply(-1.0); } -template -T Vector::getEntry(std::size_t idx) const +template +T Vector::getEntry(size_t idx) const { if (idx >= DIM) { @@ -104,34 +104,34 @@ T Vector::getEntry(std::size_t idx) const return mData[idx]; } -template +template double Vector::getLength() const { return std::sqrt(getSelfInnerProduct()); } -template +template double Vector::getSelfInnerProduct() const { return 0.0; //return std::inner_product(mData.begin(), mData.end(), mData.begin(), 0.0); } -template +template double Vector::innerPoduct(const Vector&) const { return 0.0; //return std::inner_product(mData.begin(), mData.end(), v.mData.begin(), 0.0); } -template +template Vector Vector::crossProduct(const Vector&) const { return Vector(); //return Vector(v.mY * mZ - v.mZ * mY, v.mZ * mX - v.mX * mZ, v.mX * mY - v.mY * mX); } -template +template Vector Vector::getNormalized() const { const auto length = getLength(); @@ -142,7 +142,7 @@ Vector Vector::getNormalized() const return (*this).multiply(1.0 / length); } -template +template void Vector::scale(const Vector&) { //std::transform(mData.begin(), mData.end(), factors.begin(), mData.begin(), std::multiplies()); diff --git a/src/base/geometry/math/Vector.h b/src/base/geometry/math/Vector.h index 77df354..699912c 100644 --- a/src/base/geometry/math/Vector.h +++ b/src/base/geometry/math/Vector.h @@ -3,7 +3,7 @@ #include "Vector.h" #include -template +template class Vector { public: @@ -35,7 +35,7 @@ public: void reverseDirection(); - T getEntry(std::size_t idx) const; + T getEntry(size_t idx) const; double getLength() const; @@ -79,7 +79,7 @@ public: return !operator==(rhs); } - T operator[](std::size_t idx) const + T operator[](size_t idx) const { return getEntry(idx); } diff --git a/src/base/geometry/path/CubicBezierCurve.cpp b/src/base/geometry/path/CubicBezierCurve.cpp index 914af4d..003379f 100644 --- a/src/base/geometry/path/CubicBezierCurve.cpp +++ b/src/base/geometry/path/CubicBezierCurve.cpp @@ -1,6 +1,6 @@ #include "CubicBezierCurve.h" -template +template CubicBezierCurve::CubicBezierCurve(const Vector& endOffset, const Vector& startControlOffset, const Vector& endControlOffset) : mEndOffset(endOffset), mStartControlOffset(startControlOffset), @@ -9,31 +9,31 @@ CubicBezierCurve::CubicBezierCurve(const Vector& endOffset, co } -template +template Vector CubicBezierCurve::getEndOffset() const { return mEndOffset; } -template +template const Vector& CubicBezierCurve::getStartControlOffset() const { return mStartControlOffset; } -template +template const Vector& CubicBezierCurve::getEndControlOffset() const { return mEndControlOffset; } -template +template Bounds CubicBezierCurve::getBounds() const { return {}; } -template +template CurveType CubicBezierCurve::getCurveType() const { return CurveType::CUBIC_BEZIER; diff --git a/src/base/geometry/path/CubicBezierCurve.h b/src/base/geometry/path/CubicBezierCurve.h index e7fc905..0cc2146 100644 --- a/src/base/geometry/path/CubicBezierCurve.h +++ b/src/base/geometry/path/CubicBezierCurve.h @@ -3,7 +3,7 @@ #include "Curve.h" #include "Vector.h" -template +template class CubicBezierCurve : public Curve { public: diff --git a/src/base/geometry/path/Curve.h b/src/base/geometry/path/Curve.h index af51d0f..11dc0c3 100644 --- a/src/base/geometry/path/Curve.h +++ b/src/base/geometry/path/Curve.h @@ -10,7 +10,7 @@ enum class CurveType UNKNOWN }; -template +template class Curve : public PathElement { public: diff --git a/src/base/geometry/path/Line.cpp b/src/base/geometry/path/Line.cpp index d0b5d70..fd89179 100644 --- a/src/base/geometry/path/Line.cpp +++ b/src/base/geometry/path/Line.cpp @@ -1,18 +1,18 @@ #include "Line.h" -template +template Line::Line(const PointCollection& points) : mPoints(points) { } -template +template Line::Line(InputBufferType bufferType, const Vector& buffer) { if (bufferType == InputBufferType::XY) { - for (std::size_t idx = 0; idx < buffer.size(); idx += 2) + for (size_t idx = 0; idx < buffer.size(); idx += 2) { const auto x = buffer[idx]; const auto y = buffer[idx + 1]; @@ -21,39 +21,39 @@ Line::Line(InputBufferType bufferType, const Vector& buffer) } else if (bufferType == InputBufferType::HORIZONTAL) { - for (std::size_t idx = 0; idx < buffer.size(); idx ++) + for (size_t idx = 0; idx < buffer.size(); idx ++) { mPoints.addPoint(Point(buffer[idx], 0.0)); } } else if (bufferType == InputBufferType::VERTICAL) { - for (std::size_t idx = 0; idx < buffer.size(); idx++) + for (size_t idx = 0; idx < buffer.size(); idx++) { mPoints.addPoint(Point(0.0, buffer[idx])); } } } -template +template Vector Line::getEndOffset() const { return mPoints.getEndPoint().getOriginOffset(); } -template +template const PointCollection& Line::getPoints() const { return mPoints; } -template +template AbstractGeometricItem::Type Line::getType() const { return AbstractGeometricItem::Type::LINE; } -template +template Bounds Line::getBounds() const { auto bounds = mPoints.getBounds(); diff --git a/src/base/geometry/path/Line.h b/src/base/geometry/path/Line.h index 25a6f6c..5296ad9 100644 --- a/src/base/geometry/path/Line.h +++ b/src/base/geometry/path/Line.h @@ -6,7 +6,7 @@ #include "Vector.h" #include "String.h" -template +template class Line : public PathElement { public: diff --git a/src/base/geometry/path/LineSegment.cpp b/src/base/geometry/path/LineSegment.cpp index 20c8112..755a21a 100644 --- a/src/base/geometry/path/LineSegment.cpp +++ b/src/base/geometry/path/LineSegment.cpp @@ -1,6 +1,6 @@ #include "LineSegment.h" -template +template LineSegment::LineSegment(const Point& p0, const Point& p1) : mP0(p0), mP1(p1) @@ -8,43 +8,43 @@ LineSegment::LineSegment(const Point& p0, const Point& p1) } -template +template Ptr > LineSegment ::Create(const Point& p0, const Point& p1) { return std::make_unique >(p0, p1); } -template +template double LineSegment ::getLength() const { return mP0.getDistance(mP1); } -template +template const Point& LineSegment ::getPoint0() const { return mP0; } -template +template const Point& LineSegment ::getPoint1() const { return mP1; } -template +template bool LineSegment::isHorizontal() const { return mP0.getDeltaY(mP1) == 0.0; } -template +template bool LineSegment::isVertical() const { return mP0.getDeltaX(mP1) == 0.0; } -template +template Bounds LineSegment::getBounds() const { const auto minX = std::min(mP0.getX(), mP1.getX()); @@ -56,19 +56,19 @@ Bounds LineSegment::getBounds() const return {minX, maxX, minY, maxY}; } -template +template Vector LineSegment::getEndOffset() const { return getPoint1().getOriginOffset(); } -template +template AbstractGeometricItem::Type LineSegment::getType() const { return AbstractGeometricItem::Type::LINE_SEGMENT; } -template +template Vector LineSegment::asVector() const { return mP1.getDelta(mP0); diff --git a/src/base/geometry/path/LineSegment.h b/src/base/geometry/path/LineSegment.h index 9d83eba..edd88b9 100644 --- a/src/base/geometry/path/LineSegment.h +++ b/src/base/geometry/path/LineSegment.h @@ -3,7 +3,7 @@ #include "PathElement.h" #include "Point.h" -template +template class LineSegment : public PathElement { public: diff --git a/src/base/geometry/path/Path.h b/src/base/geometry/path/Path.h index 1634cb8..294d3fb 100644 --- a/src/base/geometry/path/Path.h +++ b/src/base/geometry/path/Path.h @@ -3,7 +3,7 @@ #include "PathElement.h" #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" using PathElementPtr = Ptr >; diff --git a/src/base/geometry/path/PathElement.cpp b/src/base/geometry/path/PathElement.cpp index e923f44..6c3ebc5 100644 --- a/src/base/geometry/path/PathElement.cpp +++ b/src/base/geometry/path/PathElement.cpp @@ -1,6 +1,6 @@ #include "PathElement.h" -template +template PathElement::~PathElement() { diff --git a/src/base/geometry/path/PathElement.h b/src/base/geometry/path/PathElement.h index 486abf0..0458ae7 100644 --- a/src/base/geometry/path/PathElement.h +++ b/src/base/geometry/path/PathElement.h @@ -9,7 +9,7 @@ enum class PathOffsetType ABSOLUTE_TO }; -template +template class PathElement : public AbstractGeometricItem { public: diff --git a/src/base/geometry/path/QuadraticBezierCurve.cpp b/src/base/geometry/path/QuadraticBezierCurve.cpp index d96a0fd..db162da 100644 --- a/src/base/geometry/path/QuadraticBezierCurve.cpp +++ b/src/base/geometry/path/QuadraticBezierCurve.cpp @@ -1,6 +1,6 @@ #include "QuadraticBezierCurve.h" -template +template QuadraticBezierCurve::QuadraticBezierCurve(const Vector& endOffset, const Vector& controlOffset) : mEndOffset(endOffset), mControlOffset(controlOffset) @@ -8,25 +8,25 @@ QuadraticBezierCurve::QuadraticBezierCurve(const Vector& endOf } -template +template Vector QuadraticBezierCurve::getEndOffset() const { return mEndOffset; } -template +template const Vector& QuadraticBezierCurve::getControlOffset() const { return mControlOffset; } -template +template Bounds QuadraticBezierCurve::getBounds() const { return {}; } -template +template CurveType QuadraticBezierCurve::getCurveType() const { return CurveType::QUADRATIC_BEZIER; diff --git a/src/base/geometry/path/QuadraticBezierCurve.h b/src/base/geometry/path/QuadraticBezierCurve.h index 28125c2..d0b7eea 100644 --- a/src/base/geometry/path/QuadraticBezierCurve.h +++ b/src/base/geometry/path/QuadraticBezierCurve.h @@ -3,7 +3,7 @@ #include "Curve.h" #include "Point.h" -template +template class QuadraticBezierCurve : public Curve { public: diff --git a/src/base/geometry/points/DiscretePoint.h b/src/base/geometry/points/DiscretePoint.h index 6dfbc9a..d9ca8c9 100644 --- a/src/base/geometry/points/DiscretePoint.h +++ b/src/base/geometry/points/DiscretePoint.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class DiscretePoint { diff --git a/src/base/geometry/points/Point.cpp b/src/base/geometry/points/Point.cpp index 9f61198..516e4b4 100644 --- a/src/base/geometry/points/Point.cpp +++ b/src/base/geometry/points/Point.cpp @@ -6,13 +6,13 @@ #include #include -template +template Point Point::from(const Point<2>& p) { return Point(p.getX(), p.getY()); } -template +template Point::Point(double x, double y, double z) { mCoords = Vector(DIM); @@ -30,24 +30,24 @@ Point::Point(double x, double y, double z) } } -template +template Point::Point(const Vector& v) { mCoords = Vector(DIM); - for (std::size_t idx = 0; idx < DIM; idx++) + for (size_t idx = 0; idx < DIM; idx++) { mCoords[idx] = v.getEntry(idx); } } -template +template Point::Point(const DiscretePoint& point) : Point(static_cast(point.getX()), static_cast(point.getY()), 0.0) { } -template +template Point::Point(const Point& reference, double offSetX, double offSetY, double offSetZ) { mCoords = Vector(DIM); @@ -65,12 +65,12 @@ Point::Point(const Point& reference, double offSetX, double offSetY, d } } -template +template Point::~Point() { }; -template +template double Point::getX() const { if (DIM > 0) @@ -83,7 +83,7 @@ double Point::getX() const } } -template +template double Point::getY() const { if (DIM > 1) @@ -96,7 +96,7 @@ double Point::getY() const } } -template +template double Point::getZ() const { if (DIM > 2) @@ -109,7 +109,7 @@ double Point::getZ() const } } -template +template double Point::getDistance(const Point& point) const { const auto deltaX = getDeltaX(point); @@ -118,50 +118,50 @@ double Point::getDistance(const Point& point) const return std::sqrt(deltaX* deltaX + deltaY* deltaY + deltaZ* deltaZ); } -template +template Vector Point::getDelta(const Point& point) const { return Vector({ point.getX() - getX(), point.getY() - getY(), point.getZ() - getZ() }); } -template +template double Point::getDeltaX(const Point& point) const { return point.getX() - getX(); } -template +template double Point::getDeltaY(const Point& point) const { return point.getY() - getY(); } -template +template double Point::getDeltaZ(const Point& point) const { return point.getZ() - getZ(); } -template +template bool Point::isAtOrigin() const { return std::accumulate(mCoords.begin(), mCoords.end(), 0.0) == 0.0; } -template +template Vector Point::getOriginOffset() const { return Vector(mCoords); } -template +template void Point::apply(const Transform& transform) { moveBy(-transform.getLocation().getX(), -transform.getLocation().getY(), -transform.getLocation().getZ()); scale(transform.getScale().mX, transform.getScale().mY, transform.getScale().mZ); } -template +template void Point::scale(double x, double y, double z) { if (DIM > 0) @@ -178,7 +178,7 @@ void Point::scale(double x, double y, double z) } } -template +template void Point::moveBy(double x, double y, double z) { if (DIM > 0) @@ -195,16 +195,16 @@ void Point::moveBy(double x, double y, double z) } } -template +template void Point::moveBy(const Vector& vector) { - for (std::size_t idx = 0; idx < DIM; idx++) + for (size_t idx = 0; idx < DIM; idx++) { mCoords[idx] += vector.getEntry(idx); } } -template +template bool Point::isEqual(const Point& rhs) const { return mCoords == rhs.mCoords; diff --git a/src/base/geometry/points/Point.h b/src/base/geometry/points/Point.h index e95e594..9627c70 100644 --- a/src/base/geometry/points/Point.h +++ b/src/base/geometry/points/Point.h @@ -3,11 +3,11 @@ #include "DiscretePoint.h" #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" class Transform; -template +template class Point { public: diff --git a/src/base/geometry/points/PointCollection.cpp b/src/base/geometry/points/PointCollection.cpp index d8a4e74..7d388ce 100644 --- a/src/base/geometry/points/PointCollection.cpp +++ b/src/base/geometry/points/PointCollection.cpp @@ -1,13 +1,13 @@ #include "PointCollection.h" -template +template PointCollection::PointCollection(const Vector > points) : mPoints(points) { } -template +template void PointCollection::apply(const Transform& transform) { for (auto& point : mPoints) @@ -16,13 +16,13 @@ void PointCollection::apply(const Transform& transform) } } -template +template void PointCollection::addPoint(const Point& point) { mPoints.push_back(point); } -template +template Bounds PointCollection::getBounds() const { Bounds bounds{0.0, 0.0, 0.0, 0.0}; @@ -40,7 +40,7 @@ Bounds PointCollection::getBounds() const return bounds; } -template +template Point PointCollection::getEndPoint() const { if (mPoints.empty()) @@ -53,7 +53,7 @@ Point PointCollection::getEndPoint() const } } -template +template const Vector >& PointCollection::getPoints() const { return mPoints; diff --git a/src/base/geometry/points/PointCollection.h b/src/base/geometry/points/PointCollection.h index 62ef6c9..d8ed078 100644 --- a/src/base/geometry/points/PointCollection.h +++ b/src/base/geometry/points/PointCollection.h @@ -6,7 +6,7 @@ #include "Vector.h" -template +template class PointCollection { public: diff --git a/src/base/geometry/points/PointParser.cpp b/src/base/geometry/points/PointParser.cpp index 1f2bf12..a04b0a4 100644 --- a/src/base/geometry/points/PointParser.cpp +++ b/src/base/geometry/points/PointParser.cpp @@ -2,17 +2,17 @@ #include -String PointParser::toString(const Point2& p, const String& delimiter, std::size_t precision) +String PointParser::toString(const Point2& p, const String& delimiter, size_t precision) { return toString(p.getX(), p.getY(), delimiter, precision); } -String PointParser::toString(const Vector2& v, const String& delimiter, std::size_t precision) +String PointParser::toString(const Vector2& v, const String& delimiter, size_t precision) { return toString(v.getEntry(0), v.getEntry(1), delimiter, precision); } -String PointParser::toString(double x, double y, const String& delimiter, std::size_t precision) +String PointParser::toString(double x, double y, const String& delimiter, size_t precision) { if (precision == 0) { @@ -27,7 +27,7 @@ String PointParser::toString(double x, double y, const String& delimiter, std::s } } -String PointParser::toString(double x, std::size_t precision) +String PointParser::toString(double x, size_t precision) { if (precision == 0) { diff --git a/src/base/geometry/points/PointParser.h b/src/base/geometry/points/PointParser.h index 3f7b646..3dbd9b1 100644 --- a/src/base/geometry/points/PointParser.h +++ b/src/base/geometry/points/PointParser.h @@ -7,11 +7,11 @@ class PointParser { public: - static String toString(const Point2& p, const String& delimiter = " ", std::size_t precision = 0); + static String toString(const Point2& p, const String& delimiter = " ", size_t precision = 0); - static String toString(const Vector2& v, const String& delimiter = " ", std::size_t precision = 0); + static String toString(const Vector2& v, const String& delimiter = " ", size_t precision = 0); - static String toString(double x, double y, const String& delimiter = " ", std::size_t precision = 0); + static String toString(double x, double y, const String& delimiter = " ", size_t precision = 0); - static String toString(double x, std::size_t precision = 0); + static String toString(double x, size_t precision = 0); }; diff --git a/src/base/geometry/primitives/Polygon.cpp b/src/base/geometry/primitives/Polygon.cpp index 543a605..4d924d0 100644 --- a/src/base/geometry/primitives/Polygon.cpp +++ b/src/base/geometry/primitives/Polygon.cpp @@ -1,26 +1,26 @@ #include "Polygon.h" namespace ntk { - template + template Polygon::Polygon(const Vector >& points) : AbstractGeometricItem() { mPoints = PointCollection(points); } - template + template const PointCollection& Polygon::getPoints() const { return mPoints; } - template + template Bounds Polygon::getBounds() const { return mPoints.getBounds(); } - template + template AbstractGeometricItem::Type Polygon::getType() const { return Polygon::Type::POLYGON; diff --git a/src/base/geometry/primitives/Polygon.h b/src/base/geometry/primitives/Polygon.h index 49c2586..000341b 100644 --- a/src/base/geometry/primitives/Polygon.h +++ b/src/base/geometry/primitives/Polygon.h @@ -5,7 +5,7 @@ #include "PointCollection.h" namespace ntk{ -template +template class Polygon : public AbstractGeometricItem { public: diff --git a/src/base/network/NetworkManager.h b/src/base/network/NetworkManager.h index 49f05ae..9fe4eab 100644 --- a/src/base/network/NetworkManager.h +++ b/src/base/network/NetworkManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" #include "HttpClient.h" diff --git a/src/base/network/client/HttpClient.h b/src/base/network/client/HttpClient.h index e838799..9096e33 100644 --- a/src/base/network/client/HttpClient.h +++ b/src/base/network/client/HttpClient.h @@ -4,7 +4,7 @@ #include "HttpRequest.h" #include "HttpResponse.h" -#include "Memory.h" +#include "Pointer.h" class HttpClient { diff --git a/src/base/network/server/HttpServer.h b/src/base/network/server/HttpServer.h index 310ed40..1de1f92 100644 --- a/src/base/network/server/HttpServer.h +++ b/src/base/network/server/HttpServer.h @@ -2,7 +2,7 @@ #include "PlatformSocketServer.h" -#include "Memory.h" +#include "Pointer.h" class AbstractWebApp; class Socket; diff --git a/src/base/network/server/UnixSocketServer.h b/src/base/network/server/UnixSocketServer.h index 0a51a6c..71a4039 100644 --- a/src/base/network/server/UnixSocketServer.h +++ b/src/base/network/server/UnixSocketServer.h @@ -3,7 +3,7 @@ #include "PlatformSocketServer.h" #include "ThreadCollection.h" -#include "Memory.h" +#include "Pointer.h" class BerkeleySocket; diff --git a/src/base/network/server/WinsockServer.h b/src/base/network/server/WinsockServer.h index 007213e..b7ad956 100644 --- a/src/base/network/server/WinsockServer.h +++ b/src/base/network/server/WinsockServer.h @@ -4,7 +4,7 @@ #include "ThreadCollection.h" #include "WinsockInterface.h" -#include "Memory.h" +#include "Pointer.h" class WinsockSocket; class WinsockInterface; diff --git a/src/base/network/server/win32/Win32WebRequest.h b/src/base/network/server/win32/Win32WebRequest.h index 6052c29..78ec846 100644 --- a/src/base/network/server/win32/Win32WebRequest.h +++ b/src/base/network/server/win32/Win32WebRequest.h @@ -14,7 +14,7 @@ #include #include "String.h" -#include "Memory.h" +#include "Pointer.h" #include "Win32Buffer.h" diff --git a/src/base/network/sockets/Socket.h b/src/base/network/sockets/Socket.h index 6c51706..ebc012a 100644 --- a/src/base/network/sockets/Socket.h +++ b/src/base/network/sockets/Socket.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include diff --git a/src/console/MainApplication.h b/src/console/MainApplication.h index ab8f96a..f56a70c 100644 --- a/src/console/MainApplication.h +++ b/src/console/MainApplication.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include #include "AbstractApp.h" diff --git a/src/console/TermInfo.cpp b/src/console/TermInfo.cpp index 499aa77..897bc6a 100644 --- a/src/console/TermInfo.cpp +++ b/src/console/TermInfo.cpp @@ -35,7 +35,7 @@ bool TermInfo::load_terminfo(const String& terminfo_dir, Vector content; file.readBinary(content); short header_size = 12; - if (content.size() < static_cast(header_size)) + if (content.size() < static_cast(header_size)) { std::cerr << "terminfo file missing header: " << content.size() << std::endl; return false; @@ -53,14 +53,14 @@ bool TermInfo::load_terminfo(const String& terminfo_dir, //short string_table_size = 256*content[11] + content[10]; std::cout << "got name size: " << name_size << std::endl; - const auto bool_offset = static_cast(header_size + name_size); + const auto bool_offset = static_cast(header_size + name_size); if (content.size() < bool_offset) { std::cerr << "unexpected terminfo size" << std::endl; } Vector names; String working_name; - for(std::size_t idx=header_size; idx AudioSample::Create() return std::make_unique(); } -std::size_t AudioSample::getNumChannels() const +size_t AudioSample::getNumChannels() const { return mData.size(); } @@ -25,7 +25,7 @@ unsigned AudioSample::getBitDepth() const return mBitDepth; } -void AudioSample::setChannelData(const ChannelData& data, std::size_t channel) +void AudioSample::setChannelData(const ChannelData& data, size_t channel) { if (mData.size() == channel) { @@ -37,7 +37,7 @@ void AudioSample::setChannelData(const ChannelData& data, std::size_t channel) } } -AudioSample::ChannelData AudioSample::getChannelData(std::size_t channel) const +AudioSample::ChannelData AudioSample::getChannelData(size_t channel) const { if(mData.size() > channel) { diff --git a/src/media/audio/AudioSample.h b/src/media/audio/AudioSample.h index d367e4a..0c6a836 100644 --- a/src/media/audio/AudioSample.h +++ b/src/media/audio/AudioSample.h @@ -1,7 +1,7 @@ #pragma once #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" class AudioSample { @@ -12,12 +12,12 @@ public: static Ptr Create(); - ChannelData getChannelData(std::size_t channel) const; - std::size_t getNumChannels() const; + ChannelData getChannelData(size_t channel) const; + size_t getNumChannels() const; unsigned getSampleRate() const; unsigned getBitDepth() const; - void setChannelData(const ChannelData& data, std::size_t channel); + void setChannelData(const ChannelData& data, size_t channel); private: unsigned mSampleRate { 44100 }; diff --git a/src/media/audio/AudioWriter.h b/src/media/audio/AudioWriter.h index 6dd2c23..972da1a 100644 --- a/src/media/audio/AudioWriter.h +++ b/src/media/audio/AudioWriter.h @@ -1,7 +1,7 @@ #pragma once #include "String.h" -#include "Memory.h" +#include "Pointer.h" #include class AudioSample; diff --git a/src/media/audio/audio_interfaces/AlsaInterface.h b/src/media/audio/audio_interfaces/AlsaInterface.h index 1f71969..2174f24 100644 --- a/src/media/audio/audio_interfaces/AlsaInterface.h +++ b/src/media/audio/audio_interfaces/AlsaInterface.h @@ -3,7 +3,7 @@ #include "IAudioInterface.h" #include -#include "Memory.h" +#include "Pointer.h" class AlsaInterface : public IAudioInterface { diff --git a/src/media/audio/audio_interfaces/IAudioInterface.h b/src/media/audio/audio_interfaces/IAudioInterface.h index 5851e97..3cbd6dd 100644 --- a/src/media/audio/audio_interfaces/IAudioInterface.h +++ b/src/media/audio/audio_interfaces/IAudioInterface.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class AudioDevice; class AudioSample; diff --git a/src/media/audio/audio_interfaces/NullAudioInterface.h b/src/media/audio/audio_interfaces/NullAudioInterface.h index c10cc0d..67ef993 100644 --- a/src/media/audio/audio_interfaces/NullAudioInterface.h +++ b/src/media/audio/audio_interfaces/NullAudioInterface.h @@ -3,7 +3,7 @@ #include "IAudioInterface.h" #include "AudioDevice.h" -#include "Memory.h" +#include "Pointer.h" class NullAudioInterface : public IAudioInterface { diff --git a/src/media/audio/audio_interfaces/WasapiInterface.h b/src/media/audio/audio_interfaces/WasapiInterface.h index a153c08..23aa35b 100644 --- a/src/media/audio/audio_interfaces/WasapiInterface.h +++ b/src/media/audio/audio_interfaces/WasapiInterface.h @@ -2,7 +2,7 @@ #include "IAudioInterface.h" -#include "Memory.h" +#include "Pointer.h" class AudioDevice; diff --git a/src/media/image/Image.cpp b/src/media/image/Image.cpp index 4598c28..3a9843c 100644 --- a/src/media/image/Image.cpp +++ b/src/media/image/Image.cpp @@ -43,7 +43,7 @@ void Image::setPixelValues(const Indices& indices, const Vector& colors) assert(indices.size() == colors.size()); - for (std::size_t idx=0; idx< indices.size(); idx++) + for (size_t idx=0; idx< indices.size(); idx++) { const auto id = indices[idx]; mGrid->getItem(id.first, id.second).setColor(colors[idx]); @@ -86,12 +86,12 @@ SerializeableGrid* Image::getGrid() const return mGrid.get(); } -uint8_t Image::getByte(std::size_t index) const +uint8_t Image::getByte(size_t index) const { return mGrid->getByte(index); } -void Image::toBuffer(uint8_t* buffer, std::size_t bufferMaxSize) +void Image::toBuffer(uint8_t* buffer, size_t bufferMaxSize) { mGrid->toBuffer(buffer, bufferMaxSize); } diff --git a/src/media/image/Image.h b/src/media/image/Image.h index 128472f..a01112f 100644 --- a/src/media/image/Image.h +++ b/src/media/image/Image.h @@ -3,7 +3,7 @@ #include "PlatformImage.h" #include "Pixel.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class Color; @@ -14,7 +14,7 @@ class SerializeableGrid; class Image { public: - using Index = std::pair; + using Index = std::pair; using Indices = Vector; Image(unsigned width, unsigned height, Color::Format format = Color::Format::RGBA); @@ -27,7 +27,7 @@ public: unsigned getBitDepth() const; unsigned getNumChannels() const; - uint8_t getByte(std::size_t index) const; + uint8_t getByte(size_t index) const; SerializeableGrid* getGrid() const; Color::Format getFormat() const; @@ -39,7 +39,7 @@ public: void setBitDepth(unsigned bitDepth); void setFormat(Color::Format format); - void toBuffer(uint8_t* buffer, std::size_t bufferMaxSize); + void toBuffer(uint8_t* buffer, size_t bufferMaxSize); private: void initialize(); diff --git a/src/media/image/ImageBitStream.cpp b/src/media/image/ImageBitStream.cpp index 3f997f1..fc10b1a 100644 --- a/src/media/image/ImageBitStream.cpp +++ b/src/media/image/ImageBitStream.cpp @@ -15,7 +15,7 @@ bool ImageBitStream::isFinished() const return mByteOffset == static_cast(mImage->getGrid()->getDataSize()); } -Vector ImageBitStream::peekNextNBytes(std::size_t) const +Vector ImageBitStream::peekNextNBytes(size_t) const { return {}; } diff --git a/src/media/image/ImageBitStream.h b/src/media/image/ImageBitStream.h index 2a011f1..b093c3c 100644 --- a/src/media/image/ImageBitStream.h +++ b/src/media/image/ImageBitStream.h @@ -13,7 +13,7 @@ public: bool isFinished() const override; - Vector peekNextNBytes(std::size_t n) const override; + Vector peekNextNBytes(size_t n) const override; std::optional readNextByte() override; diff --git a/src/media/image/Pixel.h b/src/media/image/Pixel.h index c5bb43f..9489732 100644 --- a/src/media/image/Pixel.h +++ b/src/media/image/Pixel.h @@ -11,12 +11,12 @@ public: mColor = color; } - std::size_t getSize() const override + size_t getSize() const override { return mColor.getSize(); } - uint8_t getByte(std::size_t index) const override + uint8_t getByte(size_t index) const override { return mColor.getByte(index); } diff --git a/src/media/image/png/BasicPngWriter.cpp b/src/media/image/png/BasicPngWriter.cpp index a2280e8..9be07f3 100644 --- a/src/media/image/png/BasicPngWriter.cpp +++ b/src/media/image/png/BasicPngWriter.cpp @@ -115,11 +115,11 @@ void BasicPngWriter::writeEndChunk() void BasicPngWriter::writeDataChunks(const BufferBitStream& buffer) { auto num_bytes = buffer.getBuffer().size(); - std::size_t max_bytes{ 32000 }; + size_t max_bytes{ 32000 }; auto num_dat_chunks = num_bytes / max_bytes + 1; - //std::size_t offset = 0; - for (std::size_t idx = 0; idx < num_dat_chunks; idx++) + //size_t offset = 0; + for (size_t idx = 0; idx < num_dat_chunks; idx++) { auto length = max_bytes; if (idx == num_dat_chunks - 1) diff --git a/src/media/image/png/BasicPngWriter.h b/src/media/image/png/BasicPngWriter.h index 78f4e8d..1b27201 100644 --- a/src/media/image/png/BasicPngWriter.h +++ b/src/media/image/png/BasicPngWriter.h @@ -6,7 +6,7 @@ #include "Image.h" #include "DeflateElements.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include diff --git a/src/media/image/png/PngHeader.cpp b/src/media/image/png/PngHeader.cpp index d984027..85045b2 100644 --- a/src/media/image/png/PngHeader.cpp +++ b/src/media/image/png/PngHeader.cpp @@ -72,7 +72,7 @@ void PngHeader::updateData() mData.clear(); const auto num_bytes = sizeof(DWord); - for(std::size_t idx=0; idx class BitStream; diff --git a/src/media/image/png/PngWriter.h b/src/media/image/png/PngWriter.h index c71dd1a..2c7ad81 100644 --- a/src/media/image/png/PngWriter.h +++ b/src/media/image/png/PngWriter.h @@ -4,7 +4,7 @@ #include "IImageWriter.h" #include "DeflateElements.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" class PngWriter : public IImageWriter diff --git a/src/media/image/win32/Win32WicImage.h b/src/media/image/win32/Win32WicImage.h index 2603ce0..639d539 100644 --- a/src/media/image/win32/Win32WicImage.h +++ b/src/media/image/win32/Win32WicImage.h @@ -4,7 +4,7 @@ #include -#include "Memory.h" +#include "Pointer.h" class Win32WicInterface; diff --git a/src/media/video/FfmpegInterface.h b/src/media/video/FfmpegInterface.h index d1598e8..0ba401e 100644 --- a/src/media/video/FfmpegInterface.h +++ b/src/media/video/FfmpegInterface.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class Image; diff --git a/src/media/video/Video.h b/src/media/video/Video.h index b6d7bac..a1d960e 100644 --- a/src/media/video/Video.h +++ b/src/media/video/Video.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "String.h" class Video diff --git a/src/publishing/latex/LatexMathExpression.h b/src/publishing/latex/LatexMathExpression.h index d1502ce..83bcde8 100644 --- a/src/publishing/latex/LatexMathExpression.h +++ b/src/publishing/latex/LatexMathExpression.h @@ -3,7 +3,7 @@ #include "LatexSymbols.h" #include "String.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class LatexMathExpression; @@ -83,7 +83,7 @@ public: void parse(); private: - std::size_t mOpenBraceCount{ 0 }; + size_t mOpenBraceCount{ 0 }; LineState mLineState{ LineState::NONE }; String mWorkingString; diff --git a/src/publishing/latex/LatexSymbols.cpp b/src/publishing/latex/LatexSymbols.cpp index 9ee3079..fdb624b 100644 --- a/src/publishing/latex/LatexSymbols.cpp +++ b/src/publishing/latex/LatexSymbols.cpp @@ -2,7 +2,7 @@ #include "UnicodeUtils.h" -std::unordered_map LatexSymbolLookup::mSymbols = { +Map LatexSymbolLookup::mSymbols = { {"Psi", L"\u03A8"}, {"alpha", L"\u03B1"}, {"beta", L"\u03B2"}, @@ -12,17 +12,17 @@ std::unordered_map LatexSymbolLookup::mSymbols = { {"rangle", L"\u27E9"}, }; -std::unordered_map LatexSymbolLookup::mLeftSymbols = { +Map LatexSymbolLookup::mLeftSymbols = { {LatexMathSymbol::Tag::BRA, L"\u27E8"}, {LatexMathSymbol::Tag::KET, L"\u007C"} }; -std::unordered_map LatexSymbolLookup::mRightSymbols = { +Map LatexSymbolLookup::mRightSymbols = { {LatexMathSymbol::Tag::BRA, L"\u007C"}, {LatexMathSymbol::Tag::KET, L"\u27E9"} }; -std::unordered_map LatexSymbolLookup::mTags = { +Map LatexSymbolLookup::mTags = { {"frac", LatexMathSymbol::Tag::FRAC}, {"bra", LatexMathSymbol::Tag::BRA}, {"ket", LatexMathSymbol::Tag::KET}, diff --git a/src/publishing/latex/LatexSymbols.h b/src/publishing/latex/LatexSymbols.h index a2ab429..615e328 100644 --- a/src/publishing/latex/LatexSymbols.h +++ b/src/publishing/latex/LatexSymbols.h @@ -1,7 +1,7 @@ #pragma once #include "String.h" -#include +#include Map.h #include struct LatexMathSymbol @@ -54,7 +54,7 @@ public: static std::optional getKnownTag(const String& tag); - static std::size_t getNumTagBodies(LatexMathSymbol::Tag tag) + static size_t getNumTagBodies(LatexMathSymbol::Tag tag) { switch (tag) { @@ -83,10 +83,10 @@ public: } private: - static std::unordered_map mLeftSymbols; - static std::unordered_map mRightSymbols; + static Map mLeftSymbols; + static Map mRightSymbols; - static std::unordered_map mSymbols; + static Map mSymbols; - static std::unordered_map mTags; + static Map mTags; }; \ No newline at end of file diff --git a/src/publishing/pdf/PdfDocument.h b/src/publishing/pdf/PdfDocument.h index eaf6985..5dcb2b2 100644 --- a/src/publishing/pdf/PdfDocument.h +++ b/src/publishing/pdf/PdfDocument.h @@ -2,7 +2,7 @@ #include "PdfDictionary.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include "Vector.h" @@ -35,7 +35,7 @@ private: String mVersion {"1.7"}; PdfXRefTablePtr mXRefTable; - std::size_t mXRefOffset{0}; + size_t mXRefOffset{0}; PdfDocumentCatalogPtr mCatalog; }; diff --git a/src/publishing/pdf/PdfObject.h b/src/publishing/pdf/PdfObject.h index 9f038d3..381843d 100644 --- a/src/publishing/pdf/PdfObject.h +++ b/src/publishing/pdf/PdfObject.h @@ -2,7 +2,7 @@ #include "PdfDictionary.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" class PdfXRefTable; diff --git a/src/publishing/pdf/PdfWriter.h b/src/publishing/pdf/PdfWriter.h index ae7b0a5..e218780 100644 --- a/src/publishing/pdf/PdfWriter.h +++ b/src/publishing/pdf/PdfWriter.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "String.h" class PdfDocument; diff --git a/src/publishing/pdf/PdfXRefTable.cpp b/src/publishing/pdf/PdfXRefTable.cpp index fd91dca..16339d8 100644 --- a/src/publishing/pdf/PdfXRefTable.cpp +++ b/src/publishing/pdf/PdfXRefTable.cpp @@ -27,7 +27,7 @@ String PdfXRefTable::toString() return content; } -std::size_t PdfXRefTable::getNextOffset() +size_t PdfXRefTable::getNextOffset() { auto lastNumRecords = mSections[mSections.size() - 1].mRecords.size(); if (lastNumRecords > 0) @@ -45,7 +45,7 @@ std::size_t PdfXRefTable::getNextOffset() } } -void PdfXRefTable::addRecord(std::size_t numBytes, std::size_t generation, unsigned isFree) +void PdfXRefTable::addRecord(size_t numBytes, size_t generation, unsigned isFree) { XRefRecord record; @@ -56,9 +56,9 @@ void PdfXRefTable::addRecord(std::size_t numBytes, std::size_t generation, unsig mLastAddedBytes = numBytes; } -std::size_t PdfXRefTable::getNumEntries() +size_t PdfXRefTable::getNumEntries() { - std::size_t count = 0; + size_t count = 0; for (const auto& section : mSections) { count += section.mRecords.size(); diff --git a/src/publishing/pdf/PdfXRefTable.h b/src/publishing/pdf/PdfXRefTable.h index 96d583f..aa242da 100644 --- a/src/publishing/pdf/PdfXRefTable.h +++ b/src/publishing/pdf/PdfXRefTable.h @@ -1,19 +1,19 @@ #pragma once #include "String.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" struct XRefRecord { - std::size_t mOffsetBytes{0}; - std::size_t mGenerationNumber{0}; + size_t mOffsetBytes{0}; + size_t mGenerationNumber{0}; bool mIsFree{false}; }; struct TableSubSection { - std::size_t mStartIndex{0}; + size_t mStartIndex{0}; Vector mRecords; }; @@ -22,14 +22,14 @@ class PdfXRefTable public: PdfXRefTable(); - void addRecord(std::size_t numBytes, std::size_t generation, unsigned isFree); + void addRecord(size_t numBytes, size_t generation, unsigned isFree); - std::size_t getNextOffset(); + size_t getNextOffset(); - std::size_t getNumEntries(); + size_t getNumEntries(); String toString(); private: - std::size_t mLastAddedBytes{0}; + size_t mLastAddedBytes{0}; Vector mSections; }; diff --git a/src/rendering/fonts/FontGlyph.cpp b/src/rendering/fonts/FontGlyph.cpp index 0607f62..8b9f0c0 100644 --- a/src/rendering/fonts/FontGlyph.cpp +++ b/src/rendering/fonts/FontGlyph.cpp @@ -32,7 +32,7 @@ String GlyphRunOutlines::toPostScriptPath() auto start_point = feature.mSegments[0].mPoints[0]; path += "M" + std::to_string(start_point.getX()) + " " + std::to_string(start_point.getY()) + " "; - for (std::size_t idx = 1; idx < feature.mSegments.size(); idx++) + for (size_t idx = 1; idx < feature.mSegments.size(); idx++) { if (feature.mSegments[idx].mType == GlyphRunSegment::Type::LINE) { diff --git a/src/rendering/fonts/FontGlyph.h b/src/rendering/fonts/FontGlyph.h index b3a9169..6d20d07 100644 --- a/src/rendering/fonts/FontGlyph.h +++ b/src/rendering/fonts/FontGlyph.h @@ -3,7 +3,7 @@ #include "Point.h" #include "Image.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" #include "String.h" diff --git a/src/rendering/fonts/FontReader.h b/src/rendering/fonts/FontReader.h index 27d0e4f..f76ef3f 100644 --- a/src/rendering/fonts/FontReader.h +++ b/src/rendering/fonts/FontReader.h @@ -1,7 +1,7 @@ #pragma once #include "String.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" #include "File.h" #include "IFont.h" diff --git a/src/rendering/fonts/FontsManager.h b/src/rendering/fonts/FontsManager.h index 053cb54..94948c4 100644 --- a/src/rendering/fonts/FontsManager.h +++ b/src/rendering/fonts/FontsManager.h @@ -3,9 +3,9 @@ #include "IFontEngine.h" #include "FontGlyph.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" -#include +#include Map.h class FontsManager { @@ -22,7 +22,7 @@ public: private: bool mUsesGlyphs{ false }; Ptr mFontEngine; - std::unordered_map > mGlyphs; + Map > mGlyphs; }; using FontsManagerPtr = Ptr; diff --git a/src/rendering/fonts/IFontEngine.h b/src/rendering/fonts/IFontEngine.h index e11bf43..0705213 100644 --- a/src/rendering/fonts/IFontEngine.h +++ b/src/rendering/fonts/IFontEngine.h @@ -2,7 +2,7 @@ #include "FontItem.h" -#include "Memory.h" +#include "Pointer.h" #include class FontGlyph; diff --git a/src/rendering/fonts/directx/DirectWriteFontEngine.cpp b/src/rendering/fonts/directx/DirectWriteFontEngine.cpp index d826ebb..bdc5ac7 100644 --- a/src/rendering/fonts/directx/DirectWriteFontEngine.cpp +++ b/src/rendering/fonts/directx/DirectWriteFontEngine.cpp @@ -154,7 +154,7 @@ double DirectWriteFontEngine::getHorizontalAdvance(const FontItem& fontItem, con double total_advance{ 0 }; if (SUCCEEDED(font_face->GetDesignGlyphMetrics(glyph_indices.data(), static_cast(glyph_indices.size()), &metrics[0], false))) { - for (std::size_t idx = 0; idx < utf32_content.size(); idx++) + for (size_t idx = 0; idx < utf32_content.size(); idx++) { const auto design_width = metrics[idx].advanceWidth; // https://learn.microsoft.com/en-us/windows/win32/gdi/device-vs--design-units diff --git a/src/rendering/fonts/directx/DirectWriteFontEngine.h b/src/rendering/fonts/directx/DirectWriteFontEngine.h index 615894a..1206ccb 100644 --- a/src/rendering/fonts/directx/DirectWriteFontEngine.h +++ b/src/rendering/fonts/directx/DirectWriteFontEngine.h @@ -7,7 +7,7 @@ #include #include "Vector.h" -#include +#include Map.h class GlyphOutlineGeometrySink; class OffScreenTextRenderer; @@ -46,8 +46,8 @@ private: bool mIsValid{ false }; - std::unordered_map > mDefaultFontFaces; - std::unordered_map > mSystemFontFamilies; + Map > mDefaultFontFaces; + Map > mSystemFontFamilies; Microsoft::WRL::ComPtr mDWriteFactory; Microsoft::WRL::ComPtr mTextFormat; diff --git a/src/rendering/fonts/directx/DirectWriteHelpers.h b/src/rendering/fonts/directx/DirectWriteHelpers.h index da0995a..91218d6 100644 --- a/src/rendering/fonts/directx/DirectWriteHelpers.h +++ b/src/rendering/fonts/directx/DirectWriteHelpers.h @@ -5,7 +5,7 @@ #include #include -#include "Memory.h" +#include "Pointer.h" static const IID IID_IGlyphOutlineGeometrySink = { 0xaaf6ab8d, 0xd6cf, 0x4a3b, { 0xa6, 0x7a, 0x12, 0xf1, 0x42, 0xe0, 0x6b, 0xb9 } }; class IGlyphOutlineGeometrySink : public IDWriteGeometrySink diff --git a/src/rendering/graphics/DrawingContext.h b/src/rendering/graphics/DrawingContext.h index 14cbc46..78f10e8 100644 --- a/src/rendering/graphics/DrawingContext.h +++ b/src/rendering/graphics/DrawingContext.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class AbstractPainter; diff --git a/src/rendering/graphics/DrawingSurface.h b/src/rendering/graphics/DrawingSurface.h index de90f11..8339b69 100644 --- a/src/rendering/graphics/DrawingSurface.h +++ b/src/rendering/graphics/DrawingSurface.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class Scene; class Image; diff --git a/src/rendering/graphics/PainterFactory.h b/src/rendering/graphics/PainterFactory.h index 6ab3a26..83bcd8b 100644 --- a/src/rendering/graphics/PainterFactory.h +++ b/src/rendering/graphics/PainterFactory.h @@ -2,7 +2,7 @@ #include "AbstractPainter.h" -#include "Memory.h" +#include "Pointer.h" enum class DrawingMode; class DrawingContext; diff --git a/src/rendering/graphics/RasterPainter.h b/src/rendering/graphics/RasterPainter.h index 5ac2d79..6b5f84b 100644 --- a/src/rendering/graphics/RasterPainter.h +++ b/src/rendering/graphics/RasterPainter.h @@ -2,7 +2,7 @@ #include "AbstractPainter.h" -#include "Memory.h" +#include "Pointer.h" class DrawingContext; diff --git a/src/rendering/graphics/directx/DirectX2dPainter.h b/src/rendering/graphics/directx/DirectX2dPainter.h index 422f241..ade3de9 100644 --- a/src/rendering/graphics/directx/DirectX2dPainter.h +++ b/src/rendering/graphics/directx/DirectX2dPainter.h @@ -7,12 +7,12 @@ class SceneModel; -template +template class Point; class DirectX2dInterface; -template +template class Curve; struct ID2D1SolidColorBrush; diff --git a/src/rendering/graphics/directx/DirectXInterface.h b/src/rendering/graphics/directx/DirectXInterface.h index 570ba72..bfcb5dc 100644 --- a/src/rendering/graphics/directx/DirectXInterface.h +++ b/src/rendering/graphics/directx/DirectXInterface.h @@ -4,7 +4,7 @@ #include #include -#include "Memory.h" +#include "Pointer.h" class DirectX2dInterface; diff --git a/src/rendering/graphics/directx/DirectXMesh.h b/src/rendering/graphics/directx/DirectXMesh.h index 85968a0..4b94954 100644 --- a/src/rendering/graphics/directx/DirectXMesh.h +++ b/src/rendering/graphics/directx/DirectXMesh.h @@ -4,7 +4,7 @@ #include #include -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class SceneModel; diff --git a/src/rendering/graphics/directx/DirectXMeshPainter.h b/src/rendering/graphics/directx/DirectXMeshPainter.h index b024042..594a302 100644 --- a/src/rendering/graphics/directx/DirectXMeshPainter.h +++ b/src/rendering/graphics/directx/DirectXMeshPainter.h @@ -3,7 +3,7 @@ #include #include -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class DrawingContext; diff --git a/src/rendering/graphics/directx/DirectXPainter.h b/src/rendering/graphics/directx/DirectXPainter.h index 6023ece..b19ea33 100644 --- a/src/rendering/graphics/directx/DirectXPainter.h +++ b/src/rendering/graphics/directx/DirectXPainter.h @@ -7,7 +7,7 @@ #include #include -#include "Memory.h" +#include "Pointer.h" class DrawingContext; class DirectXMeshPainter; diff --git a/src/rendering/graphics/directx/DirectXTextPainter.h b/src/rendering/graphics/directx/DirectXTextPainter.h index b7e5e2b..3f8f4be 100644 --- a/src/rendering/graphics/directx/DirectXTextPainter.h +++ b/src/rendering/graphics/directx/DirectXTextPainter.h @@ -9,8 +9,8 @@ #include #include -#include -#include "Memory.h" +#include Map.h +#include "Pointer.h" class DrawingContext; class DirectXShaderProgram; diff --git a/src/rendering/graphics/opengl/OpenGlMeshPainter.cpp b/src/rendering/graphics/opengl/OpenGlMeshPainter.cpp index 0e9b061..8356577 100644 --- a/src/rendering/graphics/opengl/OpenGlMeshPainter.cpp +++ b/src/rendering/graphics/opengl/OpenGlMeshPainter.cpp @@ -45,7 +45,7 @@ void OpenGlMeshPainter::initializeBuffers() glGenVertexArrays(1, &mVertexArray); } -void OpenGlMeshPainter::paint(const Vector& verts, const Vector& elements, const Vector& color, bool lines) +void OpenGlMeshPainter::paint(const Vector& verts, const Vector& elements, const Vector& color, bool lines) { glBindVertexArray(mVertexArray); @@ -98,7 +98,7 @@ void OpenGlMeshPainter::paint(SceneModel* model, DrawingContext* context) auto transform = model->getTransform(); auto vertices = model->getMesh()->getVerticesFlat(); - for (std::size_t idx = 0; idx indices; + Vector indices; const bool line_mesh = model->getMesh()->getType() == AbstractMesh::MeshType::LINE; if (line_mesh) { diff --git a/src/rendering/graphics/opengl/OpenGlMeshPainter.h b/src/rendering/graphics/opengl/OpenGlMeshPainter.h index 074ac5f..9a1184c 100644 --- a/src/rendering/graphics/opengl/OpenGlMeshPainter.h +++ b/src/rendering/graphics/opengl/OpenGlMeshPainter.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class DrawingContext; @@ -18,7 +18,7 @@ private: void initializeShader(); void initializeBuffers(); - void paint(const Vector& verts, const Vector& elements, const Vector& color, bool lines = false); + void paint(const Vector& verts, const Vector& elements, const Vector& color, bool lines = false); unsigned mVertexBuffer{0}; unsigned mElementBuffer{0}; diff --git a/src/rendering/graphics/opengl/OpenGlPainter.h b/src/rendering/graphics/opengl/OpenGlPainter.h index 9b5b658..6af41c9 100644 --- a/src/rendering/graphics/opengl/OpenGlPainter.h +++ b/src/rendering/graphics/opengl/OpenGlPainter.h @@ -2,8 +2,8 @@ #include "AbstractPainter.h" -#include -#include "Memory.h" +#include Map.h +#include "Pointer.h" class DrawingContext; class OpenGlMeshPainter; diff --git a/src/rendering/graphics/opengl/OpenGlTextPainter.h b/src/rendering/graphics/opengl/OpenGlTextPainter.h index 1c88f67..9341e89 100644 --- a/src/rendering/graphics/opengl/OpenGlTextPainter.h +++ b/src/rendering/graphics/opengl/OpenGlTextPainter.h @@ -1,7 +1,7 @@ #pragma once -#include -#include "Memory.h" +#include Map.h +#include "Pointer.h" class DrawingContext; class OpenGlFontTexture; @@ -26,5 +26,5 @@ private: unsigned mVertexBuffer{0}; unsigned mVertexArray{0}; Ptr mShaderProgram; - std::unordered_map > mFontTextures; + Map > mFontTextures; }; diff --git a/src/rendering/mesh/AbstractFace.cpp b/src/rendering/mesh/AbstractFace.cpp index d4a0b39..e5df669 100644 --- a/src/rendering/mesh/AbstractFace.cpp +++ b/src/rendering/mesh/AbstractFace.cpp @@ -2,7 +2,7 @@ #include "Edge.h" -AbstractFace::AbstractFace(std::size_t id) +AbstractFace::AbstractFace(size_t id) : mId(id) { @@ -28,7 +28,7 @@ Vector AbstractFace::getVectorAttribute(const String& tag) const return {}; } -void AbstractFace::setIndex(std::size_t idx) +void AbstractFace::setIndex(size_t idx) { mId = idx; } diff --git a/src/rendering/mesh/AbstractFace.h b/src/rendering/mesh/AbstractFace.h index 8d5c730..e600ace 100644 --- a/src/rendering/mesh/AbstractFace.h +++ b/src/rendering/mesh/AbstractFace.h @@ -2,9 +2,9 @@ #include "Point.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" -#include +#include Map.h #include "String.h" class Edge; @@ -19,29 +19,29 @@ public: CCW }; - AbstractFace(std::size_t id=0); + AbstractFace(size_t id=0); virtual ~AbstractFace(); - virtual Vector getNodeIds() const = 0; + virtual Vector getNodeIds() const = 0; void addVectorAttribute(const String& tag, const Vector& values); Vector getVectorAttribute(const String& tag) const; - virtual std::size_t getNumNodes() const = 0; + virtual size_t getNumNodes() const = 0; virtual void associateWidthEdges() = 0; - virtual Vector getEdgeIds() const = 0; + virtual Vector getEdgeIds() const = 0; virtual Vector getNodeLocations(Orientation orientation = Orientation::CCW) const = 0; virtual void replaceEdge(Edge* original, Edge* replacement) = 0; - void setIndex(std::size_t idx); + void setIndex(size_t idx); protected: - std::size_t mId{0}; - std::unordered_map > mVectorAttributes; + size_t mId{0}; + Map > mVectorAttributes; }; diff --git a/src/rendering/mesh/AbstractMesh.h b/src/rendering/mesh/AbstractMesh.h index 147bcc0..51caec0 100644 --- a/src/rendering/mesh/AbstractMesh.h +++ b/src/rendering/mesh/AbstractMesh.h @@ -4,7 +4,7 @@ #include "Node.h" #include "Transform.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" using NodePtr = Ptr; @@ -30,7 +30,7 @@ public: Vector getVerticesFlat(T scaleX = 1.0, T scaleY = 1.0, T scaleZ = 1.0) const { Vector ret(3*mNodes.size()); - for(std::size_t idx = 0; idxgetPoint().getX()/scaleX; @@ -63,6 +63,6 @@ public: const VecNodes& getNodes() const; protected: - std::unordered_map > mVectorAttributes; + Map > mVectorAttributes; VecNodes mNodes; }; diff --git a/src/rendering/mesh/Edge.cpp b/src/rendering/mesh/Edge.cpp index b809981..ef2218a 100644 --- a/src/rendering/mesh/Edge.cpp +++ b/src/rendering/mesh/Edge.cpp @@ -2,14 +2,14 @@ #include "Node.h" -Edge::Edge(Node* node0, Node* node1, std::size_t id) +Edge::Edge(Node* node0, Node* node1, size_t id) : mId(id), mNode0(node0), mNode1(node1) { } -Ptr Edge::Create(Node* node0, Node* node1, std::size_t id) +Ptr Edge::Create(Node* node0, Node* node1, size_t id) { return std::make_unique(node0, node1, id); } @@ -19,12 +19,12 @@ Edge::~Edge() } -std::size_t Edge::getNode0Id() const +size_t Edge::getNode0Id() const { return mNode0->getIndex(); } -std::size_t Edge::getNode1Id() const +size_t Edge::getNode1Id() const { return mNode1->getIndex(); } @@ -75,7 +75,7 @@ Node* Edge::getOtherNode(Node* node) const } } -std::size_t Edge::getId() const +size_t Edge::getId() const { return mId; } @@ -95,17 +95,17 @@ void Edge::clearConnectivity() mAssociatedFaceIds.clear(); } -std::size_t Edge::getNumConnectedFaces() const +size_t Edge::getNumConnectedFaces() const { return mAssociatedFaceIds.size(); } -void Edge::associateFace(std::size_t faceId) +void Edge::associateFace(size_t faceId) { mAssociatedFaceIds.push_back(faceId); } -std::size_t Edge::getConnectedFaceId(std::size_t idx) const +size_t Edge::getConnectedFaceId(size_t idx) const { return mAssociatedFaceIds[idx]; } @@ -116,7 +116,7 @@ void Edge::associateWithNodes() mNode1->associateEdge(mId); } -void Edge::setIndex(std::size_t idx) +void Edge::setIndex(size_t idx) { mId = idx; } diff --git a/src/rendering/mesh/Edge.h b/src/rendering/mesh/Edge.h index 8dd98b3..591e71b 100644 --- a/src/rendering/mesh/Edge.h +++ b/src/rendering/mesh/Edge.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class Node; @@ -14,33 +14,33 @@ public: DIRTY }; - Edge(Node* node0, Node* node1, std::size_t id = 0); + Edge(Node* node0, Node* node1, size_t id = 0); ~Edge(); - static Ptr Create(Node* node0, Node* node1, std::size_t id = 0); + static Ptr Create(Node* node0, Node* node1, size_t id = 0); - void associateFace(std::size_t faceId); + void associateFace(size_t faceId); void associateWithNodes(); void clearConnectivity(); - std::size_t getConnectedFaceId(std::size_t idx) const; + size_t getConnectedFaceId(size_t idx) const; State getState() const; - std::size_t getId() const; + size_t getId() const; - std::size_t getNode0Id() const; + size_t getNode0Id() const; - std::size_t getNode1Id() const; + size_t getNode1Id() const; Node* getNode0() const; Node* getNode1() const; - std::size_t getNumConnectedFaces() const; + size_t getNumConnectedFaces() const; Node* getOtherNode(Node* node) const; @@ -52,14 +52,14 @@ public: void setState(State state); - void setIndex(std::size_t idx); + void setIndex(size_t idx); private: - std::size_t mId{0}; + size_t mId{0}; Node* mNode0{nullptr}; Node* mNode1{nullptr}; - Vector mAssociatedFaceIds; + Vector mAssociatedFaceIds; State mState{State::HEALTHY}; }; diff --git a/src/rendering/mesh/FaceMesh.cpp b/src/rendering/mesh/FaceMesh.cpp index ed0440b..44a5071 100644 --- a/src/rendering/mesh/FaceMesh.cpp +++ b/src/rendering/mesh/FaceMesh.cpp @@ -24,7 +24,7 @@ const VecFaces& FaceMesh::getFaces() const return mFaces; } -Vector FaceMesh::getFaceNodeIds() const +Vector FaceMesh::getFaceNodeIds() const { if (mFaces.empty()) { @@ -32,12 +32,12 @@ Vector FaceMesh::getFaceNodeIds() const } auto nodes_per_face = mFaces[0]->getNumNodes(); - Vector ids(nodes_per_face*mFaces.size()); + Vector ids(nodes_per_face*mFaces.size()); - for(std::size_t idx=0; idxgetNodeIds(); - for(std::size_t jdx=0; jdx FaceMesh::getFaceNodeIds() const Vector > FaceMesh::getFaceVectorAttributes(const String& tag) { Vector > attribs(mFaces.size()); - for(std::size_t idx=0; idxgetVectorAttribute(tag)}; } @@ -65,7 +65,7 @@ void FaceMesh::addConstantFaceVectorAttribute(const String& tag, const VectorsetIndex(count); @@ -113,7 +113,7 @@ void FaceMesh::replaceIfOverlapping(FaceMesh* mesh, Node* target_node) const if (node->getNumConnectedEdges() == 3 && node->isCoincident(target_node)) { target_node->setState(Node::State::DIRTY); - for (std::size_t idx=0; idx<3; idx++) + for (size_t idx=0; idx<3; idx++) { auto edge = mesh->mEdges[idx].get(); edge->replaceNodes(target_node, node.get()); @@ -130,7 +130,7 @@ void FaceMesh::replaceIfOverlapping(FaceMesh* mesh, Edge* target_edge) const if (edge->getNumConnectedFaces() == 2 && target_edge->hasSameNodes(edge.get())) { target_edge->setState(Edge::State::DIRTY); - for (std::size_t idx=0; idx<2; idx++) + for (size_t idx=0; idx<2; idx++) { auto face = mesh->mFaces[idx].get(); face->replaceEdge(target_edge, edge.get()); @@ -140,10 +140,10 @@ void FaceMesh::replaceIfOverlapping(FaceMesh* mesh, Edge* target_edge) const } } -Vector FaceMesh::getEdgeNodeIds() const +Vector FaceMesh::getEdgeNodeIds() const { - Vector ids(2*mEdges.size()); - for(std::size_t idx=0; idx ids(2*mEdges.size()); + for(size_t idx=0; idxgetNode0Id(); ids[2*idx + 1] = mEdges[idx]->getNode1Id(); diff --git a/src/rendering/mesh/FaceMesh.h b/src/rendering/mesh/FaceMesh.h index 46d3554..00840f3 100644 --- a/src/rendering/mesh/FaceMesh.h +++ b/src/rendering/mesh/FaceMesh.h @@ -3,7 +3,7 @@ #include "AbstractMesh.h" #include "String.h" -#include +#include Map.h class Edge; class AbstractFace; @@ -25,9 +25,9 @@ public: void populate(VecNodes& nodes, VecEdges& edges, VecFaces& faces); - Vector getFaceNodeIds() const; + Vector getFaceNodeIds() const; - Vector getEdgeNodeIds() const; + Vector getEdgeNodeIds() const; void addConstantFaceVectorAttribute(const String& tag, const Vector& values); diff --git a/src/rendering/mesh/LineMesh.cpp b/src/rendering/mesh/LineMesh.cpp index 911bd3c..f54a381 100644 --- a/src/rendering/mesh/LineMesh.cpp +++ b/src/rendering/mesh/LineMesh.cpp @@ -23,10 +23,10 @@ LineMesh::MeshType LineMesh::getType() const return LineMesh::MeshType::LINE; } -Vector LineMesh::getEdgeNodeIds() const +Vector LineMesh::getEdgeNodeIds() const { - Vector ids(2*mEdges.size()); - for(std::size_t idx=0; idx ids(2*mEdges.size()); + for(size_t idx=0; idxgetNode0Id(); ids[2*idx + 1] = mEdges[idx]->getNode1Id(); diff --git a/src/rendering/mesh/LineMesh.h b/src/rendering/mesh/LineMesh.h index 481466f..e801b43 100644 --- a/src/rendering/mesh/LineMesh.h +++ b/src/rendering/mesh/LineMesh.h @@ -3,7 +3,7 @@ #include "AbstractMesh.h" #include "String.h" -#include +#include Map.h class Edge; using EdgePtr = Ptr; @@ -18,7 +18,7 @@ public: void populate(VecNodes& nodes, VecEdges& edges); - Vector getEdgeNodeIds() const; + Vector getEdgeNodeIds() const; MeshType getType() const override; diff --git a/src/rendering/mesh/MeshBuilder.cpp b/src/rendering/mesh/MeshBuilder.cpp index 4537095..9b9066d 100644 --- a/src/rendering/mesh/MeshBuilder.cpp +++ b/src/rendering/mesh/MeshBuilder.cpp @@ -9,19 +9,19 @@ Ptr MeshBuilder::buildTriMesh(const VecPoints& locations, const EdgeIds auto mesh = std::make_unique(); VecNodes nodes(locations.size()); - for (std::size_t idx=0; idx MeshBuilder::buildLineMesh(const VecPoints& locations, const EdgeI auto mesh = std::make_unique(); VecNodes nodes(locations.size()); - for (std::size_t idx=0; idx >; -using FaceIds = Vector >; +using EdgeIds = Vector >; +using FaceIds = Vector >; using VecPoints = Vector; class MeshBuilder diff --git a/src/rendering/mesh/MeshPrimitives.cpp b/src/rendering/mesh/MeshPrimitives.cpp index cbe40aa..f98148b 100644 --- a/src/rendering/mesh/MeshPrimitives.cpp +++ b/src/rendering/mesh/MeshPrimitives.cpp @@ -32,14 +32,14 @@ Ptr MeshPrimitives::buildRectangleAsTriMesh() return MeshBuilder::buildTriMesh(locations, edge_ids, face_ids); } -Ptr MeshPrimitives::buildCircleAsTriMesh(std::size_t numSegments) +Ptr MeshPrimitives::buildCircleAsTriMesh(size_t numSegments) { VecPoints locations(numSegments + 1); locations[0] = {0, 0}; const double delta_theta = (2.0*M_PI)/double(numSegments); double theta = 0.0; - for(std::size_t idx=1; idx<=numSegments; idx++) + for(size_t idx=1; idx<=numSegments; idx++) { const double x = sin(theta); const double y = cos(theta); @@ -49,7 +49,7 @@ Ptr MeshPrimitives::buildCircleAsTriMesh(std::size_t numSegments) } EdgeIds edge_ids(2*numSegments); - for(std::size_t idx=0; idx MeshPrimitives::buildCircleAsTriMesh(std::size_t numSegments) } FaceIds face_ids(numSegments); - for(std::size_t idx=0; idx MeshPrimitives::buildCircleAsTriMesh(std::size_t numSegments) return MeshBuilder::buildTriMesh(locations, edge_ids, face_ids); } -Ptr MeshPrimitives::buildCircleAsLineMesh(std::size_t numSegments) +Ptr MeshPrimitives::buildCircleAsLineMesh(size_t numSegments) { VecPoints locations(numSegments); //const double delta_theta = (2.0*M_PI)/double(numSegments); @@ -101,10 +101,10 @@ Ptr MeshPrimitives::buildCircleAsLineMesh(std::size_t numSegments) return MeshBuilder::buildLineMesh(locations, edge_ids); } -Ptr MeshPrimitives::buildRoundedRectangleAsTriMesh(double radius, double, std::size_t num_segments) +Ptr MeshPrimitives::buildRoundedRectangleAsTriMesh(double radius, double, size_t num_segments) { - std::size_t num_fans = 4; - std::size_t num_nodes_per_fan = num_segments + 2; + size_t num_fans = 4; + size_t num_nodes_per_fan = num_segments + 2; VecPoints locations(num_fans * num_nodes_per_fan); double rect_start_x = radius; @@ -115,8 +115,8 @@ Ptr MeshPrimitives::buildRoundedRectangleAsTriMesh(double radius, doubl double running_theta = 0; locations[0] = {rect_end_x, radius}; - std::size_t offset = 1; - for (std::size_t idx=0; idx<=num_segments; idx++) + size_t offset = 1; + for (size_t idx=0; idx<=num_segments; idx++) { locations[offset + idx] = {rect_end_x + radius*sin(running_theta), radius*(1.0 - cos(running_theta))}; running_theta += delta_theta; @@ -126,7 +126,7 @@ Ptr MeshPrimitives::buildRoundedRectangleAsTriMesh(double radius, doubl locations[offset] = {rect_end_x, rect_end_y}; offset++; running_theta = 0; - for (std::size_t idx=0; idx<=num_segments;idx++) + for (size_t idx=0; idx<=num_segments;idx++) { locations[offset + idx] = {rect_end_x + radius*cos(running_theta), rect_end_y + radius*sin(running_theta)}; running_theta += delta_theta; @@ -136,7 +136,7 @@ Ptr MeshPrimitives::buildRoundedRectangleAsTriMesh(double radius, doubl locations[offset] = {rect_start_x, rect_end_y}; offset ++; running_theta = 0; - for (std::size_t idx=0; idx<=num_segments;idx++) + for (size_t idx=0; idx<=num_segments;idx++) { locations[offset + idx] = {rect_start_x - radius*sin(running_theta), rect_end_y + radius*cos(running_theta)}; running_theta += delta_theta; @@ -146,37 +146,37 @@ Ptr MeshPrimitives::buildRoundedRectangleAsTriMesh(double radius, doubl locations[offset] = {rect_start_x, radius}; offset++; running_theta = 0; - for (std::size_t idx=0; idx<=num_segments;idx++) + for (size_t idx=0; idx<=num_segments;idx++) { locations[offset + idx] = {rect_start_x - radius*cos(running_theta), radius *(1 - sin(running_theta))}; running_theta += delta_theta; } - std::size_t num_edges_per_fan = 2*num_segments + 1; - std::size_t num_inner_rect_edges = 3*num_fans; + size_t num_edges_per_fan = 2*num_segments + 1; + size_t num_inner_rect_edges = 3*num_fans; EdgeIds edge_ids(num_edges_per_fan*num_fans + num_inner_rect_edges + 1); // Fan edges - for (std::size_t jdx=0; jdx< num_fans; jdx++) + for (size_t jdx=0; jdx< num_fans; jdx++) { - std::size_t node_offset = jdx*num_nodes_per_fan; - std::size_t edge_offset = jdx*num_edges_per_fan; + size_t node_offset = jdx*num_nodes_per_fan; + size_t edge_offset = jdx*num_edges_per_fan; // Inner edges - for(std::size_t idx=0; idx<=num_segments; idx++) + for(size_t idx=0; idx<=num_segments; idx++) { edge_ids[edge_offset + idx] = {node_offset, node_offset + idx + 1}; } // Outer edges - for(std::size_t idx=0; idx MeshPrimitives::buildRectangleAsLineMesh() return MeshBuilder::buildLineMesh(locations, edge_ids); } -Ptr MeshPrimitives::buildExplodedGridAsTriMesh(std::size_t numX, std::size_t numY) +Ptr MeshPrimitives::buildExplodedGridAsTriMesh(size_t numX, size_t numY) { double delta_x = 1.0/double(numX); double delta_y = 1.0/double(numY); @@ -207,9 +207,9 @@ Ptr MeshPrimitives::buildExplodedGridAsTriMesh(std::size_t numX, std::s VecPoints locations (4 * numX * numY); double offset_x = delta_x/2.0; double offset_y = delta_y/2.0; - for (std::size_t idx=0; idx MeshPrimitives::buildExplodedGridAsTriMesh(std::size_t numX, std::s } EdgeIds edge_ids(5 * numX * numY); - for (std::size_t idx=0; idx MeshPrimitives::buildExplodedGridAsTriMesh(std::size_t numX, std::s } FaceIds face_ids(2 *numX * numY); - for (std::size_t idx=0; idx MeshPrimitives::buildExplodedGridAsTriMesh(std::size_t numX, std::s return MeshBuilder::buildTriMesh(locations, edge_ids, face_ids); } -Ptr MeshPrimitives::buildExplodedGridAsLineMesh(std::size_t numX, std::size_t numY) +Ptr MeshPrimitives::buildExplodedGridAsLineMesh(size_t numX, size_t numY) { double delta_x = 1.0/double(numX); double delta_y = 1.0/double(numY); @@ -266,9 +266,9 @@ Ptr MeshPrimitives::buildExplodedGridAsLineMesh(std::size_t numX, std: VecPoints locations (4 * numX * numY); double offset_x = delta_x/2.0; double offset_y = delta_y/2.0; - for (std::size_t idx=0; idx MeshPrimitives::buildExplodedGridAsLineMesh(std::size_t numX, std: } EdgeIds edge_ids(4 * numX * numY); - for (std::size_t idx=0; idx buildCircleAsTriMesh(std::size_t numSegments = 24); + static Ptr buildCircleAsTriMesh(size_t numSegments = 24); - static Ptr buildCircleAsLineMesh(std::size_t numSegments = 24); + static Ptr buildCircleAsLineMesh(size_t numSegments = 24); static Ptr buildRectangleAsTriMesh(); static Ptr buildRectangleAsLineMesh(); - static Ptr buildExplodedGridAsTriMesh(std::size_t numX, std::size_t numY); + static Ptr buildExplodedGridAsTriMesh(size_t numX, size_t numY); - static Ptr buildExplodedGridAsLineMesh(std::size_t numX, std::size_t numY); + static Ptr buildExplodedGridAsLineMesh(size_t numX, size_t numY); - static Ptr buildRoundedRectangleAsTriMesh(double radius, double aspect_ratio = 1.0, std::size_t num_segments = 4); + static Ptr buildRoundedRectangleAsTriMesh(double radius, double aspect_ratio = 1.0, size_t num_segments = 4); }; diff --git a/src/rendering/mesh/Node.cpp b/src/rendering/mesh/Node.cpp index ec63cbf..6bbea9b 100644 --- a/src/rendering/mesh/Node.cpp +++ b/src/rendering/mesh/Node.cpp @@ -1,6 +1,6 @@ #include "Node.h" -Ptr Node::Create(const Point3& p, std::size_t index) +Ptr Node::Create(const Point3& p, size_t index) { return std::make_unique(p, index); } @@ -10,19 +10,19 @@ Node::~Node() } -Node::Node(const Point3& p, std::size_t index) +Node::Node(const Point3& p, size_t index) : mIndex(index), mPoint(p) { } -std::size_t Node::getIndex() const +size_t Node::getIndex() const { return mIndex; } -void Node::updateIndex(std::size_t index) +void Node::updateIndex(size_t index) { mIndex = index; } @@ -73,37 +73,37 @@ void Node::clearConnectivity() mAssociatedFaceIds.clear(); } -std::size_t Node::getNumConnectedEdges() const +size_t Node::getNumConnectedEdges() const { return mAssociatedEdgeIds.size(); } -std::size_t Node::getNumConnectedFaces() const +size_t Node::getNumConnectedFaces() const { return mAssociatedFaceIds.size(); } -void Node::associateEdge(std::size_t edgeId) +void Node::associateEdge(size_t edgeId) { mAssociatedEdgeIds.push_back(edgeId); } -void Node::associateFace(std::size_t faceId) +void Node::associateFace(size_t faceId) { mAssociatedFaceIds.push_back(faceId); } -std::size_t Node::getConnectedEdgeId(std::size_t idx) const +size_t Node::getConnectedEdgeId(size_t idx) const { return mAssociatedEdgeIds[idx]; } -std::size_t Node::getConnectedFaceId(std::size_t idx) const +size_t Node::getConnectedFaceId(size_t idx) const { return mAssociatedFaceIds[idx]; } -void Node::setIndex(std::size_t idx) +void Node::setIndex(size_t idx) { mIndex = idx; } diff --git a/src/rendering/mesh/Node.h b/src/rendering/mesh/Node.h index b8e7822..427c491 100644 --- a/src/rendering/mesh/Node.h +++ b/src/rendering/mesh/Node.h @@ -3,7 +3,7 @@ #include "Point.h" #include "Transform.h" -#include +#include Map.h #include "String.h" #include "Vector.h" @@ -17,31 +17,31 @@ public: DIRTY }; - Node(const Point3& p, std::size_t index = 0); + Node(const Point3& p, size_t index = 0); - static Ptr Create(const Point3& p, std::size_t index = 0); + static Ptr Create(const Point3& p, size_t index = 0); ~Node(); void apply(const Transform& transform); - void associateEdge(std::size_t edgeId); + void associateEdge(size_t edgeId); - void associateFace(std::size_t faceId); + void associateFace(size_t faceId); void addVectorAttribute(const String& tag, const Vector& values); void clearConnectivity(); - std::size_t getIndex() const; + size_t getIndex() const; - std::size_t getNumConnectedEdges() const; + size_t getNumConnectedEdges() const; - std::size_t getNumConnectedFaces() const; + size_t getNumConnectedFaces() const; - std::size_t getConnectedEdgeId(std::size_t idx) const; + size_t getConnectedEdgeId(size_t idx) const; - std::size_t getConnectedFaceId(std::size_t idx) const; + size_t getConnectedFaceId(size_t idx) const; State getState() const; @@ -53,17 +53,17 @@ public: void setState(State state); - void setIndex(std::size_t idx); + void setIndex(size_t idx); - void updateIndex(std::size_t index); + void updateIndex(size_t index); private: - std::unordered_map > mVectorAttributes; - std::size_t mIndex{0}; + Map > mVectorAttributes; + size_t mIndex{0}; Point3 mPoint; - Vector mAssociatedEdgeIds; - Vector mAssociatedFaceIds; + Vector mAssociatedEdgeIds; + Vector mAssociatedFaceIds; State mState{State::HEALTHY}; }; diff --git a/src/rendering/mesh/TriFace.cpp b/src/rendering/mesh/TriFace.cpp index 66e6952..fed5b76 100644 --- a/src/rendering/mesh/TriFace.cpp +++ b/src/rendering/mesh/TriFace.cpp @@ -3,7 +3,7 @@ #include "Edge.h" #include "Node.h" -TriFace::TriFace(Edge* edge0, Edge* edge1, Edge* edge2, std::size_t id) +TriFace::TriFace(Edge* edge0, Edge* edge1, Edge* edge2, size_t id) : AbstractFace(id), mEdge0(edge0), mEdge1(edge1), @@ -12,7 +12,7 @@ TriFace::TriFace(Edge* edge0, Edge* edge1, Edge* edge2, std::size_t id) } -Ptr TriFace::Create(Edge* edge0, Edge* edge1, Edge* edge2, std::size_t id) +Ptr TriFace::Create(Edge* edge0, Edge* edge1, Edge* edge2, size_t id) { return std::make_unique(edge0, edge1, edge2, id); } @@ -22,12 +22,12 @@ TriFace::~TriFace() } -Vector TriFace::getNodeIds() const +Vector TriFace::getNodeIds() const { return {mEdge0->getNode0Id(), mEdge0->getNode1Id(), mEdge1->getNode1Id()}; } -std::size_t TriFace::getNumNodes() const +size_t TriFace::getNumNodes() const { return 3; } @@ -48,22 +48,22 @@ void TriFace::replaceEdge(Edge* original, Edge* replacement) } } -std::size_t TriFace::getEdge0Id () const +size_t TriFace::getEdge0Id () const { return mEdge0->getId(); } -std::size_t TriFace::getEdge1Id () const +size_t TriFace::getEdge1Id () const { return mEdge1->getId(); } -std::size_t TriFace::getEdge2Id () const +size_t TriFace::getEdge2Id () const { return mEdge2->getId(); } -Vector TriFace::getEdgeIds() const +Vector TriFace::getEdgeIds() const { return {mEdge0->getId(), mEdge1->getId(), mEdge2->getId()}; } diff --git a/src/rendering/mesh/TriFace.h b/src/rendering/mesh/TriFace.h index 051f030..48fe0f7 100644 --- a/src/rendering/mesh/TriFace.h +++ b/src/rendering/mesh/TriFace.h @@ -8,24 +8,24 @@ class Edge; class TriFace : public AbstractFace { public: - TriFace(Edge* edge0, Edge* edge1, Edge* edge2, std::size_t id=0); + TriFace(Edge* edge0, Edge* edge1, Edge* edge2, size_t id=0); ~TriFace(); - static Ptr Create(Edge* edge0, Edge* edge1, Edge* edge2, std::size_t id=0); + static Ptr Create(Edge* edge0, Edge* edge1, Edge* edge2, size_t id=0); void associateWidthEdges() override; - Vector getNodeIds() const override; + Vector getNodeIds() const override; - std::size_t getNumNodes() const override; + size_t getNumNodes() const override; void replaceEdge(Edge* original, Edge* replacement) override; - std::size_t getEdge0Id () const; - std::size_t getEdge1Id () const; - std::size_t getEdge2Id () const; - Vector getEdgeIds() const override; + size_t getEdge0Id () const; + size_t getEdge1Id () const; + size_t getEdge2Id () const; + Vector getEdgeIds() const override; Vector getNodeLocations(Orientation orientation = Orientation::CCW) const override; diff --git a/src/rendering/visual_elements/basic_shapes/RectangleNode.h b/src/rendering/visual_elements/basic_shapes/RectangleNode.h index 6b1819d..6889d6d 100644 --- a/src/rendering/visual_elements/basic_shapes/RectangleNode.h +++ b/src/rendering/visual_elements/basic_shapes/RectangleNode.h @@ -2,7 +2,7 @@ #include "GeometryNode.h" -#include "Memory.h" +#include "Pointer.h" class RectangleNode : public GeometryNode { diff --git a/src/rendering/visual_elements/nodes/AbstractVisualNode.cpp b/src/rendering/visual_elements/nodes/AbstractVisualNode.cpp index ecff7bc..e811332 100644 --- a/src/rendering/visual_elements/nodes/AbstractVisualNode.cpp +++ b/src/rendering/visual_elements/nodes/AbstractVisualNode.cpp @@ -12,7 +12,7 @@ AbstractVisualNode::~AbstractVisualNode() } -SceneItem* AbstractVisualNode::getSceneItem(std::size_t idx) const +SceneItem* AbstractVisualNode::getSceneItem(size_t idx) const { if (idx < mSceneItems.size()) { @@ -24,7 +24,7 @@ SceneItem* AbstractVisualNode::getSceneItem(std::size_t idx) const } } -std::size_t AbstractVisualNode::getNumSceneItems() const +size_t AbstractVisualNode::getNumSceneItems() const { return mSceneItems.size(); } diff --git a/src/rendering/visual_elements/nodes/AbstractVisualNode.h b/src/rendering/visual_elements/nodes/AbstractVisualNode.h index 88dacd9..283a289 100644 --- a/src/rendering/visual_elements/nodes/AbstractVisualNode.h +++ b/src/rendering/visual_elements/nodes/AbstractVisualNode.h @@ -3,7 +3,7 @@ #include "SceneItem.h" #include "Transform.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include "Vector.h" @@ -18,9 +18,9 @@ public: void addChild(AbstractVisualNode* child); - virtual SceneItem* getSceneItem(std::size_t idx) const; + virtual SceneItem* getSceneItem(size_t idx) const; - virtual std::size_t getNumSceneItems() const; + virtual size_t getNumSceneItems() const; const Vector& getChildren() const; diff --git a/src/rendering/visual_elements/nodes/GeometryNode.cpp b/src/rendering/visual_elements/nodes/GeometryNode.cpp index a1f0a81..dfcaa27 100644 --- a/src/rendering/visual_elements/nodes/GeometryNode.cpp +++ b/src/rendering/visual_elements/nodes/GeometryNode.cpp @@ -16,7 +16,7 @@ GeometryNode::~GeometryNode() } -SceneItem* GeometryNode::getSceneItem(std::size_t idx) const +SceneItem* GeometryNode::getSceneItem(size_t idx) const { if (idx == 0) { @@ -28,7 +28,7 @@ SceneItem* GeometryNode::getSceneItem(std::size_t idx) const } } -std::size_t GeometryNode::getNumSceneItems() const +size_t GeometryNode::getNumSceneItems() const { return 1; } diff --git a/src/rendering/visual_elements/nodes/GeometryNode.h b/src/rendering/visual_elements/nodes/GeometryNode.h index 1cdbb47..d47c229 100644 --- a/src/rendering/visual_elements/nodes/GeometryNode.h +++ b/src/rendering/visual_elements/nodes/GeometryNode.h @@ -24,8 +24,8 @@ public: virtual Type getType() = 0; - SceneItem* getSceneItem(std::size_t idx) const override; - std::size_t getNumSceneItems() const override; + SceneItem* getSceneItem(size_t idx) const override; + size_t getNumSceneItems() const override; double getStrokeThickness() const; void setStrokeThickness(double thickness); diff --git a/src/rendering/visual_elements/nodes/GridNode.cpp b/src/rendering/visual_elements/nodes/GridNode.cpp index 1bdbc1c..a9ee39a 100644 --- a/src/rendering/visual_elements/nodes/GridNode.cpp +++ b/src/rendering/visual_elements/nodes/GridNode.cpp @@ -14,7 +14,7 @@ GridNode::~GridNode() } -void GridNode::setNumX(std::size_t numX) +void GridNode::setNumX(size_t numX) { if (mNumberX != numX) { @@ -23,7 +23,7 @@ void GridNode::setNumX(std::size_t numX) } } -void GridNode::setNumY(std::size_t numY) +void GridNode::setNumY(size_t numY) { if (mNumberY != numY) { @@ -59,7 +59,7 @@ void GridNode::setData(const Vector& colors) } } -SceneItem* GridNode::getSceneItem(std::size_t idx) const +SceneItem* GridNode::getSceneItem(size_t idx) const { if (idx == 0) { @@ -71,7 +71,7 @@ SceneItem* GridNode::getSceneItem(std::size_t idx) const } } -std::size_t GridNode::getNumSceneItems() const +size_t GridNode::getNumSceneItems() const { return 2; } diff --git a/src/rendering/visual_elements/nodes/GridNode.h b/src/rendering/visual_elements/nodes/GridNode.h index 7ae7883..c18e016 100644 --- a/src/rendering/visual_elements/nodes/GridNode.h +++ b/src/rendering/visual_elements/nodes/GridNode.h @@ -12,14 +12,14 @@ public: virtual ~GridNode(); - void setNumX(std::size_t numX); + void setNumX(size_t numX); - void setNumY(std::size_t numY); + void setNumY(size_t numY); void setData(const Vector& colors); - SceneItem* getSceneItem(std::size_t idx) const override; - std::size_t getNumSceneItems() const override; + SceneItem* getSceneItem(size_t idx) const override; + size_t getNumSceneItems() const override; void update(SceneInfo* sceneInfo) override; @@ -27,8 +27,8 @@ public: void setHeight(double height); private: - std::size_t mNumberX{5}; - std::size_t mNumberY{5}; + size_t mNumberX{5}; + size_t mNumberY{5}; double mWidth{1}; double mHeight{1}; diff --git a/src/rendering/visual_elements/nodes/MeshNode.cpp b/src/rendering/visual_elements/nodes/MeshNode.cpp index 6fd88ee..41bc9d8 100644 --- a/src/rendering/visual_elements/nodes/MeshNode.cpp +++ b/src/rendering/visual_elements/nodes/MeshNode.cpp @@ -14,12 +14,12 @@ MeshNode::~MeshNode() } -SceneItem* MeshNode::getSceneItem(std::size_t) const +SceneItem* MeshNode::getSceneItem(size_t) const { return mModel.get(); } -std::size_t MeshNode::getNumSceneItems() const +size_t MeshNode::getNumSceneItems() const { if (mWorkingMesh) { diff --git a/src/rendering/visual_elements/nodes/MeshNode.h b/src/rendering/visual_elements/nodes/MeshNode.h index 84304da..b14a6ed 100644 --- a/src/rendering/visual_elements/nodes/MeshNode.h +++ b/src/rendering/visual_elements/nodes/MeshNode.h @@ -13,8 +13,8 @@ public: void setMesh(AbstractMesh* mesh); - SceneItem* getSceneItem(std::size_t idx) const override; - std::size_t getNumSceneItems() const override; + SceneItem* getSceneItem(size_t idx) const override; + size_t getNumSceneItems() const override; void setWidth(double width); void setHeight(double height); diff --git a/src/rendering/visual_elements/nodes/PathNode.h b/src/rendering/visual_elements/nodes/PathNode.h index 85c2645..670c2c4 100644 --- a/src/rendering/visual_elements/nodes/PathNode.h +++ b/src/rendering/visual_elements/nodes/PathNode.h @@ -2,7 +2,7 @@ #include "GeometryNode.h" -#include "Memory.h" +#include "Pointer.h" class PathNode : public GeometryNode { diff --git a/src/rendering/visual_elements/nodes/TextNode.cpp b/src/rendering/visual_elements/nodes/TextNode.cpp index 1f312c7..7980a0d 100644 --- a/src/rendering/visual_elements/nodes/TextNode.cpp +++ b/src/rendering/visual_elements/nodes/TextNode.cpp @@ -108,7 +108,7 @@ void TextNode::setFont(const FontItem& font) } } -SceneItem* TextNode::getSceneItem(std::size_t idx) const +SceneItem* TextNode::getSceneItem(size_t idx) const { if (idx == 0) { @@ -135,7 +135,7 @@ SceneItem* TextNode::getSceneItem(std::size_t idx) const return nullptr; } -std::size_t TextNode::getNumSceneItems() const +size_t TextNode::getNumSceneItems() const { auto count = 1; if (mNodeBounds) diff --git a/src/rendering/visual_elements/nodes/TextNode.h b/src/rendering/visual_elements/nodes/TextNode.h index ef0d918..09b7e5a 100644 --- a/src/rendering/visual_elements/nodes/TextNode.h +++ b/src/rendering/visual_elements/nodes/TextNode.h @@ -7,7 +7,7 @@ #include "Bounds.h" #include "SceneText.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" class FontsManager; @@ -25,8 +25,8 @@ public: String getContent() const; String getFontLabel() const; - SceneItem* getSceneItem(std::size_t idx) const override; - std::size_t getNumSceneItems() const override; + SceneItem* getSceneItem(size_t idx) const override; + size_t getNumSceneItems() const override; double getWidth() const; double getHeight() const; diff --git a/src/rendering/visual_elements/postscript/PostscriptReader.h b/src/rendering/visual_elements/postscript/PostscriptReader.h index 5817703..890d0e8 100644 --- a/src/rendering/visual_elements/postscript/PostscriptReader.h +++ b/src/rendering/visual_elements/postscript/PostscriptReader.h @@ -3,7 +3,7 @@ #include "PathElement.h" #include "Point.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" #include "String.h" @@ -61,5 +61,5 @@ private: GeometryPathFeaturePtr mWorkingFeature; Point2 mCurrentPoint; - std::size_t mPrecision{ 3 }; + size_t mPrecision{ 3 }; }; diff --git a/src/rendering/visual_elements/postscript/PostscriptWriter.cpp b/src/rendering/visual_elements/postscript/PostscriptWriter.cpp index 0b341d9..67a8e2c 100644 --- a/src/rendering/visual_elements/postscript/PostscriptWriter.cpp +++ b/src/rendering/visual_elements/postscript/PostscriptWriter.cpp @@ -10,7 +10,7 @@ #include "PathElement.h" #include "Path.h" -void PostscriptWriter::setPrecision(std::size_t precision) +void PostscriptWriter::setPrecision(size_t precision) { mPrecision = precision; } diff --git a/src/rendering/visual_elements/postscript/PostscriptWriter.h b/src/rendering/visual_elements/postscript/PostscriptWriter.h index 6db5435..bfead2b 100644 --- a/src/rendering/visual_elements/postscript/PostscriptWriter.h +++ b/src/rendering/visual_elements/postscript/PostscriptWriter.h @@ -8,19 +8,19 @@ namespace ntk class Arc; } -template +template class QuadraticBezierCurve; -template +template class CubicBezierCurve; -template +template class Line; -template +template class LineSegment; -template +template class PathElement; class GeometryPath; @@ -28,7 +28,7 @@ class GeometryPath; class PostscriptWriter { public: - void setPrecision(std::size_t precision); + void setPrecision(size_t precision); String toString(GeometryPath* path); @@ -45,6 +45,6 @@ private: String toString(CubicBezierCurve<2>* curve); - std::size_t mPrecision{ 3 }; + size_t mPrecision{ 3 }; Point2 mCursor; }; \ No newline at end of file diff --git a/src/rendering/visual_elements/scene/Scene.cpp b/src/rendering/visual_elements/scene/Scene.cpp index e641c51..b773da2 100644 --- a/src/rendering/visual_elements/scene/Scene.cpp +++ b/src/rendering/visual_elements/scene/Scene.cpp @@ -61,7 +61,7 @@ void Scene::updateNode(AbstractVisualNode* node, const Transform& transform) } } - for (std::size_t idx=0; idx< node->getNumSceneItems(); idx++) + for (size_t idx=0; idx< node->getNumSceneItems(); idx++) { if (auto item = node->getSceneItem(idx)) { diff --git a/src/rendering/visual_elements/scene/Scene.h b/src/rendering/visual_elements/scene/Scene.h index 84dcc2d..49c7722 100644 --- a/src/rendering/visual_elements/scene/Scene.h +++ b/src/rendering/visual_elements/scene/Scene.h @@ -6,7 +6,7 @@ #include "Transform.h" #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" class RootNode; class AbstractVisualNode; diff --git a/src/rendering/visual_elements/scene/SceneModel.h b/src/rendering/visual_elements/scene/SceneModel.h index 14f71a3..4d38822 100644 --- a/src/rendering/visual_elements/scene/SceneModel.h +++ b/src/rendering/visual_elements/scene/SceneModel.h @@ -6,8 +6,8 @@ #include "Vector.h" #include "String.h" -#include -#include "Memory.h" +#include Map.h +#include "Pointer.h" class AbstractMesh; diff --git a/src/rendering/visual_elements/svg/SvgNode.h b/src/rendering/visual_elements/svg/SvgNode.h index 6d26b40..de5f06a 100644 --- a/src/rendering/visual_elements/svg/SvgNode.h +++ b/src/rendering/visual_elements/svg/SvgNode.h @@ -4,7 +4,7 @@ #include "GeometryNode.h" #include "SvgDocument.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" class SvgNode : public MaterialNode diff --git a/src/rendering/visual_elements/svg/SvgPainter.h b/src/rendering/visual_elements/svg/SvgPainter.h index 8f794bf..2502d22 100644 --- a/src/rendering/visual_elements/svg/SvgPainter.h +++ b/src/rendering/visual_elements/svg/SvgPainter.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class SvgDocument; class SvgShapeElement; diff --git a/src/rendering/visual_elements/svg/SvgShapeElement.cpp b/src/rendering/visual_elements/svg/SvgShapeElement.cpp index adac31b..c3c644f 100644 --- a/src/rendering/visual_elements/svg/SvgShapeElement.cpp +++ b/src/rendering/visual_elements/svg/SvgShapeElement.cpp @@ -5,7 +5,7 @@ #include -SvgShapeElement::SvgShapeElement(const String& tagName, std::size_t precision) +SvgShapeElement::SvgShapeElement(const String& tagName, size_t precision) : SvgElement(tagName), mPrecision(precision) { @@ -79,7 +79,7 @@ Point2 SvgShapeElement::parsePoint(const String& pointString, double defaultVal) double y = defaultVal; const auto split = StringUtils::split(pointString); - for (std::size_t idx = 0; idx < split.size(); idx++) + for (size_t idx = 0; idx < split.size(); idx++) { if (idx == 0) { diff --git a/src/rendering/visual_elements/svg/SvgShapeElement.h b/src/rendering/visual_elements/svg/SvgShapeElement.h index b1d40f9..f3f265a 100644 --- a/src/rendering/visual_elements/svg/SvgShapeElement.h +++ b/src/rendering/visual_elements/svg/SvgShapeElement.h @@ -7,7 +7,7 @@ class SvgShapeElement : public SvgElement { public: - SvgShapeElement(const String& tagName, std::size_t precision = 0); + SvgShapeElement(const String& tagName, size_t precision = 0); Transform getTransform() const; @@ -26,7 +26,7 @@ public: void setNoStroke(); protected: - std::size_t mPrecision{ 0 }; + size_t mPrecision{ 0 }; private: String getLabelledContent(const String& key, const String& content) const; diff --git a/src/rendering/visual_elements/svg/elements/SvgShapeElements.cpp b/src/rendering/visual_elements/svg/elements/SvgShapeElements.cpp index 07ba935..83ad1d2 100644 --- a/src/rendering/visual_elements/svg/elements/SvgShapeElements.cpp +++ b/src/rendering/visual_elements/svg/elements/SvgShapeElements.cpp @@ -190,7 +190,7 @@ void SvgPolyline::setPoints(const Point2& startPoint, const Vector& locs addAttribute(std::move(points)); } -SvgLine::SvgLine(const Point2& startPoint, const Point2& endPoint, std::size_t precision) +SvgLine::SvgLine(const Point2& startPoint, const Point2& endPoint, size_t precision) : SvgShapeElement("line", precision) { auto fill = std::make_unique("fill"); diff --git a/src/rendering/visual_elements/svg/elements/SvgShapeElements.h b/src/rendering/visual_elements/svg/elements/SvgShapeElements.h index 57d5409..ce45a30 100644 --- a/src/rendering/visual_elements/svg/elements/SvgShapeElements.h +++ b/src/rendering/visual_elements/svg/elements/SvgShapeElements.h @@ -68,7 +68,7 @@ public: class SvgLine : public SvgShapeElement { public: - SvgLine(const Point2& startPoint, const Point2& endPoint, std::size_t precision = 0); + SvgLine(const Point2& startPoint, const Point2& endPoint, size_t precision = 0); }; class SvgPath : public SvgShapeElement diff --git a/src/ui/client/GuiApplication.h b/src/ui/client/GuiApplication.h index abfca99..9584a4b 100644 --- a/src/ui/client/GuiApplication.h +++ b/src/ui/client/GuiApplication.h @@ -4,7 +4,7 @@ #include "UiInterfaceFactory.h" #include "CommandLineArgs.h" -#include "Memory.h" +#include "Pointer.h" class MainApplication; class DesktopManager; diff --git a/src/ui/ui_controls/HorizontalSpacer.cpp b/src/ui/ui_controls/HorizontalSpacer.cpp index 24faa64..1ac9ad1 100644 --- a/src/ui/ui_controls/HorizontalSpacer.cpp +++ b/src/ui/ui_controls/HorizontalSpacer.cpp @@ -37,7 +37,7 @@ void HorizontalSpacer::updateChildLocations() height = mSize.mMaxHeight; } - for(std::size_t idx=0; idx #include "String.h" diff --git a/src/ui/ui_elements/desktop_elements/Screen.h b/src/ui/ui_elements/desktop_elements/Screen.h index d4d37ae..18f3428 100644 --- a/src/ui/ui_elements/desktop_elements/Screen.h +++ b/src/ui/ui_elements/desktop_elements/Screen.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class IPlatformScreen; using IPlatformScreenPtr = Ptr; diff --git a/src/ui/ui_elements/desktop_elements/Window.h b/src/ui/ui_elements/desktop_elements/Window.h index 61e4d12..97e4bc0 100644 --- a/src/ui/ui_elements/desktop_elements/Window.h +++ b/src/ui/ui_elements/desktop_elements/Window.h @@ -5,7 +5,7 @@ #include "DrawingContext.h" #include "Widget.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" #include #include "String.h" diff --git a/src/ui/ui_elements/style/ColorPalette.cpp b/src/ui/ui_elements/style/ColorPalette.cpp index 1e1c2bd..625491e 100644 --- a/src/ui/ui_elements/style/ColorPalette.cpp +++ b/src/ui/ui_elements/style/ColorPalette.cpp @@ -1,6 +1,6 @@ #include "ColorPalette.h" -const std::unordered_map ColorPalette::mPaletteColors = { +const Map ColorPalette::mPaletteColors = { {Theme::Ref::Color::Primary_10, "#21005E"}, {Theme::Ref::Color::Primary_20, "#371E73"}, {Theme::Ref::Color::Primary_30, "#4F378B"}, diff --git a/src/ui/ui_elements/style/ColorPalette.h b/src/ui/ui_elements/style/ColorPalette.h index b9ab0e5..f6d83e3 100644 --- a/src/ui/ui_elements/style/ColorPalette.h +++ b/src/ui/ui_elements/style/ColorPalette.h @@ -2,7 +2,7 @@ #include "Color.h" -#include +#include Map.h #include "String.h" namespace Theme @@ -62,5 +62,5 @@ public: static Color getColor(Theme::Ref::Color token); private: - static const std::unordered_map mPaletteColors; + static const Map mPaletteColors; }; \ No newline at end of file diff --git a/src/ui/ui_elements/style/LightTheme.cpp b/src/ui/ui_elements/style/LightTheme.cpp index c1f7f69..fbf5a61 100644 --- a/src/ui/ui_elements/style/LightTheme.cpp +++ b/src/ui/ui_elements/style/LightTheme.cpp @@ -2,7 +2,7 @@ #include "ColorPalette.h" -const std::unordered_map LightTheme::mPalette = { +const Map LightTheme::mPalette = { {Theme::Sys::Color::Primary, Theme::Ref::Color::Primary_40}, {Theme::Sys::Color::Primary_Container, Theme::Ref::Color::Primary_90}, {Theme::Sys::Color::Secondary, Theme::Ref::Color::Secondary_40}, diff --git a/src/ui/ui_elements/style/LightTheme.h b/src/ui/ui_elements/style/LightTheme.h index cece467..dbf1df8 100644 --- a/src/ui/ui_elements/style/LightTheme.h +++ b/src/ui/ui_elements/style/LightTheme.h @@ -3,7 +3,7 @@ #include "ITheme.h" #include "Color.h" -#include +#include Map.h class LightTheme : public ITheme { @@ -11,5 +11,5 @@ public: Color getColor(Theme::Sys::Color token) const override; private: - static const std::unordered_map mPalette; + static const Map mPalette; }; \ No newline at end of file diff --git a/src/ui/ui_elements/style/Theme.h b/src/ui/ui_elements/style/Theme.h index 7cf8148..8bfc83e 100644 --- a/src/ui/ui_elements/style/Theme.h +++ b/src/ui/ui_elements/style/Theme.h @@ -1,6 +1,6 @@ #include "ITheme.h" -#include +#include Map.h // Ref https://m3.material.io/styles/color/the-color-system/tokens diff --git a/src/ui/ui_elements/ui_events/KeyboardEvent.h b/src/ui/ui_elements/ui_events/KeyboardEvent.h index 88ff426..9f1678e 100644 --- a/src/ui/ui_elements/ui_events/KeyboardEvent.h +++ b/src/ui/ui_elements/ui_events/KeyboardEvent.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include "UiEvent.h" diff --git a/src/ui/ui_elements/ui_events/MouseEvent.h b/src/ui/ui_elements/ui_events/MouseEvent.h index 0620e07..1d48cab 100644 --- a/src/ui/ui_elements/ui_events/MouseEvent.h +++ b/src/ui/ui_elements/ui_events/MouseEvent.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "DiscretePoint.h" #include "UiEvent.h" diff --git a/src/ui/ui_elements/ui_events/PaintEvent.h b/src/ui/ui_elements/ui_events/PaintEvent.h index 7287249..316ec3a 100644 --- a/src/ui/ui_elements/ui_events/PaintEvent.h +++ b/src/ui/ui_elements/ui_events/PaintEvent.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "UiEvent.h" diff --git a/src/ui/ui_elements/ui_events/ResizeEvent.h b/src/ui/ui_elements/ui_events/ResizeEvent.h index 19ec576..0e7bed0 100644 --- a/src/ui/ui_elements/ui_events/ResizeEvent.h +++ b/src/ui/ui_elements/ui_events/ResizeEvent.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "UiEvent.h" diff --git a/src/ui/ui_elements/ui_events/UiEvent.h b/src/ui/ui_elements/ui_events/UiEvent.h index 38f7a31..63aeb37 100644 --- a/src/ui/ui_elements/ui_events/UiEvent.h +++ b/src/ui/ui_elements/ui_events/UiEvent.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class UiEvent { diff --git a/src/ui/ui_elements/widgets/Widget.h b/src/ui/ui_elements/widgets/Widget.h index 8c777af..2b0db17 100644 --- a/src/ui/ui_elements/widgets/Widget.h +++ b/src/ui/ui_elements/widgets/Widget.h @@ -8,7 +8,7 @@ #include "ITheme.h" #include "ElevationTokens.h" -#include "Memory.h" +#include "Pointer.h" #include "Vector.h" #include "String.h" diff --git a/src/ui/windows/AbstractDesktopApp.h b/src/ui/windows/AbstractDesktopApp.h index ca3e148..acd67d4 100644 --- a/src/ui/windows/AbstractDesktopApp.h +++ b/src/ui/windows/AbstractDesktopApp.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "AbstractApp.h" diff --git a/src/ui/windows/managers/DesktopManager.h b/src/ui/windows/managers/DesktopManager.h index 9fde72b..2c52871 100644 --- a/src/ui/windows/managers/DesktopManager.h +++ b/src/ui/windows/managers/DesktopManager.h @@ -1,7 +1,7 @@ #pragma once #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" #include "Keyboard.h" #include "Screen.h" diff --git a/src/ui/windows/managers/WindowManager.h b/src/ui/windows/managers/WindowManager.h index 647d1d6..e3a8e9e 100644 --- a/src/ui/windows/managers/WindowManager.h +++ b/src/ui/windows/managers/WindowManager.h @@ -1,7 +1,7 @@ #pragma once #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" #include "Window.h" #include "DrawingContext.h" @@ -37,12 +37,12 @@ public: void clearPlatformWindows(); - std::size_t getNumWindows() const + size_t getNumWindows() const { return mWindows.size(); } - mt::Window* getWindow(std::size_t idx) const + mt::Window* getWindow(size_t idx) const { return mWindows[idx].get(); } diff --git a/src/ui/windows/ui_interfaces/AbstractUiInterface.h b/src/ui/windows/ui_interfaces/AbstractUiInterface.h index 17ba4d7..5646b31 100644 --- a/src/ui/windows/ui_interfaces/AbstractUiInterface.h +++ b/src/ui/windows/ui_interfaces/AbstractUiInterface.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" namespace mt { diff --git a/src/ui/windows/ui_interfaces/UiInterfaceFactory.h b/src/ui/windows/ui_interfaces/UiInterfaceFactory.h index 12f7f30..7d4e196 100644 --- a/src/ui/windows/ui_interfaces/UiInterfaceFactory.h +++ b/src/ui/windows/ui_interfaces/UiInterfaceFactory.h @@ -2,7 +2,7 @@ #include "AbstractUiInterface.h" -#include "Memory.h" +#include "Pointer.h" class DesktopManager; diff --git a/src/ui/windows/ui_interfaces/wayland/WaylandBuffer.h b/src/ui/windows/ui_interfaces/wayland/WaylandBuffer.h index 88829f5..ae2fb4a 100644 --- a/src/ui/windows/ui_interfaces/wayland/WaylandBuffer.h +++ b/src/ui/windows/ui_interfaces/wayland/WaylandBuffer.h @@ -2,9 +2,9 @@ #include "wayland-client.h" -#include "SharedMemory.h" +#include "SharedPointer.h" -#include "Memory.h" +#include "Pointer.h" class WaylandBuffer { diff --git a/src/ui/windows/ui_interfaces/wayland/WaylandInterface.cpp b/src/ui/windows/ui_interfaces/wayland/WaylandInterface.cpp index 723aafe..5216905 100644 --- a/src/ui/windows/ui_interfaces/wayland/WaylandInterface.cpp +++ b/src/ui/windows/ui_interfaces/wayland/WaylandInterface.cpp @@ -87,7 +87,7 @@ void WaylandInterface::initialize() } const auto num_windows = mDesktopManager->getWindowManager()->getNumWindows(); - for(std::size_t idx=0; idx< num_windows; idx++) + for(size_t idx=0; idx< num_windows; idx++) { addWindow(mDesktopManager->getWindowManager()->getWindow(idx)); } diff --git a/src/ui/windows/ui_interfaces/wayland/WaylandInterface.h b/src/ui/windows/ui_interfaces/wayland/WaylandInterface.h index 90a4946..000262f 100644 --- a/src/ui/windows/ui_interfaces/wayland/WaylandInterface.h +++ b/src/ui/windows/ui_interfaces/wayland/WaylandInterface.h @@ -1,14 +1,14 @@ #pragma once #include "Window.h" -#include "SharedMemory.h" +#include "SharedPointer.h" #include "AbstractUiInterface.h" #include "wayland-client.h" #include "xdg-shell-client-protocol.h" #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" class WaylandBuffer; class WaylandSeatInterface; diff --git a/src/ui/windows/ui_interfaces/wayland/WaylandSeatInterface.h b/src/ui/windows/ui_interfaces/wayland/WaylandSeatInterface.h index a91a3d0..3f66c4c 100644 --- a/src/ui/windows/ui_interfaces/wayland/WaylandSeatInterface.h +++ b/src/ui/windows/ui_interfaces/wayland/WaylandSeatInterface.h @@ -5,7 +5,7 @@ #include "wayland-client.h" -#include "Memory.h" +#include "Pointer.h" class WaylandSeatInterface { diff --git a/src/ui/windows/ui_interfaces/wayland/WaylandSurface.h b/src/ui/windows/ui_interfaces/wayland/WaylandSurface.h index 10d3cff..c99a564 100644 --- a/src/ui/windows/ui_interfaces/wayland/WaylandSurface.h +++ b/src/ui/windows/ui_interfaces/wayland/WaylandSurface.h @@ -4,7 +4,7 @@ #include "wayland-client.h" #include "Window.h" -#include "SharedMemory.h" +#include "SharedPointer.h" #include "WaylandBuffer.h" #include "IPlatformWindow.h" diff --git a/src/ui/windows/ui_interfaces/win32/Win32UIInterface.cpp b/src/ui/windows/ui_interfaces/win32/Win32UIInterface.cpp index 0604fe4..0c30629 100644 --- a/src/ui/windows/ui_interfaces/win32/Win32UIInterface.cpp +++ b/src/ui/windows/ui_interfaces/win32/Win32UIInterface.cpp @@ -24,7 +24,7 @@ void Win32UIInterface::initialize() } const auto num_windows = mDesktopManager->getWindowManager()->getNumWindows(); - for (std::size_t idx = 0; idx < num_windows; idx++) + for (size_t idx = 0; idx < num_windows; idx++) { addWindow(mDesktopManager->getWindowManager()->getWindow(idx)); } diff --git a/src/ui/windows/ui_interfaces/win32/Win32WindowInterface.h b/src/ui/windows/ui_interfaces/win32/Win32WindowInterface.h index 7dc2587..e38ff91 100644 --- a/src/ui/windows/ui_interfaces/win32/Win32WindowInterface.h +++ b/src/ui/windows/ui_interfaces/win32/Win32WindowInterface.h @@ -5,7 +5,7 @@ #include -#include "Memory.h" +#include "Pointer.h" class DesktopManager; class FontsManager; diff --git a/src/ui/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.h b/src/ui/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.h index 2222ce0..3146cff 100644 --- a/src/ui/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.h +++ b/src/ui/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include #include diff --git a/src/ui/windows/ui_interfaces/x11/XcbEventInterface.h b/src/ui/windows/ui_interfaces/x11/XcbEventInterface.h index fff8b55..fc60f7a 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbEventInterface.h +++ b/src/ui/windows/ui_interfaces/x11/XcbEventInterface.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class Keyboard; class MouseEvent; diff --git a/src/ui/windows/ui_interfaces/x11/XcbExtensionInterface.h b/src/ui/windows/ui_interfaces/x11/XcbExtensionInterface.h index 06228ab..0ca782b 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbExtensionInterface.h +++ b/src/ui/windows/ui_interfaces/x11/XcbExtensionInterface.h @@ -1,6 +1,6 @@ #pragma once -#include +#include Map.h #include "String.h" #include @@ -15,5 +15,5 @@ public: private: bool mHasXkb{false}; uint8_t mXkbEventFlag{0}; - //std::unordered_map mExtensions; + //Map mExtensions; }; diff --git a/src/ui/windows/ui_interfaces/x11/XcbGlInterface.h b/src/ui/windows/ui_interfaces/x11/XcbGlInterface.h index 18982f1..aed37a2 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbGlInterface.h +++ b/src/ui/windows/ui_interfaces/x11/XcbGlInterface.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Memory.h" +#include "Pointer.h" class XcbGlInterface { diff --git a/src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.h b/src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.h index fca2c06..db2cbda 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.h +++ b/src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include "Memory.h" +#include "Pointer.h" class XcbGlInterface; diff --git a/src/ui/windows/ui_interfaces/x11/XcbInterface.cpp b/src/ui/windows/ui_interfaces/x11/XcbInterface.cpp index 77d10e1..a2975cd 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbInterface.cpp +++ b/src/ui/windows/ui_interfaces/x11/XcbInterface.cpp @@ -73,7 +73,7 @@ void XcbInterface::initialize() mDesktopManager->setKeyboard(XcbKeyboard::Create(mConnection)); const auto num_windows = mDesktopManager->getWindowManager()->getNumWindows(); - for(std::size_t idx=0; idx< num_windows; idx++) + for(size_t idx=0; idx< num_windows; idx++) { addWindow(mDesktopManager->getWindowManager()->getWindow(idx)); } diff --git a/src/ui/windows/ui_interfaces/x11/XcbInterface.h b/src/ui/windows/ui_interfaces/x11/XcbInterface.h index 757b6e9..acb0125 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbInterface.h +++ b/src/ui/windows/ui_interfaces/x11/XcbInterface.h @@ -2,7 +2,7 @@ #include "AbstractUiInterface.h" -#include "Memory.h" +#include "Pointer.h" class XcbGlInterface; using XcbGlInterfacePtr = Ptr; diff --git a/src/web/html/HtmlDocument.h b/src/web/html/HtmlDocument.h index 3bc5d03..4993424 100644 --- a/src/web/html/HtmlDocument.h +++ b/src/web/html/HtmlDocument.h @@ -2,7 +2,7 @@ #include "XmlDocument.h" -#include "Memory.h" +#include "Pointer.h" class HtmlElement; class HtmlBodyElement; diff --git a/src/web/html/HtmlElement.h b/src/web/html/HtmlElement.h index a011f82..9eef615 100644 --- a/src/web/html/HtmlElement.h +++ b/src/web/html/HtmlElement.h @@ -1,5 +1,5 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" #include "XmlElement.h" #include "XmlAttribute.h" diff --git a/src/web/markdown/MarkdownComponents.cpp b/src/web/markdown/MarkdownComponents.cpp index 936e70c..3c37077 100644 --- a/src/web/markdown/MarkdownComponents.cpp +++ b/src/web/markdown/MarkdownComponents.cpp @@ -18,12 +18,12 @@ void MarkdownElementWithChildren::addChild(Ptr child) mChildren.push_back(std::move(child)); } -std::size_t MarkdownElementWithChildren::getNumChildren() const +size_t MarkdownElementWithChildren::getNumChildren() const { return mChildren.size(); } -MarkdownInlineElement* MarkdownElementWithChildren::getChild(std::size_t idx) const +MarkdownInlineElement* MarkdownElementWithChildren::getChild(size_t idx) const { return mChildren[idx].get(); } @@ -68,12 +68,12 @@ void MarkdownBulletList::addChild(Ptr child) mChildren.push_back(std::move(child)); } -std::size_t MarkdownBulletList::getNumChildren() const +size_t MarkdownBulletList::getNumChildren() const { return mChildren.size(); } -MarkdownBulletItem* MarkdownBulletList::getChild(std::size_t idx) const +MarkdownBulletItem* MarkdownBulletList::getChild(size_t idx) const { return mChildren[idx].get(); } diff --git a/src/web/markdown/MarkdownComponents.h b/src/web/markdown/MarkdownComponents.h index 3c01d96..6152352 100644 --- a/src/web/markdown/MarkdownComponents.h +++ b/src/web/markdown/MarkdownComponents.h @@ -4,7 +4,7 @@ #include "MarkdownCustomElement.h" #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" class MarkdownTextSpan : public MarkdownInlineElement { @@ -39,9 +39,9 @@ class MarkdownElementWithChildren : public MarkdownElement public: void addChild(Ptr child); - std::size_t getNumChildren() const; + size_t getNumChildren() const; - MarkdownInlineElement* getChild(std::size_t idx) const; + MarkdownInlineElement* getChild(size_t idx) const; MarkdownInlineElement* getLastChild() const; @@ -86,9 +86,9 @@ public: void addChild(Ptr child); - std::size_t getNumChildren() const; + size_t getNumChildren() const; - MarkdownBulletItem* getChild(std::size_t idx) const; + MarkdownBulletItem* getChild(size_t idx) const; private: Vector > mChildren; diff --git a/src/web/markdown/MarkdownConverter.h b/src/web/markdown/MarkdownConverter.h index 8907e7b..2d86b20 100644 --- a/src/web/markdown/MarkdownConverter.h +++ b/src/web/markdown/MarkdownConverter.h @@ -1,6 +1,6 @@ #pragma once -#include "Memory.h" +#include "Pointer.h" class HtmlDocument; class HtmlElement; diff --git a/src/web/markdown/MarkdownDocument.cpp b/src/web/markdown/MarkdownDocument.cpp index 270d3a7..1fc852c 100644 --- a/src/web/markdown/MarkdownDocument.cpp +++ b/src/web/markdown/MarkdownDocument.cpp @@ -13,12 +13,12 @@ void MarkdownDocument::addElement(Ptr element) mElements.push_back(std::move(element)); } -std::size_t MarkdownDocument::getNumElements() const +size_t MarkdownDocument::getNumElements() const { return mElements.size(); } -MarkdownElement* MarkdownDocument::getElement(std::size_t idx) const +MarkdownElement* MarkdownDocument::getElement(size_t idx) const { return mElements[idx].get(); } @@ -46,22 +46,22 @@ Vector MarkdownDocument::getAllLinks() const return links; } -std::size_t MarkdownDocument::getNumMultilineContexts() const +size_t MarkdownDocument::getNumMultilineContexts() const { return mCustomMultilineContexts.size(); } -std::size_t MarkdownDocument::getNumInlineContexts() const +size_t MarkdownDocument::getNumInlineContexts() const { return mCustomInlineContexts.size(); } -MarkdownCustomMultilineElementContext* MarkdownDocument::getMultilineContext(std::size_t idx) const +MarkdownCustomMultilineElementContext* MarkdownDocument::getMultilineContext(size_t idx) const { return mCustomMultilineContexts[idx].get(); } -MarkdownCustomInlineElementContext* MarkdownDocument::getInlineContext(std::size_t idx) const +MarkdownCustomInlineElementContext* MarkdownDocument::getInlineContext(size_t idx) const { return mCustomInlineContexts[idx].get(); } diff --git a/src/web/markdown/MarkdownDocument.h b/src/web/markdown/MarkdownDocument.h index 59c376a..e0d1cd7 100644 --- a/src/web/markdown/MarkdownDocument.h +++ b/src/web/markdown/MarkdownDocument.h @@ -1,7 +1,7 @@ #pragma once #include "Vector.h" -#include "Memory.h" +#include "Pointer.h" class MarkdownElement; class MarkdownLink; @@ -15,19 +15,19 @@ public: void addElement(Ptr element); - std::size_t getNumElements() const; + size_t getNumElements() const; - MarkdownElement* getElement(std::size_t idx) const; + MarkdownElement* getElement(size_t idx) const; Vector getAllLinks() const; - std::size_t getNumMultilineContexts() const; + size_t getNumMultilineContexts() const; - std::size_t getNumInlineContexts() const; + size_t getNumInlineContexts() const; - MarkdownCustomMultilineElementContext* getMultilineContext(std::size_t idx) const; + MarkdownCustomMultilineElementContext* getMultilineContext(size_t idx) const; - MarkdownCustomInlineElementContext* getInlineContext(std::size_t idx) const; + MarkdownCustomInlineElementContext* getInlineContext(size_t idx) const; void registerCustomInlineElement(Ptr context); diff --git a/src/web/markdown/MarkdownParser.cpp b/src/web/markdown/MarkdownParser.cpp index 892c6dd..c1cb491 100644 --- a/src/web/markdown/MarkdownParser.cpp +++ b/src/web/markdown/MarkdownParser.cpp @@ -32,7 +32,7 @@ bool MarkdownParser::isInMultilineBlock() const return working_type == MarkdownElement::Type::MULTILINE_QUOTE || working_type == MarkdownElement::Type::CUSTOM_MULTILINE ; } -std::size_t MarkdownParser::checkForLink(const String& lineSection) +size_t MarkdownParser::checkForLink(const String& lineSection) { if (lineSection.empty()) { @@ -40,7 +40,7 @@ std::size_t MarkdownParser::checkForLink(const String& lineSection) } Vector hits; - std::size_t hit_size{0}; + size_t hit_size{0}; if (Lexer::matchPattern("[@](@)", lineSection, '@', hits)) { if (hits.size() == 2) @@ -59,7 +59,7 @@ std::size_t MarkdownParser::checkForLink(const String& lineSection) return hit_size; } -std::size_t MarkdownParser::checkForImage(const String& lineSection) +size_t MarkdownParser::checkForImage(const String& lineSection) { if (lineSection.empty()) { @@ -67,7 +67,7 @@ std::size_t MarkdownParser::checkForImage(const String& lineSection) } Vector hits; - std::size_t hit_size{0}; + size_t hit_size{0}; if (Lexer::matchPattern("![@](@)", lineSection, '@', hits)) { if (hits.size() == 2) @@ -85,7 +85,7 @@ std::size_t MarkdownParser::checkForImage(const String& lineSection) return hit_size; } -std::size_t MarkdownParser::checkForInlineQuote(const String& lineSection) +size_t MarkdownParser::checkForInlineQuote(const String& lineSection) { if (lineSection.empty()) { @@ -93,7 +93,7 @@ std::size_t MarkdownParser::checkForInlineQuote(const String& lineSection) } Vector hits; - std::size_t hit_size{0}; + size_t hit_size{0}; if (Lexer::matchPattern("`@`", lineSection, '@', hits)) { if (hits.size() == 1) @@ -112,7 +112,7 @@ std::size_t MarkdownParser::checkForInlineQuote(const String& lineSection) return hit_size; } -std::size_t MarkdownParser::checkForCustomInline(const String& lineSection) +size_t MarkdownParser::checkForCustomInline(const String& lineSection) { if (lineSection.empty()) { @@ -120,9 +120,9 @@ std::size_t MarkdownParser::checkForCustomInline(const String& lineSection) } Vector hits; - std::size_t hit_size{0}; + size_t hit_size{0}; - for(std::size_t idx=0; idxgetNumInlineContexts(); idx++) + for(size_t idx=0; idxgetNumInlineContexts(); idx++) { const auto delimiter = mWorkingDocument->getInlineContext(idx)->getDelimiter(); if (Lexer::matchPattern(delimiter + "@" + delimiter, lineSection, '@', hits)) @@ -194,7 +194,7 @@ void MarkdownParser::processLine(const String& line) } } - std::size_t line_position = 0; + size_t line_position = 0; mWorkingLine.clear(); while(line_position < line.size()) { @@ -240,7 +240,7 @@ bool MarkdownParser::startsWithMultiLineQuote(const String& line) const int MarkdownParser::startsWithCustomMultilineBlock(const String& line) const { - for(std::size_t idx=0; idxgetNumMultilineContexts(); idx++) + for(size_t idx=0; idxgetNumMultilineContexts(); idx++) { if (StringUtils::startsWith(line, mWorkingDocument->getMultilineContext(idx)->getDelimiter(), true)) { @@ -279,7 +279,7 @@ void MarkdownParser::onFoundMultiLineQuote(const String& line) } } -void MarkdownParser::onFoundCustomMultiLineBlock(const String& line, std::size_t blockSlot) +void MarkdownParser::onFoundCustomMultiLineBlock(const String& line, size_t blockSlot) { if (mWorkingElement && mWorkingElement->getType() == MarkdownElement::Type::CUSTOM_MULTILINE && blockSlot == mCustomDelimiterIndex) { @@ -313,7 +313,7 @@ void MarkdownParser::onFoundHeading(const String& line) auto heading = std::make_unique(level); String prefix; - for(std::size_t idx=0; idx child); - std::size_t checkForImage(const String& lineSection); - std::size_t checkForLink(const String& lineSection); - std::size_t checkForInlineQuote(const String& lineSection); - std::size_t checkForCustomInline(const String& lineSection); + size_t checkForImage(const String& lineSection); + size_t checkForLink(const String& lineSection); + size_t checkForInlineQuote(const String& lineSection); + size_t checkForCustomInline(const String& lineSection); bool isInMultilineBlock() const; void onFoundMultiLineQuote(const String& line); - void onFoundCustomMultiLineBlock(const String& line, std::size_t blockSlot); + void onFoundCustomMultiLineBlock(const String& line, size_t blockSlot); void onFoundHeading(const String& line); void onFoundBulletItem(const String& line); @@ -48,7 +48,7 @@ private: bool startsWithHeading(const String& line) const; bool startsWithBulletItem(const String& line) const; - std::size_t mCustomDelimiterIndex{0}; + size_t mCustomDelimiterIndex{0}; MarkdownElement* mWorkingElement{nullptr}; MarkdownBulletList* mWorkingBulletList{nullptr}; diff --git a/test/compression/TestStreamCompressor.cpp b/test/compression/TestStreamCompressor.cpp index 6e8a96b..901e907 100644 --- a/test/compression/TestStreamCompressor.cpp +++ b/test/compression/TestStreamCompressor.cpp @@ -28,7 +28,7 @@ TEST_CASE(TestHuffmanEncoder, "compression") //String testData = "BCAADDDCCACACAC"; //Vector stream(testData.begin(), testData.end()); - std::unordered_map counts; + Map counts; counts['A'] = 1; counts['B'] = 1; counts['C'] = 1; diff --git a/test/core/TestDataStructures.cpp b/test/core/TestDataStructures.cpp index d6720b8..8d00275 100644 --- a/test/core/TestDataStructures.cpp +++ b/test/core/TestDataStructures.cpp @@ -14,7 +14,7 @@ TEST_CASE(TestCircleBuffer, "core") buffer.addItem(item); } - for (std::size_t idx=0; idx<3; idx++) + for (size_t idx=0; idx<3; idx++) { auto item = buffer.getItem(idx); //std::cout << "Got item: " << idx << " " << item << std::endl; @@ -28,7 +28,7 @@ TEST_CASE(TestCircleBuffer, "core") (void)item; } - for (std::size_t idx=0; idx<3; idx++) + for (size_t idx=0; idx<3; idx++) { auto item = buffer.getItem(idx); //std::cout << "Got item: " << idx << " " << item << std::endl; diff --git a/test/database/TestDatabase.cpp b/test/database/TestDatabase.cpp index 1e193e9..bd21744 100644 --- a/test/database/TestDatabase.cpp +++ b/test/database/TestDatabase.cpp @@ -35,7 +35,7 @@ public: String getCreateQuery() const { String query = "CREATE TABLE " + mName + " ( "; - std::size_t count = 0; + size_t count = 0; for (const auto& column : mColumns) { query += column.first + " " + toString(column.second); diff --git a/test/graphics/TestD2dRendering.cpp b/test/graphics/TestD2dRendering.cpp index 7cfe124..eca6bb9 100644 --- a/test/graphics/TestD2dRendering.cpp +++ b/test/graphics/TestD2dRendering.cpp @@ -9,7 +9,7 @@ #include "Button.h" #include "TransformNode.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include diff --git a/test/graphics/TestDirectXRendering.cpp b/test/graphics/TestDirectXRendering.cpp index b42497b..2f8d4b7 100644 --- a/test/graphics/TestDirectXRendering.cpp +++ b/test/graphics/TestDirectXRendering.cpp @@ -12,7 +12,7 @@ #include "Scene.h" #include "Widget.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include diff --git a/test/graphics/TestOpenGlRendering.cpp b/test/graphics/TestOpenGlRendering.cpp index bb338eb..5c38e00 100644 --- a/test/graphics/TestOpenGlRendering.cpp +++ b/test/graphics/TestOpenGlRendering.cpp @@ -6,7 +6,7 @@ #include "TestFramework.h" -#include "Memory.h" +#include "Pointer.h" #include "String.h" #include diff --git a/test/test_utils/TestUiApplication.h b/test/test_utils/TestUiApplication.h index 68b0f38..f520f8c 100644 --- a/test/test_utils/TestUiApplication.h +++ b/test/test_utils/TestUiApplication.h @@ -3,7 +3,7 @@ #include "GuiApplication.h" #include "Scene.h" -#include "Memory.h" +#include "Pointer.h" class TestUiApplication : public GuiApplication {