Merge pull request #1179 from sureshsundriyal/master

Some redundant includes cleanup.

src/files_sub_source.cc

@@ -37,6 +37,7 @@
 #include "config.h"
 #include "lnav.hh"
 #include "mapbox/variant.hpp"
+#include "sql_util.hh"
 
 namespace files_model {
 files_list_selection

src/filter_sub_source.cc

@@ -32,10 +32,12 @@
 #include "base/enum_util.hh"
 #include "base/func_util.hh"
 #include "base/opt_util.hh"
+#include "bound_tags.hh"
 #include "config.h"
 #include "lnav.hh"
 #include "readline_highlighters.hh"
 #include "readline_possibilities.hh"
+#include "sql_util.hh"
 
 using namespace lnav::roles::literals;
 

src/fs-extension-functions.cc

@@ -44,6 +44,7 @@
 #include "base/auto_pid.hh"
 #include "base/lnav.console.hh"
 #include "base/opt_util.hh"
+#include "bound_tags.hh"
 #include "config.h"
 #include "lnav.hh"
 #include "sqlite-extension-func.hh"

src/listview_curses.cc

@@ -36,6 +36,7 @@
 #include <sys/time.h>
 #include <time.h>
 
+#include "base/func_util.hh"
 #include "base/lnav_log.hh"
 #include "config.h"
 

src/listview_curses.hh

@@ -39,7 +39,6 @@
 
 #include <sys/types.h>
 
-#include "base/func_util.hh"
 #include "view_curses.hh"
 #include "vis_line.hh"
 

src/lnav.cc

@@ -36,21 +36,14 @@
 #    include <alloca.h>
 #endif
 
-#include <errno.h>
-#include <fcntl.h>
-#include <glob.h>
 #include <locale.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <termios.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "config.h"
@@ -60,7 +53,6 @@
 #    define _WCHAR_H_CPLUSPLUS_98_CONFORMANCE_
 #endif
 #include <algorithm>
-#include <functional>
 #include <map>
 #include <memory>
 #include <set>
@@ -78,7 +70,6 @@
 #include "base/ansi_vars.hh"
 #include "base/fs_util.hh"
 #include "base/func_util.hh"
-#include "base/future_util.hh"
 #include "base/humanize.hh"
 #include "base/humanize.time.hh"
 #include "base/injector.bind.hh"
@@ -88,7 +79,6 @@
 #include "base/lnav_log.hh"
 #include "base/paths.hh"
 #include "base/string_util.hh"
-#include "bookmarks.hh"
 #include "bottom_status_source.hh"
 #include "bound_tags.hh"
 #include "breadcrumb_curses.hh"
@@ -99,7 +89,6 @@
 #include "filter_sub_source.hh"
 #include "fstat_vtab.hh"
 #include "gantt_source.hh"
-#include "grep_proc.hh"
 #include "hist_source.hh"
 #include "init-sql.h"
 #include "listview_curses.hh"
@@ -141,7 +130,6 @@
 #include "view_helpers.examples.hh"
 #include "view_helpers.hist.hh"
 #include "views_vtab.hh"
-#include "vt52_curses.hh"
 #include "xpath_vtab.hh"
 #include "xterm_mouse.hh"
 
@@ -159,12 +147,10 @@
 #include "command_executor.hh"
 #include "field_overlay_source.hh"
 #include "hotkeys.hh"
-#include "log_actions.hh"
 #include "readline_callbacks.hh"
 #include "readline_possibilities.hh"
-#include "shlex.hh"
 #include "url_loader.hh"
-#include "yajlpp/yajlpp.hh"
+#include "yajlpp/json_ptr.hh"
 
 #ifndef SYSCONFDIR
 #    define SYSCONFDIR "/usr/etc"

src/lnav.hh

@@ -34,20 +34,14 @@
 
 #include <list>
 #include <map>
-#include <memory>
-#include <set>
-#include <stack>
 #include <unordered_map>
 
 #include <signal.h>
 #include <sys/time.h>
 
-#include "archive_manager.hh"
 #include "base/ansi_scrubber.hh"
-#include "base/future_util.hh"
 #include "base/isc.hh"
 #include "bottom_status_source.hh"
-#include "bound_tags.hh"
 #include "command_executor.hh"
 #include "config.h"
 #include "db_sub_source.hh"
@@ -56,19 +50,13 @@
 #include "files_sub_source.hh"
 #include "filter_status_source.hh"
 #include "gantt_status_source.hh"
-#include "grep_highlighter.hh"
 #include "hist_source.hh"
 #include "input_dispatcher.hh"
-#include "listview_curses.hh"
-#include "log_format_loader.hh"
 #include "log_vtab_impl.hh"
-#include "logfile.hh"
 #include "plain_text_source.hh"
 #include "preview_status_source.hh"
 #include "readline_curses.hh"
-#include "relative_time.hh"
-#include "safe/safe.h"
-#include "sql_util.hh"
+#include "sqlitepp.hh"
 #include "statusview_curses.hh"
 #include "textfile_sub_source.hh"
 #include "view_helpers.hh"

src/lnav.indexing.cc

@@ -29,10 +29,12 @@
 
 #include "lnav.indexing.hh"
 
+#include "bound_tags.hh"
 #include "lnav.events.hh"
 #include "lnav.hh"
 #include "service_tags.hh"
 #include "session_data.hh"
+#include "sql_util.hh"
 
 using namespace std::chrono_literals;
 

src/lnav_commands.cc

@@ -65,6 +65,7 @@
 #include "log.annotate.hh"
 #include "log_data_helper.hh"
 #include "log_data_table.hh"
+#include "log_format_loader.hh"
 #include "log_search_table.hh"
 #include "log_search_table_fwd.hh"
 #include "readline_callbacks.hh"

src/log.watch.cc

@@ -39,6 +39,7 @@
 #include "logfile_sub_source.cfg.hh"
 #include "readline_highlighters.hh"
 #include "sql_util.hh"
+#include "sqlitepp.hh"
 
 namespace lnav {
 namespace log {

src/log_format.cc

@@ -50,6 +50,7 @@
 #include "scn/scn.h"
 #include "sql_util.hh"
 #include "sqlite-extension-func.hh"
+#include "sqlitepp.hh"
 #include "yajlpp/yajlpp.hh"
 #include "yajlpp/yajlpp_def.hh"
 

src/regexp_vtab.cc

@@ -40,6 +40,7 @@
 #include "scn/scn.h"
 #include "sql_help.hh"
 #include "sql_util.hh"
+#include "sqlitepp.hh"
 #include "vtab_module.hh"
 #include "yajlpp/yajlpp.hh"
 #include "yajlpp/yajlpp_def.hh"

src/session_data.cc

@@ -45,6 +45,7 @@
 #include "base/opt_util.hh"
 #include "base/paths.hh"
 #include "bookmarks.json.hh"
+#include "bound_tags.hh"
 #include "command_executor.hh"
 #include "config.h"
 #include "hasher.hh"

src/sql_util.cc

@@ -29,7 +29,6 @@
  * @file sql_util.cc
  */
 
-#include <algorithm>
 #include <regex>
 #include <vector>
 
@@ -42,7 +41,6 @@
 #include "base/injector.hh"
 #include "base/lnav_log.hh"
 #include "base/string_util.hh"
-#include "base/time_util.hh"
 #include "bound_tags.hh"
 #include "config.h"
 #include "lnav_util.hh"
@@ -51,7 +49,7 @@
 #include "readline_highlighters.hh"
 #include "sql_execute.hh"
 #include "sql_help.hh"
-#include "sqlite-extension-func.hh"
+#include "sqlitepp.hh"
 
 using namespace lnav::roles::literals;
 

src/sql_util.hh

@@ -41,10 +41,9 @@
 #include <sys/time.h>
 #include <time.h>
 
+#include "base/attr_line.hh"
 #include "base/intern_string.hh"
-#include "base/lnav.console.hh"
 #include "base/time_util.hh"
-#include "sqlitepp.hh"
 
 extern const char* sql_keywords[145];
 extern const char* sql_function_names[];

src/top_status_source.cc

@@ -29,13 +29,11 @@
 
 #include "top_status_source.hh"
 
-#include "base/injector.hh"
 #include "config.h"
 #include "lnav.hh"
 #include "md2attr_line.hh"
 #include "md4cpp.hh"
 #include "shlex.hh"
-#include "sql_util.hh"
 #include "sqlitepp.client.hh"
 #include "top_status_source.cfg.hh"
 

src/top_status_source.hh

@@ -30,15 +30,8 @@
 #ifndef lnav_top_status_source_hh
 #define lnav_top_status_source_hh
 
-#include <string>
-
-#include <sqlite3.h>
-
-#include "base/injector.hh"
-#include "bound_tags.hh"
-#include "listview_curses.hh"
-#include "sql_util.hh"
 #include "sqlitepp.client.hh"
+#include "sqlitepp.hh"
 #include "statusview_curses.hh"
 #include "top_status_source.cfg.hh"
 

src/vtab_module.hh

@@ -31,7 +31,6 @@
 #define vtab_module_hh
 
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <sqlite3.h>