Cleanup header includes

newsboat · May 18, 2024 · 34c75c6 · 34c75c6
1 parent ffc9e3d
commit 34c75c6
Show file tree

Hide file tree

Showing 111 changed files with 47 additions and 208 deletions.
diff --git a/include/configexception.h b/include/configexception.h
@@ -1,7 +1,6 @@
 #ifndef NEWSBOAT_CONFIGEXCEPTION_H_
 #define NEWSBOAT_CONFIGEXCEPTION_H_
 
-#include <stdexcept>
 #include <string>
 
 namespace newsboat {

diff --git a/include/confighandlerexception.h b/include/confighandlerexception.h
@@ -1,7 +1,6 @@
 #ifndef NEWSBOAT_CONFIGHANDLEREXCEPTION_H_
 #define NEWSBOAT_CONFIGHANDLEREXCEPTION_H_
 
-#include <stdexcept>
 #include <string>
 
 namespace newsboat {

diff --git a/include/controller.h b/include/controller.h
@@ -10,7 +10,6 @@
 #include "feedcontainer.h"
 #include "filtercontainer.h"
 #include "fslock.h"
-#include "opml.h"
 #include "queuemanager.h"
 #include "regexmanager.h"
 #include "reloader.h"

diff --git a/include/curldatareceiver.h b/include/curldatareceiver.h
@@ -1,7 +1,6 @@
 #ifndef NEWSBOAT_CURLDATARECEIVER_H_
 #define NEWSBOAT_CURLDATARECEIVER_H_
 
-#include <cstdint>
 #include <memory>
 #include <string>
 

diff --git a/include/dbexception.h b/include/dbexception.h
@@ -2,7 +2,6 @@
 #define NEWSBOAT_DBEXCEPTION_H_
 
 #include <sqlite3.h>
-#include <stdexcept>
 #include <string>
 
 namespace newsboat {

diff --git a/include/dialogsformaction.h b/include/dialogsformaction.h
@@ -2,7 +2,6 @@
 #define NEWSBOAT_DIALOGSFORMACTION_H_
 
 #include "listformaction.h"
-#include "listwidget.h"
 #include "regexmanager.h"
 
 namespace newsboat {

diff --git a/include/dirbrowserformaction.h b/include/dirbrowserformaction.h
@@ -7,7 +7,6 @@
 #include "configcontainer.h"
 #include "file_system.h"
 #include "formaction.h"
-#include "listformatter.h"
 #include "listwidget.h"
 #include "stflrichtext.h"
 

diff --git a/include/feedhqapi.h b/include/feedhqapi.h
@@ -3,7 +3,6 @@
 
 #include <libxml/tree.h>
 
-#include "cache.h"
 #include "remoteapi.h"
 
 namespace newsboat {

diff --git a/include/filebrowserformaction.h b/include/filebrowserformaction.h
@@ -7,7 +7,6 @@
 #include "configcontainer.h"
 #include "file_system.h"
 #include "formaction.h"
-#include "listformatter.h"
 #include "listwidget.h"
 #include "stflrichtext.h"
 

diff --git a/include/freshrssapi.h b/include/freshrssapi.h
@@ -3,10 +3,8 @@
 
 #include <libxml/tree.h>
 
-#include "cache.h"
 #include "remoteapi.h"
 #include "rss/feed.h"
-#include "3rd-party/json.hpp"
 #include "utils.h"
 
 class CurlHandle;

diff --git a/include/inoreaderapi.h b/include/inoreaderapi.h
@@ -3,9 +3,7 @@
 
 #include <libxml/tree.h>
 
-#include "cache.h"
 #include "remoteapi.h"
-#include "urlreader.h"
 
 namespace newsboat {
 

diff --git a/include/itemlistformaction.h b/include/itemlistformaction.h
@@ -1,8 +1,6 @@
 #ifndef NEWSBOAT_ITEMLISTFORMACTION_H_
 #define NEWSBOAT_ITEMLISTFORMACTION_H_
 
-#include <assert.h>
-
 #include "3rd-party/optional.hpp"
 
 #include "configcontainer.h"

diff --git a/include/itemrenderer.h b/include/itemrenderer.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "htmlrenderer.h"
+#include "links.h"
 #include "textformatter.h"
 
 namespace newsboat {

diff --git a/include/itemviewformaction.h b/include/itemviewformaction.h
@@ -2,7 +2,7 @@
 #define NEWSBOAT_ITEMVIEWFORMACTION_H_
 
 #include "formaction.h"
-#include "htmlrenderer.h"
+#include "links.h"
 #include "regexmanager.h"
 #include "textformatter.h"
 #include "textviewwidget.h"

diff --git a/include/keycombination.h b/include/keycombination.h
@@ -1,7 +1,6 @@
 #ifndef NEWSBOAT_KEYCOMBINATION_H_
 #define NEWSBOAT_KEYCOMBINATION_H_
 
-#include <ostream>
 #include <string>
 
 namespace newsboat {

diff --git a/include/keymap.h b/include/keymap.h
@@ -3,7 +3,6 @@
 
 #include <map>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "configactionhandler.h"

diff --git a/include/links.h b/include/links.h
@@ -1,9 +1,8 @@
 #ifndef NEWSBOAT_LINKS_H_
 #define NEWSBOAT_LINKS_H_
 
-#include <vector>
-#include <utility>
 #include <string>
+#include <vector>
 
 #include "config.h"
 

diff --git a/include/listformatter.h b/include/listformatter.h
@@ -1,9 +1,7 @@
 #ifndef NEWSBOAT_LISTFORMATTER_H_
 #define NEWSBOAT_LISTFORMATTER_H_
 
-#include <climits>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "regexmanager.h"

diff --git a/include/logger.h b/include/logger.h
@@ -1,7 +1,6 @@
 #ifndef NEWSBOAT_LOGGER_H_
 #define NEWSBOAT_LOGGER_H_
 
-#include "config.h"
 #include "strprintf.h"
 
 #include "libnewsboat-ffi/src/logger.rs.h"

diff --git a/include/matcherexception.h b/include/matcherexception.h
@@ -2,7 +2,6 @@
 #define NEWSBOAT_MATCHEREXCEPTON_H_
 
 #include <cstdint>
-#include <stdexcept>
 #include <string>
 
 namespace newsboat {

diff --git a/include/oldreaderapi.h b/include/oldreaderapi.h
@@ -3,7 +3,6 @@
 
 #include <libxml/tree.h>
 
-#include "cache.h"
 #include "remoteapi.h"
 
 namespace newsboat {

diff --git a/include/poddlthread.h b/include/poddlthread.h
@@ -4,7 +4,6 @@
 #include <chrono>
 #include <fstream>
 #include <memory>
-#include <thread>
 #include <time.h>
 
 #include "configcontainer.h"

diff --git a/include/regexmanager.h b/include/regexmanager.h
@@ -4,7 +4,6 @@
 #include <map>
 #include <memory>
 #include <regex.h>
-#include <regex>
 #include <string>
 #include <sys/types.h>
 #include <utility>

diff --git a/include/reloadthread.h b/include/reloadthread.h
@@ -1,8 +1,6 @@
 #ifndef NEWSBOAT_RELOADTHREAD_H_
 #define NEWSBOAT_RELOADTHREAD_H_
 
-#include <thread>
-
 #include "configcontainer.h"
 #include "controller.h"
 

diff --git a/include/rssfeed.h b/include/rssfeed.h
@@ -7,6 +7,7 @@
 #include <unordered_map>
 #include <vector>
 
+#include "config.h"
 #include "matchable.h"
 #include "rssitem.h"
 #include "utils.h"

diff --git a/include/statusline.h b/include/statusline.h
@@ -2,7 +2,6 @@
 #define NEWSBOAT_STATUSLINE_H_
 
 #include <cstdint>
-#include <functional>
 #include <memory>
 #include <mutex>
 #include <string>

diff --git a/include/textviewwidget.h b/include/textviewwidget.h
@@ -2,7 +2,6 @@
 #define NEWSBOAT_TEXTVIEWWIDGET_H_
 
 #include <cstdint>
-#include <memory>
 #include <string>
 
 #include "stflpp.h"

diff --git a/include/ttrssapi.h b/include/ttrssapi.h
@@ -1,8 +1,9 @@
 #ifndef NEWSBOAT_TTRSSAPI_H_
 #define NEWSBOAT_TTRSSAPI_H_
 
+#include <mutex>
+
 #include "3rd-party/json.hpp"
-#include "cache.h"
 #include "remoteapi.h"
 
 namespace rsspp {

diff --git a/include/urlviewformaction.h b/include/urlviewformaction.h
@@ -2,7 +2,7 @@
 #define NEWSBOAT_URLVIEWFORMACTION_H_
 
 #include "formaction.h"
-#include "htmlrenderer.h"
+#include "links.h"
 #include "listwidget.h"
 
 namespace newsboat {

diff --git a/include/utils.h b/include/utils.h
@@ -4,8 +4,6 @@
 #include <cstdint>
 #include <curl/curl.h>
 #include <libxml/parser.h>
-#include <memory>
-#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
@@ -14,7 +12,6 @@
 #include "3rd-party/optional.hpp"
 
 #include "configcontainer.h"
-#include "logger.h"
 
 #include "libnewsboat-ffi/src/utils.rs.h"
 

diff --git a/include/view.h b/include/view.h
@@ -8,7 +8,7 @@
 
 #include "3rd-party/optional.hpp"
 
-#include "htmlrenderer.h"
+#include "links.h"
 #include "statusline.h"
 
 namespace newsboat {

diff --git a/newsboat.cpp b/newsboat.cpp
@@ -1,5 +1,3 @@
-#include <cstring>
-#include <errno.h>
 #include <iostream>
 #include <ncurses.h>
 #include <sstream>

diff --git a/podboat.cpp b/podboat.cpp
@@ -1,11 +1,10 @@
-#include <cstring>
-#include <errno.h>
 #include <iostream>
 
 #include "config.h"
 #include "exception.h"
 #include "pbcontroller.h"
 #include "pbview.h"
+#include "strprintf.h"
 #include "utils.h"
 
 extern "C" {

diff --git a/rss/atomparser.cpp b/rss/atomparser.cpp
@@ -1,7 +1,5 @@
 #include "atomparser.h"
 
-#include <cstring>
-
 #include "config.h"
 #include "exception.h"
 #include "feed.h"

diff --git a/rss/medianamespace.cpp b/rss/medianamespace.cpp
@@ -2,13 +2,10 @@
 
 #include <string>
 
-#include "utils.h"
 #include "xmlutilities.h"
 
 #define MEDIA_RSS_URI "http://search.yahoo.com/mrss/"
 
-using namespace newsboat;
-
 namespace rsspp {
 
 bool is_media_node(xmlNode* node)

diff --git a/rss/rss10parser.cpp b/rss/rss10parser.cpp
@@ -1,7 +1,5 @@
 #include "rss10parser.h"
 
-#include <cstring>
-
 #include "config.h"
 #include "exception.h"
 #include "feed.h"

diff --git a/rss/rss20parser.cpp b/rss/rss20parser.cpp
@@ -5,14 +5,10 @@
 #include "config.h"
 #include "exception.h"
 #include "feed.h"
-#include "item.h"
 #include "rss09xparser.h"
-#include "utils.h"
 
 #define RSS20USERLAND_URI "http://backend.userland.com/rss2"
 
-using namespace newsboat;
-
 namespace rsspp {
 
 void Rss20Parser::parse_feed(Feed& f, xmlNode* rootNode)

diff --git a/rss/rssparser.cpp b/rss/rssparser.cpp
@@ -4,9 +4,6 @@
 #include <ctime>
 #include <libxml/tree.h>
 
-#include "exception.h"
-#include "xmlutilities.h"
-
 #include "utils.h"
 
 namespace rsspp {

diff --git a/src/cache.cpp b/src/cache.cpp
@@ -2,21 +2,18 @@
 
 #include <cassert>
 #include <cinttypes>
-#include <cstdlib>
 #include <cstring>
-#include <fstream>
 #include <iostream>
 #include <sqlite3.h>
 #include <sstream>
 #include <time.h>
 
-#include "config.h"
 #include "configcontainer.h"
-#include "controller.h"
 #include "dbexception.h"
 #include "logger.h"
 #include "matcherexception.h"
 #include "rssfeed.h"
+#include "rssignores.h"
 #include "scopemeasure.h"
 #include "strprintf.h"
 #include "utils.h"

diff --git a/src/cliargsparser.cpp b/src/cliargsparser.cpp
@@ -1,7 +1,5 @@
 #include "cliargsparser.h"
 
-#include <cstdlib>
-
 namespace newsboat {
 
 rust::Vec<cliargsparser::bridged::BytesVec> argv_to_rust_args(int argc, char* argv[])

diff --git a/src/colormanager.cpp b/src/colormanager.cpp
@@ -3,17 +3,8 @@
 #include "config.h"
 #include "confighandlerexception.h"
 #include "configparser.h"
-#include "feedlistformaction.h"
-#include "filebrowserformaction.h"
-#include "helpformaction.h"
-#include "itemlistformaction.h"
-#include "itemviewformaction.h"
 #include "logger.h"
-#include "matcherexception.h"
-#include "pbview.h"
-#include "selectformaction.h"
 #include "strprintf.h"
-#include "urlviewformaction.h"
 #include "utils.h"
 
 using namespace podboat;