diff --git a/components/Editor.h b/components/Editor.h index d071130..c68ae3d 100644 --- a/components/Editor.h +++ b/components/Editor.h @@ -5,6 +5,7 @@ #include "TextArea.h" #include "Cursor.h" #include "../utils/SyntaxHighlighter.h" +#include "../utils/ActionManager.h" #include "../utils/RichText.h" #include @@ -16,6 +17,7 @@ private: RichText coloredContent_; std::string ruleName_; MyVector lineedContent_; + ActionManager actionmanager_; MyVector split(std::string content) { MyVector lineedContent; diff --git a/mystl/my_vector.h b/mystl/my_vector.h index c5eb386..47dbeda 100644 --- a/mystl/my_vector.h +++ b/mystl/my_vector.h @@ -220,15 +220,6 @@ public: ptr -= n; return *this; } - - friend iterator operator++(iterator& ite) { - ++ite.ptr; - return ite; - } - friend iterator operator--(iterator& ite) { - --ite.ptr; - return ite; - } }; iterator begin() {