Skip to content

Commit 1de3d54

Browse files
authored
Merge pull request #45 from psx95/makefile-update
Update makefile to add new folder in test
2 parents e4c3e15 + 5007849 commit 1de3d54

File tree

3 files changed

+1
-12
lines changed

3 files changed

+1
-12
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ INCLUDE=-I./include/
77
TARGET := collaborative_text_editor collaborative_text_editor_test
88

99
SOURCE := ./src/crdt/*.cpp ./src/editor/*.cpp ./src/exceptions/*.cpp ./src/networking/*.cpp ./src/version_vector/*.cpp src/ApplicationController.cpp
10-
TEST_SOURCE := ./tst/*.cpp
10+
TEST_SOURCE := ./tst/*.cpp ./tst/mock_models/*.cpp
1111

1212
all: $(TARGET)
1313

include/EditorContent.hpp

-3
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ class EditorContent {
111111

112112
void InsertTextAtPosition(std::string &text, int position);
113113

114-
std::string GetStringContent();
115-
std::vector<int> &GetLinePositions();
116-
117114
};
118115

119116
#endif //COLLABORATIVE_TEXT_EDITOR_SRC_EDITOR_EDITORCONTENT_HPP_

src/editor/EditorContent.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ void EditorContent::DeleteCharacterFromCursorPosition(int number_of_characters)
4141
callbacks->OnLocalDelete(deleted_position);
4242
}
4343

44-
std::string EditorContent::GetStringContent() {
45-
46-
}
47-
48-
std::vector<int> &EditorContent::GetLinePositions() {
49-
50-
}
51-
5244
void EditorContent::MoveCursorRight() {
5345
if (this->cursor.GetLineNumber() >= this->text_document.GetNumberOfTotalLines()) {
5446
return;

0 commit comments

Comments
 (0)