diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2012-08-29 21:49:36 +0200 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2012-08-29 21:49:36 +0200 |
| commit | bbce6b22a3e04fe900ac9565b0703304d651b63a (patch) | |
| tree | 5c58c76a93534fec3a0c6bcfb477291f1b95aded /src | |
| parent | 8febec0bcf48369336cf94bac889ac27d90c6821 (diff) | |
remove regex.hh, define Regex directly in string.hh
Diffstat (limited to 'src')
| -rw-r--r-- | src/buffer_manager.cc | 2 | ||||
| -rw-r--r-- | src/commands.cc | 2 | ||||
| -rw-r--r-- | src/highlighters.cc | 3 | ||||
| -rw-r--r-- | src/main.cc | 2 | ||||
| -rw-r--r-- | src/regex.hh | 16 | ||||
| -rw-r--r-- | src/selectors.cc | 2 | ||||
| -rw-r--r-- | src/shell_manager.hh | 2 | ||||
| -rw-r--r-- | src/string.hh | 2 |
8 files changed, 8 insertions, 23 deletions
diff --git a/src/buffer_manager.cc b/src/buffer_manager.cc index 70ecfba7..38256ff1 100644 --- a/src/buffer_manager.cc +++ b/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 { diff --git a/src/commands.cc b/src/commands.cc index 7b636d5f..2dbd8b45 100644 --- a/src/commands.cc +++ b/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" diff --git a/src/highlighters.cc b/src/highlighters.cc index 92de5c08..f5f949b0 100644 --- a/src/highlighters.cc +++ b/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 { diff --git a/src/main.cc b/src/main.cc index 84340e50..abdb245f 100644 --- a/src/main.cc +++ b/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> diff --git a/src/regex.hh b/src/regex.hh deleted file mode 100644 index 6099a57c..00000000 --- a/src/regex.hh +++ /dev/null @@ -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 - diff --git a/src/selectors.cc b/src/selectors.cc index 044f7bb9..a18da875 100644 --- a/src/selectors.cc +++ b/src/selectors.cc @@ -1,6 +1,6 @@ #include "selectors.hh" -#include "regex.hh" +#include "string.hh" #include <algorithm> diff --git a/src/shell_manager.hh b/src/shell_manager.hh index 37d47b32..6ce3aada 100644 --- a/src/shell_manager.hh +++ b/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> diff --git a/src/string.hh b/src/string.hh index 58dd79b7..a781b358 100644 --- a/src/string.hh +++ b/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 { |