diff --git a/src/columns/ColString.cpp b/src/columns/ColString.cpp index 5befb51e5..5313b0ad0 100644 --- a/src/columns/ColString.cpp +++ b/src/columns/ColString.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include extern Context context; diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp index 6bc259051..cd7ff484c 100644 --- a/src/commands/CmdCalendar.cpp +++ b/src/commands/CmdCalendar.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp index 8772a9e85..6f2c94f4f 100644 --- a/src/commands/CmdColumns.cpp +++ b/src/commands/CmdColumns.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp index 728b9c50c..f11a147f2 100644 --- a/src/commands/CmdCommands.cpp +++ b/src/commands/CmdCommands.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include extern Context context; diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp index 057b8d6f8..c4de69c88 100644 --- a/src/commands/CmdContext.cpp +++ b/src/commands/CmdContext.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include extern Context context; diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp index 27a8eeb11..cadf326c5 100644 --- a/src/commands/CmdCustom.cpp +++ b/src/commands/CmdCustom.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include extern Context context; diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp index 2d7e5b4c7..a8d71eb7f 100644 --- a/src/commands/CmdHistory.cpp +++ b/src/commands/CmdHistory.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp index 4134413ae..9aa8b9b6c 100644 --- a/src/commands/CmdInfo.cpp +++ b/src/commands/CmdInfo.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include extern Context context; diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp index 1c25fbc06..a55b457fa 100644 --- a/src/commands/CmdLogo.cpp +++ b/src/commands/CmdLogo.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include extern Context context; diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp index 0fa52cb0c..75dd585b4 100644 --- a/src/commands/CmdReports.cpp +++ b/src/commands/CmdReports.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include extern Context context; diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp index 5f75b85b3..4187a03dc 100644 --- a/src/commands/CmdTags.cpp +++ b/src/commands/CmdTags.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include extern Context context; diff --git a/src/text.cpp b/src/text.cpp index 214412026..85290a073 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -43,13 +43,4 @@ extern Context context; -static const char* newline = "\n"; -static const char* noline = ""; - -//////////////////////////////////////////////////////////////////////////////// -const char* optionalBlankLine () -{ - return context.verbose ("blank") ? newline : noline; -} - //////////////////////////////////////////////////////////////////////////////// diff --git a/src/text.h b/src/text.h index 683cd825d..16b91c3c1 100644 --- a/src/text.h +++ b/src/text.h @@ -33,8 +33,6 @@ #include // text.cpp, Non-UTF-8 aware. -const char* optionalBlankLine (); -int strippedLength (const std::string&); #endif //////////////////////////////////////////////////////////////////////////////// diff --git a/src/util.cpp b/src/util.cpp index 66dfefe5c..e001c2e4c 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -60,6 +60,9 @@ extern Context context; +static const char* newline = "\n"; +static const char* noline = ""; + //////////////////////////////////////////////////////////////////////////////// static void signal_handler (int s) { @@ -355,3 +358,9 @@ int strippedLength (const std::string& input) } //////////////////////////////////////////////////////////////////////////////// +const char* optionalBlankLine () +{ + return context.verbose ("blank") ? newline : noline; +} + +//////////////////////////////////////////////////////////////////////////////// diff --git a/src/util.h b/src/util.h index 845e0668d..c1ed270ef 100644 --- a/src/util.h +++ b/src/util.h @@ -64,6 +64,7 @@ std::string osName (); const std::string obfuscateText (const std::string&); bool nontrivial (const std::string&); int strippedLength (const std::string&); +const char* optionalBlankLine (); #endif ////////////////////////////////////////////////////////////////////////////////