remove regex.hh, define Regex directly in string.hh

src/buffer_manager.cc

@@ -3,7 +3,7 @@
 #include "assert.hh"
 #include "buffer.hh"
 #include "exception.hh"
-#include "regex.hh"
+#include "string.hh"
 
 namespace Kakoune
 {

src/commands.cc

@@ -8,7 +8,7 @@
 #include "window.hh"
 #include "file.hh"
 #include "client.hh"
-#include "regex.hh"
+#include "string.hh"
 #include "highlighter_registry.hh"
 #include "filter_registry.hh"
 #include "register_manager.hh"

src/highlighters.cc

@@ -1,10 +1,9 @@
 #include "highlighters.hh"
-
 #include "assert.hh"
 #include "window.hh"
 #include "highlighter_registry.hh"
 #include "highlighter_group.hh"
-#include "regex.hh"
+#include "string.hh"
 
 namespace Kakoune
 {

src/main.cc

@@ -17,7 +17,7 @@
 #include "event_manager.hh"
 #include "context.hh"
 #include "ncurses.hh"
-#include "regex.hh"
+#include "string.hh"
 
 #include <unordered_map>
 #include <sys/types.h>

src/regex.hh

@@ -1,16 +0,0 @@
-#ifndef regex_hh_INCLUDED
-#define regex_hh_INCLUDED
-
-#include "string.hh"
-
-#include <boost/regex.hpp>
-
-namespace Kakoune
-{
-
-typedef boost::basic_regex<Character> Regex;
-
-}
-
-#endif // regex_hh_INCLUDED
-

src/selectors.cc

@@ -1,6 +1,6 @@
 #include "selectors.hh"
 
-#include "regex.hh"
+#include "string.hh"
 
 #include <algorithm>
 

src/shell_manager.hh

@@ -2,7 +2,7 @@
 #define shell_manager_hh_INCLUDED
 
 #include "utils.hh"
-#include "regex.hh"
+#include "string.hh"
 
 #include <unordered_map>
 

src/string.hh

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <iosfwd>
+#include <boost/regex.hpp>
 
 #include "memoryview.hh"
 #include "units.hh"
@@ -11,6 +12,7 @@ namespace Kakoune
 {
 
 typedef wchar_t Character;
+typedef boost::basic_regex<Character> Regex;
 
 class String
 {