14 files changed, 15 insertions(+), 18 deletions(-)

M Makefile
M src/Buffer.cc
M src/Buffer.h
M src/Conversion.h
M src/Document.cc
M src/Editor.h
M src/File.h
M src/Gutter.cc
M src/History.h
M src/Line.cc
M src/Line.h
M src/Prompt.cc
M src/Prompt.h
M src/main.cc

@@ 5,7 5,7 @@ TESTS    = $(wildcard test/*.cc)
 TOBJ     = $(TESTS:.cc=.o)
 TDEP     = $(TOBJ:.o=.d)
 CXX      = clang
-CXXFLAGS = -std=c++1z
+CXXFLAGS = -std=c++17
 LDFLAGS  = -ltermbox -lstdc++ -lm
 TARGET   = ke
 TESTTGT  = ke-tests

@@ 1,4 1,3 @@
-#include <sstream>
 #include <termbox.h>
 #include "Buffer.h"
 #include "Event.h"

@@ 1,6 1,4 @@
 #pragma once
-#include <memory>
-#include <stack>
 #include <string>
 #include <termbox.h>
 #include "Canvas.h"

@@ 1,8 1,9 @@
 #pragma once
-#include <cstdlib>
-#include <cstring>
+#include <stdlib.h>
+#include <string.h>
 #include <memory>
 
+// TODO remove unique_ptr
 namespace Convert {
 	std::unique_ptr<char[]> from_wide_string(const wchar_t* wide_string);
 	std::unique_ptr<wchar_t[]> to_wide_string(const char* multibyte_string);

@@ 1,5 1,5 @@
-#include <cmath>
-#include <cwchar>
+#include <math.h>
+#include <wchar.h>
 #include "Document.h"
 #include "Line.h"
 

@@ 3,6 3,7 @@
 #include "Buffer.h"
 #include "StatusBar.h"
 
+// TODO remove shared_ptr
 class Editor : public InputHandler {
 private:
 	std::shared_ptr<Buffer> m_buf;

@@ 1,5 1,4 @@
 #pragma once
-#include <memory>
 #include <string>
 #include "Document.h"
 

@@ 1,4 1,4 @@
-#include <cmath>
+#include <math.h>
 #include "Buffer.h"
 #include "Line.h"
 #include "Gutter.h"

@@ 1,5 1,4 @@
 #pragma once
-#include <memory>
 #include <stack>
 #include "Event.h"
 

@@ 3,7 3,7 @@
 #include "Document.h"
 #include "Editor.h"
 #include "Gutter.h"
-#include <cmath>
+#include <math.h>
 
 void Line::calc_size() {
   if(m_doc == nullptr) {

@@ 3,6 3,8 @@
 #include <memory>
 #include "Syntax.h"
 
+// TODO remove unique_ptr
+
 class Buffer;
 class Text;
 using uint = uint32_t;

@@ 1,4 1,3 @@
-#include <sstream>
 #include <wchar.h>
 #include "Editor.h"
 #include "Line.h"

@@ 1,6 1,5 @@
 #pragma once
 #include <functional>
-#include <memory>
 #include <termbox.h>
 #include <wchar.h>
 #include "Document.h"

@@ 1,5 1,5 @@
-#include <iostream>
 #include <signal.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <termbox.h>
 #include <unistd.h>


@@ 17,13 17,13 @@ int main(int argc, const char** argv) {
 	auto err = tb_init();
 	switch(err) {
 		case TB_EUNSUPPORTED_TERMINAL:
-		std::cerr << "Termbox: Unsupported terminal." << std::endl;
+		fprintf(stderr, "Termbox: Unsupported terminal.\n");
 		return 1;
 		case TB_EFAILED_TO_OPEN_TTY:
-		std::cerr << "Termbox: Failed to open tty." << std::endl;
+		fprintf(stderr, "Termbox: Failed to open tty.\n");
 		return 1;
 		case TB_EPIPE_TRAP_ERROR:
-		std::cerr << "Termbox: Pipe trap error." << std::endl;
+		fprintf(stderr, "Termbox: Pipe trap error.\n");
 		return 1;
 	}