C -> C++

- Integrated wcwidth6.c more into text.cpp.
- Moved wcwidth6.c to wcwidth6.cpp, to cure some strange build issue.

src/CMakeLists.txt

@@ -44,7 +44,7 @@ set (task_SRCS A3.cpp A3.h
                text.cpp text.h
                utf8.cpp utf8.h
                util.cpp util.h
-               wcwidth6.c)
+               wcwidth6.cpp)
 
 add_library (task STATIC ${task_SRCS})
 add_executable (task_executable main.cpp)

src/text.cpp

@@ -48,7 +48,6 @@ static const char* newline = "\n";
 static const char* noline  = "";
 
 static void replace_positional (std::string&, const std::string&, const std::string&);
-extern "C" int mk_wcwidth (wchar_t);
 
 ///////////////////////////////////////////////////////////////////////////////
 void wrapText (

src/text.h

@@ -91,5 +91,7 @@ std::string rightJustifyZero (const int, const int);
 std::string rightJustify (const int, const int);
 std::string rightJustify (const std::string&, const int);
 
+int mk_wcwidth (wchar_t);
+
 #endif
 ////////////////////////////////////////////////////////////////////////////////